[cinelerra-gg] Update to 2019-08-01 snapshot, fix FTBFS issues
by Frank R Dana
commit b03799102999a11c4709deceb9287b72e9a25a8a
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
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>
+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> - 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> - 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
4 years, 7 months
[cinelerra-gg] Import approved 5.1-gg package
by Frank R Dana
commit eaa660e75eb433e0a4d63efd56d99758066f178c
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Aug 26 18:55:12 2019 -0400
Import approved 5.1-gg package
.gitignore | 1 +
cinelerra-gg.spec | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 263 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..49203c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cinelerra-gg-d5a0afb.tar.gz
diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec
new file mode 100644
index 0000000..14babe8
--- /dev/null
+++ b/cinelerra-gg.spec
@@ -0,0 +1,261 @@
+%global commit0 d5a0afb9bc8562f6c2698f88ff40790009a5e63c
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global snapshotdate 20181217
+
+Name: cinelerra-gg
+Version: 5.1
+Release: 55.%{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
+# The Google SHA1 implementation is licensed BSD 3-clause
+# The Neophyte theme is licensed Creative Commons CC-BY 4.0
+# 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=%{...
+
+# Only tested on x86_64
+ExclusiveArch: x86_64
+
+BuildRequires: cmake
+BuildRequires: ctags
+BuildRequires: curl
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: libtool
+BuildRequires: nasm
+BuildRequires: perl-interpreter
+BuildRequires: python3
+BuildRequires: texinfo
+BuildRequires: udftools
+BuildRequires: wget
+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(fftw3)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(libdv)
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libtiff-4)
+BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libv4l2)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(lv2)
+BuildRequires: pkgconfig(mjpegtools)
+BuildRequires: pkgconfig(ncurses)
+BuildRequires: pkgconfig(opencv)
+BuildRequires: pkgconfig(OpenEXR)
+BuildRequires: pkgconfig(opus)
+BuildRequires: pkgconfig(sndfile)
+BuildRequires: pkgconfig(sratom-0)
+BuildRequires: pkgconfig(suil-0)
+BuildRequires: pkgconfig(theora)
+BuildRequires: pkgconfig(twolame)
+BuildRequires: pkgconfig(uuid)
+BuildRequires: pkgconfig(vdpau)
+BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(vpx)
+BuildRequires: pkgconfig(x264)
+BuildRequires: pkgconfig(x265)
+BuildRequires: pkgconfig(xft)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xv)
+
+#Disabled until opencv_contrib-freeworld is introduced
+#Requires: python2-opencv
+
+# Obsolete cinelerra(-cv)
+Obsoletes: cinelerra < %{version}-%{release}
+Provides: cinelerra = %{version}-%{release}
+Obsoletes: cinelerra-cv < %{version}-%{release}
+Provides: cinelerra-cv = %{version}-%{release}
+
+# Require HTML documentation
+Requires: %{name}-doc = %{version}-%{release}
+
+%global _description\
+Non-linear audio/video authoring tool Cinelerra-GG is a complete audio and\
+video authoring tool. It understands a lot of multimedia formats as quicktime,\
+avi, ogg also audio/video compression codecs divx, xvid, mpeg2.\
+\
+This is the "goodguy" version of Cinelerra.
+
+%description %_description
+
+
+%package doc
+Summary: Documentation files for %{name}
+BuildArch: noarch
+
+%description doc %_description
+
+
+%prep
+%setup -q -n cinelerra-%{shortcommit0}/cinelerra-%{version}
+
+./autogen.sh
+
+
+%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 \
+ --with-browser=xdg-open \
+ --with-firewire=no \
+ --with-ladspa-build=no \
+ --with-ladspa-dir=%{_libdir}/ladspa \
+ --with-lv2=no \
+
+# WIP
+# --with-dv=no \
+# --enable-giflib=no \
+# --enable-flac=no \
+# --enable-libuuid=no \
+# --with-opencv=sys \
+# --with-thirdparty=no \
+# --with-commercial=no \
+# --with-libzmpeg=no \
+# --enable-static-build=no \
+
+%make_build V=0
+
+
+%install
+%make_install V=0
+
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+
+%find_lang %{name}
+
+%files -f %{name}.lang
+%license COPYING
+%license plugins/theme_neophyte/Neophyte_License.txt
+%doc README
+%{_bindir}/%{name}
+%{_bindir}/cin_db
+%{_bindir}/zmpeg3cat
+%{_bindir}/zmpeg3cc2txt
+%{_bindir}/zmpeg3ifochk
+%{_bindir}/zmpeg3show
+%{_bindir}/zmpeg3toc
+%{_bindir}/bdwrite
+%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/doc
+%{_libdir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.svg
+%{_datadir}/pixmaps/%{name}.xpm
+
+%files doc
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/doc
+
+
+%changelog
+* Mon Aug 26 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 5.1-55.20181217gitd5a0afb
+- Update to 5.1 snapshot with python3 build process
+- Switch to -gg
+- ExclusiveArch x86_64
+- Add -doc subpackage
+
+* Thu Feb 18 2016 Sérgio Basto <sergio(a)serjux.com> - 2.3-9.20160216git5aa9bc2
+- Fix undefined-non-weak-symbols on libguicast.so .
+- Add 0001-Do-not-ask-for-specific-Microsoft-fonts.patch is what left from
+ patch: "Remove bundle fonts and fix font search path" and was not accepted
+ upstream.
+
+* Fri Jan 15 2016 Sérgio Basto <sergio(a)serjux.com> - 2.3-8.20160216git5aa9bc2
+- AutoTools replace the obsoleted AC_PROG_LIBTOOL, patch7.
+- To fix hardened linkage, patch8.
+- More reviews like replace RPM_BUILD_ROOT, own directories, more documentation,
+ description-line-too-long errors.
+
+* Thu Jan 14 2016 Sérgio Basto <sergio(a)serjux.com> - 2.3-7.20160114git454be60
+- Update license tag.
+- Add license macro.
+- use macro make_build .
+- use macro make_install .
+- Improve conditional builds.
+
+* Mon Oct 26 2015 Sérgio Basto <sergio(a)serjux.com> - 2.3-6.20151026git99d2887
+- Update to git 99d2887, drop cinelerra-cv-remove-fonts.patch is was applied upstream.
+
+* Mon Oct 05 2015 Sérgio Basto <sergio(a)serjux.com> - 2.3-5.20151005gitd189a04
+- Update to git d189a04
+
+* Tue Sep 29 2015 Sérgio Basto <sergio(a)serjux.com> - 2.3-4.20150929git2c849c6
+- Drop upstreamed cinelerra-cv-intltoolize.patch
+
+* Tue Sep 15 2015 Sérgio Basto <sergio(a)serjux.com> - 2.3-3.20150912gitc25d3b1
+- Applied cinelerra-cv-intltoolize.patch
+
+* Mon Sep 14 2015 Sérgio Basto <sergio(a)serjux.com> - 2.3-2.20150912gitc25d3b1
+- Enabled findobject plugin using OpenCV 2.0 .
+- Fix unknown freetype2 option, an configure warning.
+
+* Sun Sep 13 2015 Sérgio Basto <sergio(a)serjux.com> - 2.3-1.20150912gitc25d3b1
+- Update cinelerra-cv to 2.3 more a few commits.
+
+* Wed Dec 24 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.9.20141224git70b8c14
+- Update to 20141224git70b8c14
+
+* Sun Oct 12 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1.20141012git623e87e-1
+- Update to git623e87e
+
+* Sat Sep 27 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.8.20140927git9cbf7f0
+- Update to cinelerra-cv-2.2.1-20140927git9cbf7f0
+
+* Sun Jul 27 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.7.20140727git92dba16
+- Update to 20140727 git 92dba16 .
+
+* Sun May 25 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.5.20140525gitef4fddb
+- Update to git ef4fddb
+- Added cinelerra-cv-ffmpeg_api2.2.patch and cinelerra-cv-ffmpeg2.0.patch and build with external ffmpeg.
+- make it work --with or --without libmpeg3_system and ffmpeg_system.
+
+* Wed Apr 30 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.3.20140426git9154825
+- Added imlib2-devel as BR to build vhook/imlib2.so
+
+* Tue Apr 29 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.2.20140426git9154825
+- Drop a file in /etc/sysctl.d instead to tweaking /etc/sysctl.conf
+- Removed gcc-g++ as BR
+- Use libmpeg3 from system
+- Remove bundle fonts and fix font search path
+- Scriptlet for desktop-database
+- Disabled 3dnow
+- Program-suffix -cv
+
+* Mon Apr 28 2014 Sérgio Basto <sergio(a)serjux.com> - 2.2.1-0.1
+- Initial spec, copied from David Vasquez and changed based on
+ cinelerra-f15.spec from Atrpms and also changed based on
+ openmamba/devel/specs/cinelerra-cv.spec
+
+* Mon Sep 30 2013 David Vasquez <davidjeremias82(a)gmail.com> - 2.2-1
+- Initial package creation for Fedora 19
+- Spec inspirated in PKGBUILD Arch Linux
+- Add freeing more shared memory from RPM Fusion
diff --git a/sources b/sources
index e69de29..1b4a2c4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+018f8737923101664d1fbd68e49a185f cinelerra-gg-d5a0afb.tar.gz
4 years, 7 months
[nvidia-340xx-kmod] Exclude i686 for F31+
by Leigh Scott
commit 95d59462c439c94e9666ec6ff9f978f638e1cd7d
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Aug 29 14:43:22 2019 +0100
Exclude i686 for F31+
nvidia-340xx-kmod.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 27cb715..50db72a 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.107
# Taken over by kmodtool
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,9 +21,11 @@ Patch0: nv-linux-arm.patch
Patch1: buildfix_kernel_5.0.patch
Patch2: xf86-video-nvidia-legacy-02-fix-linux-5.1.patch
-# needed for plague to make sure it builds for i586 and i686
-#ExclusiveArch: i686 x86_64 armv7hl
+%if 0%{?fedora} > 30
+ExclusiveArch: x86_64
+%else
ExclusiveArch: i686 x86_64
+%endif
# get the needed BuildRequires (in parts depending on what we build for)
%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-340xx-kmodsrc >= %{epoch}:%{version}
@@ -77,6 +79,9 @@ done
%{?akmod_install}
%changelog
+* Thu Aug 29 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.107-10
+- Exclude i686 for F31+
+
* Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.107-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[EmptyEpsilon] Upgrade to 2019.05.21
by Jan Kalina
commit 728a310824ea9fc6455dd1e47659dddd7e281545
Author: Honza <honza889(a)gmail.com>
Date: Wed Aug 28 21:41:28 2019 +0200
Upgrade to 2019.05.21
.gitignore | 2 ++
EmptyEpsilon.spec | 11 +++++++----
sources | 4 ++--
3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fa28d6..d18f8f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/SeriousProton-EE-2017.11.03.zip
/EmptyEpsilon-EE-2018.02.15.zip
/SeriousProton-EE-2018.02.15.zip
+/SeriousProton-EE-2019.05.21.zip
+/EmptyEpsilon-EE-2019.05.21.zip
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index 7bc7ed0..8351299 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -1,11 +1,11 @@
-%global version_major 2018
-%global version_minor 02
-%global version_patch 15
+%global version_major 2019
+%global version_minor 05
+%global version_patch 21
Name: EmptyEpsilon
Summary: Spaceship bridge simulator game
Version: %{version_major}.%{version_minor}.%{version_patch}
-Release: 5%{?dist}
+Release: 1%{?dist}
License: GPLv2
Recommends: xclip
BuildRequires: cmake
@@ -79,6 +79,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}.desktop
%changelog
+* Wed Aug 28 2019 Jan Kalina <honza889(a)gmail.com> - 2019.05.21-1
+- New version of game
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2018.02.15-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index e23600d..d257b39 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7ffad34a75c9888f27c214ef9f175b4c EmptyEpsilon-EE-2018.02.15.zip
-212aadc1f44b8bc4eced10b1c6e47ee8 SeriousProton-EE-2018.02.15.zip
+93b6efec2e22953ec149bf84e85bfe54 SeriousProton-EE-2019.05.21.zip
+a2ddbf0995f9bdd5a4e551bb770c8e57 EmptyEpsilon-EE-2019.05.21.zip
4 years, 7 months
