update version, jbig for tiff, del ub15, add ub17

diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD
index 8f47aaa077e115513fc83586b87d148bd65d9089..d422868d92ad010288099418eddaa458d418857b 100644 (file)
--- a/cinelerra-5.1/PKGBUILD
+++ b/cinelerra-5.1/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: goodguy <lists.cinelerra-cv.org>
 pkgname=cin
 pkgver=5.1
-pkgrel=20170329
+pkgrel=20170429
 pkgdesc="Cinelerra git://git.cinelerra-cv.org/goodguy/cinelerra.git ($pkgrel)"
 arch=('x86_64')
 url="http://www.cinelerra-cv.org"

diff --git a/cinelerra-5.1/bld_scripts/bld_package.sh b/cinelerra-5.1/bld_scripts/bld_package.sh
index da5dd7d4c80fb9777fc86b89d08946e4d8a5ba70..c48bf6a9f1532ebfa7ac7a22e4d33aac2ef4ef2a 100755 (executable)
--- a/cinelerra-5.1/bld_scripts/bld_package.sh
+++ b/cinelerra-5.1/bld_scripts/bld_package.sh
@@ -19,6 +19,7 @@ arch="arch-20161201"
 cent01="centos-7.0-1406"
 centos="centos-7.x-1611"
 deb01="debian-8.4.0"
+deb03="debian-8.7.1"
 debian="debian-8.6.0"
 fc23="fedora-23"
 fc24="fedora-24"
@@ -33,6 +34,7 @@ suse="opensuse-13.2"
 ub14="ub14.04.1"
 ub15="ub15.10"
 ub16="ub16.04"
+ub17="ub17.04"
 ub1601="ub16.10"
 ubuntu="ubuntu-14.04.1"
 

diff --git a/cinelerra-5.1/bld_scripts/bld_prepare.sh b/cinelerra-5.1/bld_scripts/bld_prepare.sh
index 2cc8b4a871bc270774b6d9be047bae2e4f8fe646..84f7e896c6d9c70928a1b0c5e88d6a43b0b17661 100755 (executable)
--- a/cinelerra-5.1/bld_scripts/bld_prepare.sh
+++ b/cinelerra-5.1/bld_scripts/bld_prepare.sh
@@ -24,7 +24,7 @@ case "$dir" in
     libavc1394 festival-devel libiec61883-devel flac-devel inkscape \
     libsndfile-devel libtheora-devel linux-firmware ivtv-firmware \
     libvorbis-devel texinfo xz-devel lzma-devel cmake udftools git \
-    autoconf automake rpm-build
+    autoconf automake rpm-build jbigkit-devel
     yasm=yasm-1.2.0-7.fc21.x86_64.rpm
     release=http://archives.fedoraproject.org/pub/fedora/linux/releases/21
     url=$release/Everything/x86_64/os/Packages/y/$yasm
@@ -46,7 +46,8 @@ case "$dir" in
     flac-devel libsndfile-devel libtheora-devel linux-firmware \
     ivtv-firmware libvorbis-devel texinfo xz-devel lzma-devel cmake git \
     ctags patch gcc-c++ perl-XML-XPath libtiff-devel python dvdauthor \
-    gettext-devel inkscape udftools autoconf automake numactl-devel
+    gettext-devel inkscape udftools autoconf automake numactl-devel \
+    jbigkit-devel
   ;;
 "suse" | "leap")
   zypper -n install nasm gcc gcc-c++ zlib-devel texinfo libpng16-devel \
@@ -57,7 +58,7 @@ case "$dir" in
     libdvdnav-devel libdvdread-devel libiec61883-devel libuuid-devel \
     ilmbase-devel fftw3-devel libsndfile-devel libtheora-devel flac-devel \
     libtiff-devel inkscape cmake patch libnuma-devel lzma-devel udftools git \
-    yasm autoconf automake rpm-build
+    yasm autoconf automake rpm-build libjbig-devel
     if [ ! -f /usr/lib64/libtermcap.so ]; then
       ln -s libtermcap.so.2 /usr/lib64/libtermcap.so
     fi
@@ -69,20 +70,20 @@ case "$dir" in
     libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \
     libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \
     fonts-dejavu libopenexr-dev festival libfftw3-dev gdb \
