4:44 p.m.
commit 5896285550c65b53730155a921d74a615ed0bb39
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Apr 9 12:26:47 2019 -0400
Build from latest git HEAD
Fixes FTBFS under GCC9 (F30/rawhide)
.gitignore | 1 +
libopenshot-audio-isfinite.patch | 22 ----------------------
libopenshot-audio-noX11.patch | 32 ++++++++++++++++++++++++++++++++
libopenshot-audio-noXinerama.patch | 26 --------------------------
libopenshot-audio.spec | 36 ++++++++++++++++++++++++++----------
sources | 2 +-
6 files changed, 60 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 132943a..3885822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ libopenshot-audio-0.0.6.tar.gz
/libopenshot-audio-0.1.6.tar.gz
/libopenshot-audio-0.1.7.tar.gz
/libopenshot-audio-0.1.8.tar.gz
+/libopenshot-audio-7001b68.tar.gz
diff --git a/libopenshot-audio-noX11.patch b/libopenshot-audio-noX11.patch
new file mode 100644
index 0000000..367a785
--- /dev/null
+++ b/libopenshot-audio-noX11.patch
@@ -0,0 +1,32 @@
+From 9d4a7ddf1bb8092358c64af9c92ebdb846a4f9dc Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com>
+Date: Tue, 9 Apr 2019 12:04:14 -0400
+Subject: [PATCH] Remove X11 dependencies
+
+---
+ CMakeLists.txt | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99e9769..0763341 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,13 +150,11 @@ ELSE (WIN32)
+ SET_PROPERTY(GLOBAL PROPERTY JUCE_LINUX "JUCE_LINUX")
+ SET(EXTENSION "cpp")
+
+- find_package(X11 REQUIRED)
+- find_package(Freetype REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(ALSA REQUIRED)
+- include_directories(${X11_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${ALSA_INCLUDE_DIR})
++ include_directories(${ZLIB_INCLUDE_DIR} ${ALSA_INCLUDE_DIR})
+ ADD_DEFINITIONS(-DLINUX)
+- SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${X11_LIBRARIES} ${FREETYPE_LIBRARIES}
${ZLIB_LIBRARIES} ${ALSA_LIBRARIES})
++ SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${ZLIB_LIBRARIES} ${ALSA_LIBRARIES})
+ SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11")
+ ENDIF(APPLE)
+ ENDIF(UNIX)
+--
+2.20.1
+
diff --git a/libopenshot-audio.spec b/libopenshot-audio.spec
index 3219409..b97e8cc 100644
--- a/libopenshot-audio.spec
+++ b/libopenshot-audio.spec
@@ -1,23 +1,34 @@
+%global gitrev 7001b68787c0881a44bcafba98cccae509a31644
+%global shortrev %(c=%{gitrev}; echo ${c:0:7})
+%global gitdate 20190405
+
Name: libopenshot-audio
Version: 0.1.8
-Release: 1%{?dist}
+Release: 2.%{gitdate}git%{shortrev}%{?dist}
Summary: Audio library used by OpenShot
License: GPLv3+
URL: http://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...
+
+# No longer necessary with JUCE 5.4.3 configuration
+#Patch0: libopenshot-audio-noXinerama.patch
+# Upstreamed
+#Patch1: libopenshot-audio-isfinite.patch
-Patch0: libopenshot-audio-noXinerama.patch
-Patch1: libopenshot-audio-isfinite.patch
+# Fix cmake configuration to remove X11 dependency
+Patch2: libopenshot-audio-noX11.patch
BuildRequires: gcc-c++
BuildRequires: cmake
-BuildRequires: freetype-devel
BuildRequires: alsa-lib-devel
-BuildRequires: libX11-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXrandr-devel
-#BuildRequires: libXinerama-devel
+BuildRequires: zlib-devel
+# Graphical dependencies in JUCE code removed upstream
+#BuildRequires: freetype-devel
+#BuildRequires: libX11-devel
+#BuildRequires: libXcursor-devel
+#BuildRequires: libXrandr-devel
+#BuildRequires: libXinerama-devel
%description
OpenShot Audio Library (libopenshot-audio) is an open-source
@@ -35,7 +46,7 @@ developing applications that use %{name}.
%prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{gitrev}
%build
@@ -66,6 +77,11 @@ make %{?_smp_mflags}
%changelog
+* Tue Apr 09 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.1.8-2
+- Upgrade to latest git revision, to fix FTBFS with GCC9 on Fedora 30
+- libopenshot-audio upgraded to JUCE 5.4.3 internally
+- Drop patches upstreamed or made unnecessary by JUCE update
+
* Fri Mar 22 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.1.8-1
- New upstream release
diff --git a/sources b/sources
index c50a1a0..ff55a6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-989a367f1f0546b3f0d9940c79337924 libopenshot-audio-0.1.8.tar.gz
+843f7ec04171a8e9c52186dfb09242e5 libopenshot-audio-7001b68.tar.gz