Credit Andrew update libwebp and switch from cmake to autotools

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f9d2ab8ab7f73980ea12c9e52a251f71ffd929ec..f8d57a73d2cf4b45d11b62c00d293ed17e8cfca5 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -472,9 +472,11 @@ PKG_3RD([dav1d],[auto],
   [ usr/local/include ])
 
 PKG_3RD([libwebp],[auto],
-  [libwebp-1.1.0],
-  [ usr/local/lib*/libwebp*.a ],
-  [ usr/local/include ])
+  [libwebp-1.3.2],
+  [ usr/local/lib*/libwebp*.a \
+   usr/local/lib*/libsharpyuv*.a ],
+  [ usr/local/include/webp \
+    usr/local/include/ ])
 
 PKG_3RD([ffnvcodec],[auto],
   [ffnvcodec],

diff --git a/cinelerra-5.1/expanders.es b/cinelerra-5.1/expanders.es
index 29b4a486d4c9f165252ab5224e49f6178abd13d8..99c5838914cfa4f7bda1106d9718ea5351dc09ac 100644 (file)
--- a/cinelerra-5.1/expanders.es
+++ b/cinelerra-5.1/expanders.es
@@ -1,4 +1,12 @@
 Video Effects
+       - Favoritos
+               Brightness/Contrast
+               Color 3 Way
+               Color Balance
+               Gradient
+               Histogram
+               Title
+               VideoScope
        - Corrección_de_Color
                Blue Banana
                Brightness/Contrast
@@ -103,7 +111,6 @@ Video Effects
                Time Average
                F_atadenoise
                F_bitplanenoise
-               F_chromanr
                F_dctdnoiz
                F_fftdnoiz
                F_hqdn3d
@@ -126,6 +133,7 @@ Video Effects
                Crop & Position
                Flip
                Lens
+               Mirror
                Perspective
                Polar
                Rotate

diff --git a/cinelerra-5.1/expanders.fr b/cinelerra-5.1/expanders.fr
index 29ecfd4396765f1c7287106c10b811b34addf904..25ed888302aa5b47cdcd6e94e060a5f7d39a8d8b 100644 (file)
--- a/cinelerra-5.1/expanders.fr
+++ b/cinelerra-5.1/expanders.fr
@@ -1,4 +1,12 @@
 Video Effects
+       - Favoris
+               Brightness/Contrast
+               Color 3 Way
+               Color Balance
+               Gradient
+               Histogram
+               Title
+               VideoScope
        - Correction de couleurs
                Blue Banana
                Brightness/Contrast
@@ -103,7 +111,6 @@ Video Effects
                Time Average
                F_atadenoise
                F_bitplanenoise
-               F_chromanr
                F_dctdnoiz
                F_fftdnoiz
                F_hqdn3d
@@ -126,6 +133,7 @@ Video Effects
                Crop & Position
                Flip
                Lens
+               Mirror
                Perspective
                Polar
                Rotate

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 7aa050c947e06e1aa9a95ed22b447001265373ac..659ab3fe3dab4740445821c79814015cff43f678 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -129,6 +129,7 @@ esound.cfg_params= --enable-shared=no --with-pic
 esound.mak_vars+= CFLAGS="" 
 esound.ldflags=" -lm -lstdc++"
 fftw.cfg_params= --disable-fortran --enable-shared=no
+ffmpeg.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libwebp)/usr/local/lib/pkgconfig"
 ffmpeg.cfg_params= \
        --enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \
        $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \
@@ -209,8 +210,9 @@ libaom.cfg_params?=  -DENABLE_TESTS=no -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=
 libaom.mak_params?= ; $(MAKE) -C libaom*/aom.build install
 dav1d.cfg_vars?=echo "echo dav1d custom make" >> configure; chmod +x ./configure;
 dav1d.mak_params?=; $(MAKE) -C dav1d* install DESTDIR="$(call bld_path,dav1d)"
-libwebp.cfg_vars?= mkdir build && cd build && $(call cmake_config,..)
-libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp)
+libwebp.cfg_vars?= ./autogen.sh;
+libwebp.cfg_params?= --prefix=$(call bld_path,libwebp)usr/local --enable-static --disable-shared --disable-libwebpdemux --disable-libwebpmux; \
+    make install;
 mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,build)"
 mjpegtools.cfg_vars?= ./autogen.sh; export CXXFLAGS+="-std=c++11";
 mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libdv \

diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.3.2.patch0 b/cinelerra-5.1/thirdparty/src/libwebp-1.3.2.patch0
new file mode 100644 (file)
index 0000000..bc1628e
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libwebp-1.3.2.patch0
@@ -0,0 +1,12 @@
+--- libwebp-1.3.2/src/libwebp.pc.in.orig       2023-09-15 19:52:28.960943568 +0300
++++ libwebp-1.3.2/src/libwebp.pc.in    2023-09-15 19:55:00.828943460 +0300
+@@ -6,7 +6,7 @@
+ Name: libwebp
+ Description: Library for the WebP graphics format
+ Version: @PACKAGE_VERSION@
+-Requires.private: libsharpyuv
++Requires: libsharpyuv
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -l@webp_libname_prefix@webp
++Libs: -L${libdir} -l@webp_libname_prefix@webp -lsharpyuv
+ Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.3.2.tar.xz b/cinelerra-5.1/thirdparty/src/libwebp-1.3.2.tar.xz
new file mode 100644 (file)
index 0000000..344a4c0
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libwebp-1.3.2.tar.xz differ