[cinelerra-gg] Update to 2019-08-01 snapshot, fix FTBFS issues

commit b03799102999a11c4709deceb9287b72e9a25a8a Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; Date: Thu Aug 29 13:59:29 2019 -0400 Update to 2019-08-01 snapshot, fix FTBFS issues .gitignore | 1 + cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch | 24 ++++++++++++++++++++++++ cinelerra-gg.spec | 16 +++++++++++++--- sources | 2 +- 4 files changed, 39 insertions(+), 4 deletions(-) --- diff --git a/.gitignore b/.gitignore index 49203c1..0b5d0a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cinelerra-gg-d5a0afb.tar.gz +/cinelerra-gg-b8cd5c4.tar.gz diff --git a/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch b/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch new file mode 100644 index 0000000..9686751 --- /dev/null +++ b/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch @@ -0,0 +1,24 @@ +From 697b3d5c6e41b5b7fbd538cac17426037a4599d1 Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com&gt; +Date: Thu, 29 Aug 2019 13:19:54 -0400 +Subject: [PATCH] Disable crystalhd in ffmpeg + +--- + cinelerra-5.1/thirdparty/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile +index 905731e..d738011 100644 +--- a/cinelerra-5.1/thirdparty/Makefile ++++ b/cinelerra-5.1/thirdparty/Makefile +@@ -111,6 +111,7 @@ esound.ldflags=" -lm -lstdc++" + fftw.cfg_params= --disable-fortran --enable-shared=no + ffmpeg.cfg_params= \ + --enable-pthreads --enable-gpl --disable-ffplay \ ++ --disable-crystalhd \ + $(if $(WANT_VAAPI),--enable-vaapi,--disable-vaapi) \ + $(if $(WANT_VDPAU),--enable-vdpau,--disable-vdpau) \ + $(if $(WANT_NV), --enable-nvenc --enable-nvdec) \ +-- +2.21.0 + diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec index 14babe8..805095a 100644 --- a/cinelerra-gg.spec +++ b/cinelerra-gg.spec @@ -1,10 +1,10 @@ -%global commit0 d5a0afb9bc8562f6c2698f88ff40790009a5e63c +%global commit0 b8cd5c4f5f296f626f5ec691d2440612bcf59422 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global snapshotdate 20181217 +%global snapshotdate 20190801 Name: cinelerra-gg Version: 5.1 -Release: 55.%{snapshotdate}git%{shortcommit0}%{?dist} +Release: 56.%{snapshotdate}git%{shortcommit0}%{?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 @@ -15,6 +15,9 @@ License: GPLv2+ and CeCILL and BSD and CC-BY and Public Domain Url: https://cinelerra-gg.org/ Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snapshot;h=%{... +# CrystalHD is fouling the ffmpeg build +Patch0: cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch + # Only tested on x86_64 ExclusiveArch: x86_64 @@ -109,6 +112,8 @@ BuildArch: noarch %prep %setup -q -n cinelerra-%{shortcommit0}/cinelerra-%{version} +%patch0 -p2 -b.crystal + ./autogen.sh @@ -129,6 +134,7 @@ BuildArch: noarch --with-ladspa-build=no \ --with-ladspa-dir=%{_libdir}/ladspa \ --with-lv2=no \ + --with-cuda=no \ # WIP # --with-dv=no \ @@ -177,6 +183,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %changelog +* Thu Aug 29 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 5.1-56.20190801gitb8cd5c4 +- Update to 2019-08 snapshot version +- Remove crystalhd from ffmpeg (build fails), turn off CUDA + * Mon Aug 26 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 5.1-55.20181217gitd5a0afb - Update to 5.1 snapshot with python3 build process - Switch to -gg diff --git a/sources b/sources index 1b4a2c4..5e9c437 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -018f8737923101664d1fbd68e49a185f cinelerra-gg-d5a0afb.tar.gz +7af32ebcabc014dcb1fa4433eda76218 cinelerra-gg-b8cd5c4.tar.gz