From 23f5d8ff7bc647705baa611e9a887e24405908d8 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sat, 29 Apr 2017 21:17:13 -0600 Subject: [PATCH] update version, jbig for tiff, del ub15, add ub17 --- cinelerra-5.1/PKGBUILD | 2 +- cinelerra-5.1/bld_scripts/bld_package.sh | 2 ++ cinelerra-5.1/bld_scripts/bld_prepare.sh | 15 ++++++++------- cinelerra-5.1/cinelerra.spec | 2 +- cinelerra-5.1/configure.ac | 3 +++ cinelerra-5.1/debian/changelog | 2 +- cinelerra-5.1/debian/control | 2 +- cinelerra-5.1/thirdparty/Makefile | 2 +- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD index 8f47aaa0..d422868d 100644 --- a/cinelerra-5.1/PKGBUILD +++ b/cinelerra-5.1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy 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 da5dd7d4..c48bf6a9 100755 --- 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 2cc8b4a8..84f7e896 100755 --- 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 94aaa74e..dd735f11 100644 --- 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 41b522ff..e5923f7a 100644 --- 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 53ffc2d5..dfd95195 100644 --- 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 f0600567..9f65e379 100644 --- 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 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 ec2c531a..a35ab378 100644 --- 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 -- 2.26.2