From: Good Guy Date: Wed, 21 Sep 2022 23:28:44 +0000 (-0600) Subject: Credit Tiff team + Andrew lerc fix X-Git-Tag: 2022-09~3 X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=ed91c07681b6381978e7e42523f9a36ca2f5dbb7;ds=sidebyside Credit Tiff team + Andrew lerc fix --- diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 33e2fbfb..79533426 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -405,7 +405,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] []) # []) # PKG_3RD([tiff],[auto], - [tiff-4.3.0], + [tiff-4.4.0], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 159e9b01..06d64110 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -196,7 +196,7 @@ djbfft.mak_params?=; cd $(call bld_path,djbfft); ln -sf djbfft.a libdjbfft.a audiofile.cfg_params?=--enable-shared=no --disable-doxygen-docs --enable-debug=no --enable-examples=no audiofile.mak_params?=LIBS="-lm -lstdc++" flac.cfg_vars?= CFLAGS+=" -O3 -funroll-loops " CPPFLAGS+=" -DNDEBUG " CXXFLAGS+=" -O2 " -flac.cfg_params?= --enable-shared=no +flac.cfg_params?= --enable-shared=no --disable-doxygen-docs flac.cflags?="$(call inc_path,libogg) $(call ld_path,libogg,src/.libs)" ffnvcodec.cfg_vars=echo "exec true" > ./configure; chmod +x ./configure; giflib.cfg_vars=echo "exec true" > ./configure; chmod +x ./configure; @@ -254,7 +254,7 @@ openexr.mak_vars?=true; \# opus.cfg_params?= --disable-extra-programs speech_tools.mak_params?=-j1 tiff.cfg_vars+=LIBS+=" -lpthread"; autoreconf -ifv -I m4 && automake -caf; -tiff.cfg_params+= --disable-libdeflate --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ +tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ --with-webp-include-dir=$(call pkg_incl,libwebp)\ --with-webp-lib-dir=$(call pkg_libs,libwebp))\ $(call if_npkg,libwebp,--disable-webp) diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt index fcc766eb..4d8c59f7 100644 --- a/cinelerra-5.1/thirdparty/downloads.txt +++ b/cinelerra-5.1/thirdparty/downloads.txt @@ -13,7 +13,7 @@ https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz https://sourceforge.net/projects/libavc1394/files/latest/download?source=directory = 0.5.4 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/xiph/flac/releases/tag/1.4.0 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 @@ -30,12 +30,12 @@ http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz http://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.gz http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2 https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.100 -https://download.osgeo.org/libtiff/tiff-4.3.0.tar.gz +https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3 https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz https://code.videolan.org/videolan/x264/-/tree/master/x264-snapshot-20210615-master.tar.xz (Andrew does somehow) https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz -https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2 +https://ffmpeg.org/releases/ffmpeg-5.1.tar.bz2 https://github.com/webmproject/libvpx/archive/v1.12.0.tar.gz https://code.videolan.org/videolan/dav1d/-/archive/0.7.1/dav1d-0.7.1.tar.gz https://github.com/swh/ladspa/releases/tag/v0.4.17, plugin.org.uk diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch1 b/cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch1 new file mode 100644 index 00000000..6e7ea33f --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch1 @@ -0,0 +1,11 @@ +--- ./Makefile.am ++++ ./Makefile.am +@@ -58,7 +58,7 @@ + rm -rf $(distdir)/_build/cmake + rm -rf $(distdir)/_inst/cmake + +-SUBDIRS = port libtiff tools build contrib test man html ++SUBDIRS = port libtiff build + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.4.0.tar.xz b/cinelerra-5.1/thirdparty/src/tiff-4.4.0.tar.xz new file mode 100644 index 00000000..61cec266 Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/tiff-4.4.0.tar.xz differ