From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 16 Aug 2024 20:06:43 +0000 (-0600)
Subject: update libraries dcraw, flac, and giflib + cleanup
X-Git-Tag: 2024-09~4
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=233af0f4ddf32938ce4397a9a24f95fff61fc2ad;p=goodguy%2Fcinelerra.git
update libraries dcraw, flac, and giflib + cleanup
---
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 8159da8f..9c22005f 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -256,7 +256,7 @@ PKG_3RD([fftw],[auto],
[ api ])
PKG_3RD([flac],[auto],
- [flac-1.4.2],
+ [flac-1.4.3],
[ src/libFLAC/.libs/libFLAC.a \
src/libFLAC++/.libs/libFLAC++.a \
src/share/replaygain_analysis/.libs/libreplaygain_analysis.a \
@@ -267,7 +267,7 @@ PKG_3RD([flac],[auto],
[ include ])
PKG_3RD([giflib],[yes],
- [giflib-5.2.1],
+ [giflib-5.2.2],
[ libgif.a \
libutil.a ],
[ . ])
diff --git a/cinelerra-5.1/picon/original/chromakey.png b/cinelerra-5.1/picon/original/chromakey.png
deleted file mode 100644
index 244d0e70..00000000
Binary files a/cinelerra-5.1/picon/original/chromakey.png and /dev/null differ
diff --git a/cinelerra-5.1/picon/original/chromakeyhsv.png b/cinelerra-5.1/picon/original/chromakeyhsv.png
deleted file mode 100644
index 244d0e70..00000000
Binary files a/cinelerra-5.1/picon/original/chromakeyhsv.png and /dev/null differ
diff --git a/cinelerra-5.1/picon/original/diffkey.png b/cinelerra-5.1/picon/original/diffkey.png
deleted file mode 100644
index 244d0e70..00000000
Binary files a/cinelerra-5.1/picon/original/diffkey.png and /dev/null differ
diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index 40b579ed..bec71f52 100644
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -1,8 +1,8 @@
#https://www.cybercom.net/~dcoffin/dcraw/dcraw.c (moved to next line for 9.28 2018/06/01)
-# dcraw.c.xz is checked into GIT at version 9.27; should be 9.28 cuz that is what dcraw.C is based on (/mnt0)
+# dcraw.c.xz is at 2018, internal version of 1.478
https://www.dechifro.org/dcraw/dcraw.c
-http://download-mirror.savannah.gnu.org/releases//openexr/ilmbase-2.2.1.tar.gz
-http://gnu.mirrors.pair.com/savannah/savannah//openexr/openexr-2.2.1.tar.gz
+http://download-mirror.savannah.gnu.org/releases//openexr/ilmbase-2.4.1.tar.gz
+http://gnu.mirrors.pair.com/savannah/savannah//openexr/openexr-2.4.1.tar.gz
https://sourceforge.net/projects/opencvlibrary/files/ 4.3.0
https://github.com/opencv/opencv_contrib/releases 4.3.0
#https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.2.0.tar.gz/download
@@ -12,8 +12,8 @@ https://mirrors.edge.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz
https://mirrors.edge.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://github.com/xiph/flac/releases/tag/1.4.2
+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://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/
diff --git a/cinelerra-5.1/thirdparty/src/dcraw.c.xz b/cinelerra-5.1/thirdparty/src/dcraw.c.xz
index 8d55e998..a05f92a3 100644
Binary files a/cinelerra-5.1/thirdparty/src/dcraw.c.xz and b/cinelerra-5.1/thirdparty/src/dcraw.c.xz differ
diff --git a/cinelerra-5.1/thirdparty/src/flac-1.4.3.tar.xz b/cinelerra-5.1/thirdparty/src/flac-1.4.3.tar.xz
new file mode 100644
index 00000000..8d128143
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/flac-1.4.3.tar.xz differ
diff --git a/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch1 b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch1
new file mode 100644
index 00000000..3a68fe34
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch1
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ # of code space in the shared library.
+
+ #
+-OFLAGS = -O0 -g
++#OFLAGS = -O0 -g
+ OFLAGS = -O2
+ CFLAGS = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
+
+@@ -90,7 +90,7 @@
+ all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS)
+ ifeq ($(UNAME), Darwin)
+ else
+- $(MAKE) -C doc
++# $(MAKE) -C doc
+ endif
+
+ $(UTILS):: libgif.a libutil.a
diff --git a/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2 b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2
new file mode 100644
index 00000000..41d904c9
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.patch2
@@ -0,0 +1,111 @@
+--- a/quantize.c
++++ b/quantize.c
+# SortRGBAxis is static and not locked, qsort recoded
+# GAErrorToken is also static and not locked, not fixed
+@@ -25,8 +25,6 @@
+ #define BITS_PER_PRIM_COLOR 5
+ #define MAX_PRIM_COLOR 0x1f
+
+-static int SortRGBAxis;
+-
+ typedef struct QuantizedColorType {
+ GifByteType RGB[3];
+ GifByteType NewColorIndex;
+@@ -34,6 +32,40 @@
+ struct QuantizedColorType *Pnext;
+ } QuantizedColorType;
+
++static int QCmpr(QuantizedColorType *a, QuantizedColorType *b, int i)
++{
++ int i0 = i, i1 = i+1, i2 = i+2;
++ if( i1 >= 3 ) i1 -= 3;
++ if( i2 >= 3 ) i2 -= 3;
++ /* sort on all axes of the color space! */
++ int hash_a = (a->RGB[i0] << 16) | (a->RGB[i1] << 8) | (a->RGB[i2] << 0);
++ int hash_b = (b->RGB[i0] << 16) | (b->RGB[i1] << 8) | (b->RGB[i2] << 0);
++ return hash_a - hash_b;
++}
++
++static int QSplit(QuantizedColorType **q, int l, int r, int i)
++{
++ int m;
++ QuantizedColorType *t;
++ for(;;) {
++ while( QCmpr(q[r],q[l], i) >= 0 ) if( ++l == r ) return r;
++ t = q[l]; q[l] = q[r]; q[r] = t; m = l; l = r; r = m;
++ while( QCmpr(q[l],q[r], i) >= 0 ) if( r == --l ) return r;
++ t = q[l]; q[l] = q[r]; q[r] = t; m = l; l = r; r = m;
++ }
++}
++
++static void QSort(QuantizedColorType **q, int ll, int rr, int i)
++{
++ for(;;) {
++ int l = ll+1; if( l == rr ) return;
++ int r = rr-1; if( l == r ) return;
++ int m = QSplit(q, l, r, i);
++ QSort(q, ll, m, i);
++ ll = m;
++ }
++}
++
+ typedef struct NewColorMapType {
+ GifByteType RGBMin[3], RGBWidth[3];
+ unsigned int
+@@ -45,7 +77,6 @@
+ static int SubdivColorMap(NewColorMapType *NewColorSubdiv,
+ unsigned int ColorMapSize,
+ unsigned int *NewColorMapSize);
+-static int SortCmpRtn(const void *Entry1, const void *Entry2);
+
+ /******************************************************************************
+ Quantize high resolution image into lower one. Input image consists of a
+@@ -215,6 +246,7 @@
+ unsigned int ColorMapSize,
+ unsigned int *NewColorMapSize) {
+
++ int SortRGBAxis = 0;
+ unsigned int i, j, Index = 0;
+ QuantizedColorType *QuantizedColor, **SortArray;
+
+@@ -257,19 +289,7 @@
+ SortArray[j] = QuantizedColor;
+ }
+
+- /*
+- * Because qsort isn't stable, this can produce differing
+- * results for the order of tuples depending on platform
+- * details of how qsort() is implemented.
+- *
+- * We mitigate this problem by sorting on all three axes rather
+- * than only the one specied by SortRGBAxis; that way the
+- * instability can only become an issue if there are multiple
+- * color indices referring to identical RGB tuples. Older
+- * versions of this sorted on only the one axis.
+- */
+- qsort(SortArray, NewColorSubdiv[Index].NumEntries,
+- sizeof(QuantizedColorType *), SortCmpRtn);
++ qsort(SortArray, -1, NewColorSubdiv[Index].NumEntries, SortRGBAxis);
+
+ /* Relink the sorted list into one: */
+ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) {
+@@ -339,19 +359,4 @@
+ Routine called by qsort to compare two entries.
+ *****************************************************************************/
+
+-static int SortCmpRtn(const void *Entry1, const void *Entry2) {
+- QuantizedColorType *entry1 = (*((QuantizedColorType **)Entry1));
+- QuantizedColorType *entry2 = (*((QuantizedColorType **)Entry2));
+-
+- /* sort on all axes of the color space! */
+- int hash1 = entry1->RGB[SortRGBAxis] * 256 * 256 +
+- entry1->RGB[(SortRGBAxis + 1) % 3] * 256 +
+- entry1->RGB[(SortRGBAxis + 2) % 3];
+- int hash2 = entry2->RGB[SortRGBAxis] * 256 * 256 +
+- entry2->RGB[(SortRGBAxis + 1) % 3] * 256 +
+- entry2->RGB[(SortRGBAxis + 2) % 3];
+-
+- return hash1 - hash2;
+-}
+-
+ /* end */
diff --git a/cinelerra-5.1/thirdparty/src/giflib-5.2.2.tar.xz b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.tar.xz
new file mode 100644
index 00000000..86cce9c5
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/giflib-5.2.2.tar.xz differ