From f1c509397ae19acf09fd8acb307c36a518fe840a Mon Sep 17 00:00:00 2001 From: Good Guy Date: Tue, 28 Jun 2022 19:49:54 -0600 Subject: [PATCH 1/1] script updates from Andrew and Miroslav --- cinelerra-5.1/blds/bld_prepare.sh | 30 ++++++++++++++++++++++++-- cinelerra-5.1/configure.ac | 12 +++++++++++ cinelerra-5.1/thirdparty/downloads.txt | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/cinelerra-5.1/blds/bld_prepare.sh b/cinelerra-5.1/blds/bld_prepare.sh index 67eb9f23..402b6267 100755 --- a/cinelerra-5.1/blds/bld_prepare.sh +++ b/cinelerra-5.1/blds/bld_prepare.sh @@ -7,7 +7,7 @@ fi if [ $# -ne 1 ]; then echo "usage: $0 " - echo " = [centos | suse | ubuntu | fedora | mint | debian | arch]" + echo " = [centos | suse | ubuntu | fedora | mint | debian | arch | debian-testing | ubuntu-testing]" fi dir="$1" @@ -104,7 +104,33 @@ case "$dir" in libpulse-dev libtool python \ patchelf libboost-filesystem-dev libboost-regex-dev ;; - *) +#ubuntu testing for upcoming versions +"ubuntu-testing") + 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-25 libdc1394-dev libiec61883-dev libflac-dev libjbig-dev libusb-1.0-0-dev \ + libvdpau-dev libva-dev libsndfile1-dev libtheora-dev cmake udftools \ + libxml2-utils git inkscape autoconf automake debhelper libgtk2.0-dev \ + libpulse-dev libtool 2to3 python-is-python3 python2-minimal python2 dh-python \ + patchelf libboost-filesystem-dev libboost-regex-dev + ;; +#debian testing for upcoming versions +"debian-testing") + apt-get -f -y install apt-file sox nasm yasm g++ build-essential zlib1g-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 festival libfftw3-dev gdb libusb-1.0-0-dev \ + libdc1394-25 libdc1394-dev libflac-dev libjbig-dev libvdpau-dev libva-dev \ + inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \ + autoconf automake debhelper libgtk2.0-dev libpulse-dev 2to3 python-is-python3 python2-minimal python2 dh-python \ + patchelf libboost-filesystem-dev libboost-regex-dev fuse + ;; + +*) echo "unknown os: $dir" exit 1; ;; diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 1c9f289d..bce24689 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -12,6 +12,18 @@ AC_LANG([C++]) AC_LANG([C]) AC_PROG_CXX + +AC_CHECK_PROG(MAKEINFO,[makeinfo],[makeinfo],[no]) +if test x"$MAKEINFO" == x"no" ; then +AC_MSG_ERROR([Please install texinfo]) +fi + +AC_CHECK_PROG(GETTEXT,[gettext],[gettext],[no]) +if test x"$GETTEXT" == x"no" ; then +AC_MSG_ERROR([Please install gettext]) +fi + + CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros" CFG_CFLAGS+=" -pthread -Wall" # misguided pedantic warnings diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt index dc72ccb2..3a3a86dd 100644 --- a/cinelerra-5.1/thirdparty/downloads.txt +++ b/cinelerra-5.1/thirdparty/downloads.txt @@ -14,7 +14,7 @@ https://sourceforge.net/projects/libavc1394/files/latest/download?source=directo https://sourceforge.net/projects/libdv/files/latest/download?source=directory = 0.104 https://sourceforge.net/projects/giflib/files/latest/download = 5.2.1 https://sourceforge.net/projects/flac/files/latest/download?source=directory = 1.3.2 -https://github.com/uclouvain/openjpeg/ = Releases=sourcefiles openjpeg-2.4.0.tar.gz +https://github.com/uclouvain/openjpeg/ = Releases=sourcefiles openjpeg-2.5.0.tar.gz https://sourceforge.net/projects/libjpeg-turbo/ = Code (GitHub)=sourcefiles/2.1.2/libjpeg-turbo-2.1.2.tar.gz http://www.fftw.org/fftw-3.3.10.tar.gz # Not sure why festival is in here but it is now at 2.5 since 25-Dec-2017 -- 2.26.2