-    libdc1394-22-dev libesd0-dev libflac-dev inkscape \
+    libdc1394-22-dev libesd0-dev libflac-dev libjbig-dev inkscape \
     libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \
     autoconf automake debhelper
   ;;
 #"ub16-10")
 #  apt-get -y install libx264-dev libx265-dev libvpx-dev libmjpegtools-dev
-"ubuntu" | "mint" | "ub14" | "ub15" | "ub16" )
+"ubuntu" | "mint" | "ub14" | "ub15" | "ub16" | "ub17" )
   apt-get -y install apt-file sox nasm yasm g++ build-essential libz-dev \
     texinfo libpng-dev freeglut3-dev libxv-dev libasound2-dev libbz2-dev \
     libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \
     libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \
     fonts-dejavu libopenexr-dev libavc1394-dev festival-dev fftw3-dev gdb \
-    libdc1394-22-dev libiec61883-dev libesd0-dev libflac-dev inkscape \
-    libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \
+    libdc1394-22-dev libiec61883-dev libesd0-dev libflac-dev libjbig-dev \
+    libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git inkscape \
     autoconf automake debhelper
   ;;
  *)

diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/cinelerra.spec
index 94aaa74eb9b25d962d0d9e47866511627d2d5b38..dd735f11ed1d4c1f7094fb8a3d64f49e6af6d4a0 100644 (file)
--- a/cinelerra-5.1/cinelerra.spec
+++ b/cinelerra-5.1/cinelerra.spec
@@ -1,4 +1,4 @@
-%define ver 20170329
+%define ver 20170429
 Summary: Multimedia Editing and construction
 Name: cinelerra
 Version: 5.1

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 41b522ff64c940acb839a1a249f6a7e0932967cc..e5923f7abe291c262dd8d146f1e84e921c3f1e3c 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -677,6 +677,9 @@ echo "  using: ladspa-build = $WANT_LADSPA_BUILD"
 echo ""
 
 # build extras
+if test "x$HAVE_tiff" = "xyes"; then
+  EXTRA_LIBS+=' -ljbig'
+fi
 if test "x$HAVE_NUMA" = "xyes"; then
   EXTRA_LIBS+=' -lnuma'
 fi

diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog
index 53ffc2d523dfe3973be336cedd2fd9558127b936..dfd95195c50a08943ffbc730e7f1ab0def0b19c8 100644 (file)
--- a/cinelerra-5.1/debian/changelog
+++ b/cinelerra-5.1/debian/changelog
@@ -1,4 +1,4 @@
-cin (1:5.1.20170329) unstable; urgency=low
+cin (1:5.1.20170429) unstable; urgency=low
 
   [ guy goode ]
 

diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control
index f0600567f845f7d9031b746deee023d9f7f409bc..9f65e379c29c2fb7cce2c59d130562d664f046e7 100644 (file)
--- a/cinelerra-5.1/debian/control
+++ b/cinelerra-5.1/debian/control
@@ -1,7 +1,7 @@
 Source: cin
 Section: video
 Priority: optional
-Standards-Version: 5.1.20170329
+Standards-Version: 5.1.20170429
 Maintainer: mailing list <cinelerra@lists.cinelerra-cv.org>
 Homepage: http://www.cinelerra-cv.org/
 Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index ec2c531a7d3b056c4c8b2eb71ed6fcf638f6bca0..a35ab37800b9640f1d9a0b9d28006e4271c70e4a 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -105,7 +105,7 @@ esound.mak_vars+= CFLAGS=""
 esound.ldflags=" -lm -lstdc++"
 faac.cfg_params= --enable-shared=no --without-mp4v2
 faad2.cfg_params= --enable-shared=no
-fdk.cfg_vars= ./autogen.sh ; CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing"
+#fdk.cfg_vars= ./autogen.sh ; CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing"
 fdk.cfg_params= --enable-shared=no
 fdk.mak_params= ; for f in $(call bld_path,fdk,/lib*/include); do ln -s . $$$$f/fdk-aac; done
 fftw.cfg_params= --disable-fortran --enable-shared=no