From: Good Guy Date: Mon, 2 Jan 2017 16:13:43 +0000 (-0700) Subject: version update, build mods, update Features5.pdf X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=commitdiff_plain;h=9f344ea7acc2f3e077a4f736e2f99eaeff81d66b version update, build mods, update Features5.pdf --- diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD index 71d3f24f..25de85a8 100644 --- a/cinelerra-5.1/PKGBUILD +++ b/cinelerra-5.1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20161130 +pkgrel=20170101 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 b08099d4..da5dd7d4 100755 --- a/cinelerra-5.1/bld_scripts/bld_package.sh +++ b/cinelerra-5.1/bld_scripts/bld_package.sh @@ -1,27 +1,39 @@ -#!/bin/bash +#!/bin/bash -x if [ $# -ne 2 ]; then echo "usage: $0 " echo " os = centos | ubuntu | suse | debian" - echo " typ = static | dynamic" + echo " typ = sta | dyn" exit 1 fi dir="$1" +typ="$2" path="/home" bld="git-repo" proj="cinelerra5" base="cinelerra-5.1" -centos="centos-7.0-1406" -debian="debian-8.4.0" -fedora="fedora-23" -leap="leap-42.1" -mint="mint-14.04.1" +arch01="arch-20160601" +arch="arch-20161201" +cent01="centos-7.0-1406" +centos="centos-7.x-1611" +deb01="debian-8.4.0" +debian="debian-8.6.0" +fc23="fedora-23" +fc24="fedora-24" +fedora="fedora-25" +leap01="leap-42.1" +leap="leap-42.2" +mint01="mint-14.04.1" +mint="mint-18.1" +slk32="slk32-14.2" +slk64="slk64-14.2" suse="opensuse-13.2" ub14="ub14.04.1" ub15="ub15.10" -ub15="ub16.04" +ub16="ub16.04" +ub1601="ub16.10" ubuntu="ubuntu-14.04.1" eval os="\${$dir}" @@ -29,21 +41,20 @@ if [ -z "$os" ]; then echo "unknown os: $dir" fi -if [ ! -d "$path/$dir/$bld/$proj/$base" ]; then - echo "missing $bld/$proj/$base in $path/$dir" +if [ ! -d "$path/$dir/$bld/$proj.$typ/$base" ]; then + echo "missing $bld/$proj.$typ/$base in $path/$dir" exit 1 fi -typ=$2 sfx=`uname -m`-`date +"%Y%m%d"` -if [ "$typ" = "static" ]; then +if [ "$typ" = "sta" ]; then sfx="$sfx-static" -elif [ "$typ" != "dynamic" ]; then - echo "err: suffix must be [static | dynamic]" +elif [ "$typ" != "dyn" ]; then + echo "err: suffix must be [sta | dyn]" exit 1 fi -cd "$path/$dir/$bld/$proj/$base" +cd "$path/$dir/$bld/$proj.$typ/$base" tar -C bin -cJf "../$base-$os-$sfx.txz" . rm -f "$path/$dir/$base-$os-$sfx.txz" mv "../$base-$os-$sfx.txz" "$path/$dir/." diff --git a/cinelerra-5.1/bld_scripts/bld_prepare.sh b/cinelerra-5.1/bld_scripts/bld_prepare.sh index 767b039f..82774d75 100755 --- a/cinelerra-5.1/bld_scripts/bld_prepare.sh +++ b/cinelerra-5.1/bld_scripts/bld_prepare.sh @@ -33,7 +33,8 @@ case "$dir" in rm -f /tmp/$yasm ;; "fedora") - dnf -y install nasm yasm libavc1394-devel libusb-devel flac-devel \ + dnf -y -best --allowerasing \ + install nasm yasm libavc1394-devel libusb-devel flac-devel \ libjpeg-devel libdv-devel libdvdnav-devel libdvdread-devel \ libtheora-devel libiec61883-devel esound-devel uuid-devel \ giflib-devel ncurses-devel ilmbase-devel fftw-devel OpenEXR-devel \ @@ -45,7 +46,7 @@ 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 \ - autoconf automake rpm-build ccache + gettext-devel inkscape udftools autoconf automake ;; "suse" | "leap") zypper -n install nasm gcc gcc-c++ zlib-devel texinfo libpng16-devel \ diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/cinelerra.spec index d7646a88..a06eaa88 100644 --- a/cinelerra-5.1/cinelerra.spec +++ b/cinelerra-5.1/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20161130 +%define ver 20170101 Summary: Multimedia Editing and construction Name: cinelerra Version: 5.1 diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 4ce1cb8f..56290860 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -360,10 +360,11 @@ CUTLIBS = \ BDWRITE = $(OBJDIR)/bdwrite BDWOBJS = $(OBJDIR)/bdwrite.o -CFLAGS += \ +CFLAGS := \ -I$(GUICAST) \ -I$(LIBZMPEG3) \ $(static_incs) \ + $(CFLAGS) # Speed up linking with this linking sequence ifeq ($(OBJDIR), alpha) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 9c69fa01..40ac01b3 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -15,6 +15,7 @@ CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS" CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1" CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFG_CFLAGS+=" -I/usr/include/freetype2" +CFG_CFLAGS+=" -I/usr/include/OpenEXR" AC_DEFUN([CHECK_WITH], [ AC_ARG_WITH([$1], @@ -602,7 +603,7 @@ for dep in \ libtheora/libogg libtheora/libvorbis ; do lib=`dirname $dep`; needs=`basename $dep` eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs"; - if test "x$pkg_lib" != "xno" -a "x$needs_lib" != "xyes" ; then + if test "x$pkg_lib" != "xno"; then eval "PKG_$needs=yes" fi done @@ -705,10 +706,6 @@ AC_SUBST(FFMPEG_EXTRA_CFG) AC_SUBST(WANT_X264_HIDEPTH) AC_SUBST(WANT_X265_HIDEPTH) -if test "x$BUILD_openexr" = "x0"; then - CFG_CFLAGS+=" -I/usr/include/OpenEXR" -fi - AC_SUBST(CFG_CFLAGS) AC_SUBST(CFG_CXXFLAGS) diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog index 5efa32f1..9135708f 100644 --- a/cinelerra-5.1/debian/changelog +++ b/cinelerra-5.1/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20161130) unstable; urgency=low +cin (1:5.1.20170101) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control index 08d9cf5d..f27f2fb3 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.20161130 +Standards-Version: 5.1.20170101 Maintainer: mailing list Homepage: http://www.cinelerra-cv.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, diff --git a/cinelerra-5.1/doc/Features5.pdf b/cinelerra-5.1/doc/Features5.pdf index f65716c5..c1bcbdfd 100644 Binary files a/cinelerra-5.1/doc/Features5.pdf and b/cinelerra-5.1/doc/Features5.pdf differ