7:48 a.m.
commit f1b7fbc7defd0df5e38f313a695d753227109937
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Jan 4 02:47:18 2020 -0500
Update to 2019-12 snapshot
.gitignore | 1 +
cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch | 22 ++-----
cinelerra-gg.spec | 80 +++++++++++++++++---------
sources | 2 +-
4 files changed, 59 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b5d0a8..8160ebb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cinelerra-gg-d5a0afb.tar.gz
/cinelerra-gg-b8cd5c4.tar.gz
+/cinelerra-gg-3878a69.tar.bz2
diff --git a/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch
b/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch
index 9686751..0f7de29 100644
--- a/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch
+++ b/cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch
@@ -1,24 +1,10 @@
-From 697b3d5c6e41b5b7fbd538cac17426037a4599d1 Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com>
-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++"
+@@ -127,6 +127,7 @@
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
-
+ $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \
+ $(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \
+ $(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \
diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec
index c72ff5d..2b616f2 100644
--- a/cinelerra-gg.spec
+++ b/cinelerra-gg.spec
@@ -1,10 +1,10 @@
-%global commit0 b8cd5c4f5f296f626f5ec691d2440612bcf59422
+%global commit0 3878a693e0ea8626268a95333a11954cf9c10930
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global snapshotdate 20190801
+%global snapshotdate 20191231
Name: cinelerra-gg
Version: 5.1
-Release: 56.%{snapshotdate}git%{shortcommit0}%{?dist}
+Release: 57.%{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
@@ -13,15 +13,11 @@ Summary: A non linear video editor and effects processor
# The freeverb components and the Tapeworm font are in the public Domain
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=%{...
+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
-# glibc 2.30+ provides gettid(), protect against redefining in guicast
-# Submitted upstream: https://www.cinelerra-gg.org/bugtracker/view.php?id=290
-Patch1: cinelerra-gg-gettid-check.patch
-
# Only tested on x86_64
ExclusiveArch: x86_64
@@ -43,16 +39,16 @@ BuildRequires: yasm
BuildRequires: CImg-devel
BuildRequires: jbigkit-devel
BuildRequires: kernel-headers
-BuildRequires: giflib-devel
-BuildRequires: ladspa-devel
BuildRequires: lame-devel
-BuildRequires: liba52-devel
BuildRequires: lilv-devel
BuildRequires: pulseaudio-utils
-BuildRequires: numactl-devel
BuildRequires: perl(XML::LibXML)
BuildRequires: perl(XML::Parser)
BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(aom)
+BuildRequires: pkgconfig(bzip2)
+BuildRequires: pkgconfig(dav1d)
+BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gl)
@@ -63,11 +59,14 @@ BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libusb)
BuildRequires: pkgconfig(libv4l2)
+BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(lv2)
BuildRequires: pkgconfig(mjpegtools)
BuildRequires: pkgconfig(ncurses)
-BuildRequires: pkgconfig(opencv)
+BuildRequires: pkgconfig(numa)
+#BuildRequires: pkgconfig(opencv)
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(sndfile)
@@ -118,7 +117,6 @@ BuildArch: noarch
%setup -q -n cinelerra-%{shortcommit0}/cinelerra-%{version}
%patch0 -p2 -b.crystal
-%patch1 -p2 -b.gettid
./autogen.sh
@@ -127,23 +125,43 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
%build
+
+# Temporarily turn off hardening (just for the configure step), as
+# it breaks OpenEXR detection. It'll be re-enabled before building.
+%undefine _hardened_build
+
%configure \
--with-exec-name=%{name} \
- --enable-lame=shared \
- --enable-libogg=shared \
- --enable-libtheora=shared \
- --enable-libvorbis=shared \
- --enable-openjpeg=shared \
- --enable-twolame=shared \
- --enable-x264=shared \
- --enable-x265=shared \
- --enable-libvpx=yes \
+ --disable-static-build \
+ --enable-a52dec=yes \
+ --enable-dav1d=auto \
+ --enable-flac=yes \
+ --enable-fftw=auto \
+ --enable-lame=auto \
+ --enable-libaom=auto \
+ --enable-libdv=auto \
+ --enable-libjpeg=auto \
+ --enable-libogg=auto \
+ --enable-libsndfile=auto \
+ --enable-libtheora=auto \
+ --enable-libvorbis=auto \
+ --enable-libvpx=auto \
+ --enable-libwebp=auto \
+ --enable-lilv=auto \
+ --enable-lv2=shared \
+ --enable-openjpeg=auto \
+ --enable-opus=auto \
+ --enable-tiff=auto \
+ --enable-twolame=auto \
+ --enable-x264=auto \
+ --enable-x265=auto \
--with-browser=xdg-open \
- --with-firewire=no \
- --with-ladspa-build=no \
+ --without-cuda \
+ --without-firewire \
+ --without-ladspa-build \
--with-ladspa-dir=%{_libdir}/ladspa \
- --with-lv2=no \
- --with-cuda=no \
+ --without-opencv \
+ --with-openexr \
# WIP
# --with-dv=no \
@@ -156,6 +174,9 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
# --with-libzmpeg=no \
# --enable-static-build=no \
+# Re-enable hardening
+%define _hardened_build 1
+
%make_build V=0
@@ -192,6 +213,11 @@ desktop-file-validate
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Wed Jan 01 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> -
5.1-56.20191231git3878a69
+- New upstream 2019-12 snapshot release, switch to .tar.bz2 archives
+- Drop upstreamed patches, rebase crystalhd patch
+- Enable LV2 plugin support
+
* Fri Aug 30 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> -
5.1-56.20190801gitb8cd5c4
- Update to 2019-08 snapshot version
- Add libusb build req
diff --git a/sources b/sources
index 5e9c437..3a92e80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7af32ebcabc014dcb1fa4433eda76218 cinelerra-gg-b8cd5c4.tar.gz
+SHA512 (cinelerra-gg-3878a69.tar.bz2) =
48cdf8493d8321fce0a246644178aba09668b987c81975f36394144ff1ac6a40495d2c57e0830c712287ecbca75fedd563e3fa17d8213a42420e5b3c475b2b6e