commit b8d139d61a4e9693b1a06cea6886e6127c1a15e1 Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; Date: Wed Apr 10 15:21:09 2019 -0400 Build from latest git HEAD Fixes FTBFS under GCC9 (F30/rawhide) .gitignore | 1 + libopenshot.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index da7f28d..a2b4e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libopenshot-0.0.6.tar.gz /libopenshot-0.2.0.tar.gz /libopenshot-0.2.2.tar.gz /libopenshot-0.2.3.tar.gz +/libopenshot-101f25a.tar.gz diff --git a/libopenshot.spec b/libopenshot.spec index dd45462..fd3add7 100644 --- a/libopenshot.spec +++ b/libopenshot.spec @@ -1,21 +1,24 @@ +%global gitrev 101f25a7f5a1623cca2b2514fa2f7aed93799324 +%global shortrev %(c=%{gitrev}; echo ${c:0:7}) +%global gitdate 20190406 + Name: libopenshot Version: 0.2.3 -Release: 1%{?dist} +Release: 2.%{gitdate}git%{shortrev}%{?dist} Summary: Library for creating and editing videos License: LGPLv3+ URL: http://www.openshot.org/ -Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version... +Source0: https://github.com/OpenShot/%{name}/archive/%{gitrev}.tar.gz#/%{name}-%{s... -# -Patch1: %{name}-fix_swig_variable.patch +# Fixed upstream +#Patch1: %{name}-fix_swig_variable.patch BuildRequires: gcc-c++ %{?el7:BuildRequires: epel-rpm-macros} BuildRequires: cmake3 BuildRequires: ImageMagick-c++-devel BuildRequires: ffmpeg-devel -BuildRequires: libopenshot-audio-devel >= 0.1.8 BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtmultimedia-devel BuildRequires: unittest-cpp-devel @@ -23,6 +26,13 @@ BuildRequires: cppzmq-devel BuildRequires: zeromq-devel BuildRequires: jsoncpp-devel +# Dependency on libopenshot-audio 0.1.8 is insufficient, this libopenshot +# code can only be built and run with a libopenshot-audio release containing +# the new JUCE 5 APIs, which were introduced in the specific package releases +# indicated. This restriction will be eliminated with the next official +# releases of libopenshot and libopenshot-audio. +BuildRequires: libopenshot-audio-devel >= 0:0.1.8-2 +Requires: libopenshot-audio%{?isa} >= 0:0.1.8-2 %description OpenShot Library (libopenshot) is an open-source project @@ -64,12 +74,12 @@ applications that use %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{gitrev} sed -e 's|-g -ggdb|-g|g' -i src/CMakeLists.txt tests/CMakeLists.txt -sed -e 's|-std=c++11|%{optflags} -std=c++11 %{__global_ldflags} -Wl,--as-needed|g' -i CMakeLists.txt %build +export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}" %cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_SKIP_RPATH:BOOL=YES -DUSE_SYSTEM_JSONCPP:BOOL=ON . %make_build @@ -99,6 +109,11 @@ sed -e 's|-std=c++11|%{optflags} -std=c++11 %{__global_ldflags} -Wl,--as-needed| %changelog +* Tue Apr 09 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.3-2 +- Upgrade to latest git revision, to fix FTBFS with GCC9 on Fedora 30 +- Requires libopenshot-audio also built from same or later gitrev +- Drop upstreamed patches + * Fri Mar 22 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.3-1 - New upstream release - Drop upstreamed patches diff --git a/sources b/sources index 71b3780..f56116a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ba70ff88ef52f658ce550aad1f5eaa1 libopenshot-0.2.3.tar.gz +ccadd77620b6c53f19e916b1ec96556d libopenshot-101f25a.tar.gz