From: Good Guy Date: Sat, 7 Sep 2024 17:47:46 +0000 (-0600) Subject: fix updated giflib patch2, upgrade openjpeg to 2.5.2 and tiff to 4.6.0t which puts... X-Git-Tag: 2024-09~2 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=6eece58c73502e502760595155a27178d64a4feb;p=goodguy%2Fcinelerra.git fix updated giflib patch2, upgrade openjpeg to 2.5.2 and tiff to 4.6.0t which puts back deleted files --- diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 2ec32c47..72d4f050 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -314,7 +314,7 @@ PKG_3RD([opus],[auto], [ include ]) PKG_3RD([openjpeg],[auto], - [openjpeg-2.5.0], + [openjpeg-2.5.2], [ bin/libopenjp2.a ], [ src/lib/openjp2 ]) @@ -406,7 +406,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] []) # []) # PKG_3RD([tiff],[auto], - [tiff-4.6.0], + [tiff-4.6.0t], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt index 08c84298..bf6676cd 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.2 https://github.com/xiph/flac/releases/tag/1.4.3 -https://github.com/uclouvain/openjpeg/ = Releases=sourcefiles openjpeg-2.5.0.tar.gz +https://github.com/uclouvain/openjpeg/ = Releases=sourcefiles openjpeg-2.5.2.tar.gz https://sourceforge.net/projects/libjpeg-turbo/ = Code (GitHub)=sourcefiles/2.1.2/libjpeg-turbo-2.1.5.1.tar.gz https://sourceforge.net/projects/mjpeg/files/mjpegtools/2.2.1/ http://www.fftw.org/fftw-3.3.10.tar.gz @@ -33,7 +33,7 @@ http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2 # Added 0.7.4 in at least 2016; no new updates; not in HV or CV https://repology.org/project/a52dec/information https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.100 -https://download.osgeo.org/libtiff/tiff-4.6.0.tar.xz +https://download.osgeo.org/libtiff/tiff-4.6.0t.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 (Jan. 2023 version r3106) https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz (snapshot 17122023) diff --git a/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2 b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2 index 41d904c9..7201d3c2 100644 --- a/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2 +++ b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2 @@ -85,7 +85,7 @@ - */ - qsort(SortArray, NewColorSubdiv[Index].NumEntries, - sizeof(QuantizedColorType *), SortCmpRtn); -+ qsort(SortArray, -1, NewColorSubdiv[Index].NumEntries, SortRGBAxis); ++ QSort(SortArray, -1, NewColorSubdiv[Index].NumEntries, SortRGBAxis); /* Relink the sorted list into one: */ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) { diff --git a/cinelerra-5.1/thirdparty/src/openjpeg-2.5.2.tar.xz b/cinelerra-5.1/thirdparty/src/openjpeg-2.5.2.tar.xz new file mode 100644 index 00000000..f0cf48ff Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/openjpeg-2.5.2.tar.xz differ diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.patch1 b/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.patch1 new file mode 100644 index 00000000..29246abd --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.patch1 @@ -0,0 +1,11 @@ +--- ./Makefile.am ++++ ./Makefile.am +@@ -60,7 +60,7 @@ + rm -rf $(distdir)/_build/cmake + rm -rf $(distdir)/_inst/cmake + +-SUBDIRS = port libtiff tools build contrib test doc ++SUBDIRS = port libtiff build + + + NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.patch2 b/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.patch2 new file mode 100644 index 00000000..5067d8db --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.patch2 @@ -0,0 +1,10 @@ +--- ./configure.ac ++++ ./configure.ac +@@ -873,6 +873,7 @@ + if test "x$enable_webp" != "xno" ; then + + if test "x$with_webp_lib_dir" != "x" ; then ++ LIBS="-lpthread $LIBS" + LDFLAGS="-L$with_webp_lib_dir $LDFLAGS" + fi + diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.tar.xz b/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.tar.xz new file mode 100644 index 00000000..dbae58e5 Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/tiff-4.6.0t.tar.xz differ