[cinelerra-gg] Fix all interdependency tests, enable pulseaudio

commit d244ca8b6e90cd855bebc57f99de2c852210ec69 Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; Date: Tue Jul 7 21:22:03 2020 -0400 Fix all interdependency tests, enable pulseaudio 0001-Fix-interdependency-checks.patch | 86 +++++++++++++++++++++++++++++++++++ 0001-Fix-lv2-dep-logic.patch | 38 ---------------- cinelerra-gg.spec | 19 ++++++-- 3 files changed, 101 insertions(+), 42 deletions(-) --- diff --git a/0001-Fix-interdependency-checks.patch b/0001-Fix-interdependency-checks.patch new file mode 100644 index 0000000..0ea3737 --- /dev/null +++ b/0001-Fix-interdependency-checks.patch @@ -0,0 +1,86 @@ +From 219896331c151b147b405f27570ee5521709e2d1 Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com&gt; +Date: Tue, 7 Jul 2020 20:07:30 -0400 +Subject: [PATCH] Fix mutual-exclusion logic + +--- + cinelerra-5.1/configure.ac | 42 +++++++++++++++++++++++--------------- + 1 file changed, 25 insertions(+), 17 deletions(-) + +diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac +index daa267f0..7a2dc0db 100644 +--- a/cinelerra-5.1/configure.ac ++++ b/cinelerra-5.1/configure.ac +@@ -673,10 +673,12 @@ test "x$HAVE_libavc1394" = "xyes" && \ + test "x$HAVE_libiec61883" = "xyes" && \ + test "x$HAVE_libraw1394" = "xyes" && \ + HAVE_FIREWIRE=yes || \ +-HAVE_libavc1394=no && \ +-HAVE_libiec61883=no && \ +-HAVE_libraw1394=no && \ +- HAVE_FIREWIRE=no ++( \ ++ HAVE_libavc1394=no && \ ++ HAVE_libiec61883=no && \ ++ HAVE_libraw1394=no && \ ++ HAVE_FIREWIRE=no \ ++) + + CHECK_WANT([DV], [auto], [use dv], [ + CHECK_LIB([libdv], [dv], [dv_init]) +@@ -700,9 +702,11 @@ CHECK_WANT([ESOUND], [no], [use esd], [ + test "x$HAVE_esound" = "xyes" && \ + test "x$HAVE_audiofile" = "xyes" && \ + HAVE_ESOUND=yes || \ +-HAVE_esound=no && \ +-HAVE_audiofile=no && \ +- HAVE_ESOUND=no ++( \ ++ HAVE_esound=no && \ ++ HAVE_audiofile=no && \ ++ HAVE_ESOUND=no \ ++) + + CHECK_WANT([PULSE], [auto], [use pulseaudio], [ + CHECK_LIB([pulse_simple], [pulse-simple], [pa_simple_new]) +@@ -749,13 +753,15 @@ test "x$HAVE_serd" = "xyes" && \ + test "x$HAVE_sratom" = "xyes" && \ + test "x$HAVE_suil" = "xyes" && \ + HAVE_LV2=yes || \ +-HAVE_lv2=no && \ +-HAVE_lilv=no && \ +-HAVE_sord=no && \ +-HAVE_serd=no && \ +-HAVE_sratom=no && \ +-HAVE_suil=no && \ +- HAVE_LV2=no ++( \ ++ HAVE_lv2=no && \ ++ HAVE_lilv=no && \ ++ HAVE_sord=no && \ ++ HAVE_serd=no && \ ++ HAVE_sratom=no && \ ++ HAVE_suil=no && \ ++ HAVE_LV2=no \ ++) + + CHECK_WANT([CUDA], [auto], [build cuda plugins], [ + CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])]) +@@ -813,9 +819,11 @@ AC_SUBST([HAVE_OPENEXR]) + test "x$HAVE_openexr" = "xyes" && \ + test "x$HAVE_ilmbase" = "xyes" && \ + HAVE_OPENEXR=yes || \ +-HAVE_openexr=no && \ +-HAVE_ilmbase=no && +- HAVE_OPENEXR=no ++( \ ++ HAVE_openexr=no && \ ++ HAVE_ilmbase=no && \ ++ HAVE_OPENEXR=no \ ++) + + # build global_config + OBJDIR=`uname -m` +-- +2.26.2 + diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec index 22ed32b..259f2e7 100644 --- a/cinelerra-gg.spec +++ b/cinelerra-gg.spec @@ -3,7 +3,7 @@ Name: cinelerra-gg Version: 5.1%{?tag_version:.%{tag_version}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A non linear video editor and effects processor # The Cinelerra-GG codebase is licensed GPLv2+ # The GREYcstoration plugin is licensed CeCILL v2.0 @@ -18,7 +18,7 @@ Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snap Patch0: cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch # Fix configure logic for lv2 dependencies # Submitted upstream: https://www.cinelerra-gg.org/bugtracker/view.php?id=473 -Patch1: 0001-Fix-lv2-dep-logic.patch +Patch1: 0001-Fix-interdependency-checks.patch # Only tested on x86_64 ExclusiveArch: x86_64 @@ -53,9 +53,12 @@ BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(IlmBase) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libdv) BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libusb) @@ -121,7 +124,7 @@ BuildArch: noarch %setup -q -n cinelerra-%{git_tag}/cinelerra-5.1 %patch0 -p2 -b.crystal -%patch1 -p2 -b.lv2_deps +%patch1 -p2 -b.all_or_none ./autogen.sh @@ -142,6 +145,7 @@ sed -i 's/\<python\>/python3/' guicast/Makefile --enable-dav1d=auto \ --enable-flac=yes \ --enable-fftw=auto \ + --enable-ilmBase=shared \ --enable-lame=auto \ --enable-libaom=auto \ --enable-libdv=auto \ @@ -155,6 +159,8 @@ sed -i 's/\<python\>/python3/' guicast/Makefile --enable-lilv=shared \ --enable-lv2=shared \ --enable-openjpeg=auto \ + --enable-openexr=shared \ + --enable-openExr=shared \ --enable-opus=auto \ --enable-serd=shared \ --enable-sord=shared \ @@ -171,6 +177,7 @@ sed -i 's/\<python\>/python3/' guicast/Makefile --with-ladspa-dir=%{_libdir}/ladspa \ --without-opencv \ --with-openexr \ + --with-pulse \ # WIP # --with-dv=no \ @@ -181,7 +188,6 @@ sed -i 's/\<python\>/python3/' guicast/Makefile # --with-thirdparty=no \ # --with-commercial=no \ # --with-libzmpeg=no \ -# --enable-static-build=no \ # Re-enable hardening %define _hardened_build 1 @@ -218,6 +224,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %changelog +* Tue Jul 07 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 5.1.2020.06-3 +- Update configure.ac patch to fix all interdependency checks +- Use shared libs for some parts of IlmBase (OpenEXR dependency) +- Enable pulseaudio support + * Tue Jul 07 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 5.1.2020.06-2 - Switch to shared liblilv (also removes its build dependencies from the build: serd, sord, sratom, suil)