[libopenshot-audio] Build from latest git HEAD
by Frank R Dana
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
5 years, 1 month
[libftl] Added patches for headers and library destination handling
by Momcilo Medic
commit cefe276a9c3e16aa424c7f56d2cd895361fd7dc9
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Tue Apr 9 13:52:22 2019 +0200
Added patches for headers and library destination handling
.gitignore | 1 +
headers-fix.patch | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
libdir-fix.patch | 19 ++++++++++
libftl.spec | 59 +++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 191 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..82e1d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/libftl-0.9.14.tar.gz
diff --git a/headers-fix.patch b/headers-fix.patch
new file mode 100644
index 0000000..e20c60f
--- /dev/null
+++ b/headers-fix.patch
@@ -0,0 +1,111 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ MESSAGE(STATUS "FTL DISABLE_FTL_APP: " ${DISABLE_FTL_APP})
+ option(FTL_STATIC_COMPILE "Set to TRUE if you want ftl to be compiled as a static lib. If TRUE, the program will want to statically link to the ftl cmake object." FALSE)
+ MESSAGE(STATUS "FTL FTL_STATIC_COMPILE: " ${FTL_STATIC_COMPILE})
+
++option(FTL_INSTALL_INCLUDES "Set to TRUE if you want development headers to be installed." FALSE)
++MESSAGE(STATUS "FTL FTL_INSTALL_INCLUDES: " ${FTL_INSTALL_INCLUDES})
++
+ find_package(Threads REQUIRED)
+
+ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+@@ -57,17 +60,18 @@ if (WIN32)
+ ftl_app/win32/ctrlc_handler.c)
+ #set(FTL_PLATFORM_LIBS kernel32 user32 gdi32 advapi32 )
+ #set(FTL_PLATFORM_LIBS ws2_32 )
+- set(FTLSDK_PLATFORM_FILES libftl/win32/socket.c
+- libftl/win32/socket.h
+- libftl/win32/threads.c
+- libftl/win32/threads.h)
++ set(FTLSDK_PLATFORM_HEADERS libftl/win32/socket.h
++ libftl/win32/threads.h)
++ set(FTLSDK_PLATFORM_SOURCES libftl/win32/socket.c
++ libftl/win32/threads.c)
+ include_directories(libftl/win32)
+ else()
+ set(FTL_PLATFORM_FILES ftl_app/posix/ctrlc_handler.c)
+- set(FTLSDK_PLATFORM_FILES libftl/posix/socket.c
+- libftl/posix/socket.h
+- libftl/posix/threads.c
+- libftl/posix/threads.h)
++
++ set(FTLSDK_PLATFORM_HEADERS libftl/posix/socket.h
++ libftl/posix/threads.h)
++ set(FTLSDK_PLATFORM_SOURCES libftl/posix/socket.c
++ libftl/posix/threads.c)
+ include_directories(libftl/posix)
+ endif()
+
+@@ -79,21 +83,33 @@ else(FTL_STATIC_COMPILE)
+ set(FTL_LIB_TYPE SHARED)
+ endif(FTL_STATIC_COMPILE)
+
+-add_library(ftl ${FTL_LIB_TYPE} libftl/hmac/hmac.c
+- libftl/hmac/hmac.h
+- libftl/hmac/sha2.c
+- libftl/hmac/sha2.h
+- libftl/gettimeofday/gettimeofday.c
+- libftl/gettimeofday/gettimeofday.h
+- libftl/ftl-sdk.c
+- libftl/handshake.c
+- libftl/ingest.c
+- libftl/ftl_helpers.c
+- libftl/media.c
+- libftl/logging.c
+- libftl/ftl.h
+- libftl/ftl_private.h
+- ${FTLSDK_PLATFORM_FILES})
++set(FTL_HEADERS
++ libftl/ftl.h
++ libftl/ftl_private.h)
++
++set(FTL_HMAC_HEADERS
++ libftl/hmac/hmac.h
++ libftl/hmac/sha2.h)
++
++set(FTL_GETTIMEOFDAY_HEADERS
++ libftl/gettimeofday/gettimeofday.h)
++
++set(FTL_SOURCES
++ libftl/hmac/hmac.c
++ libftl/hmac/sha2.c
++ libftl/gettimeofday/gettimeofday.c
++ libftl/ftl-sdk.c
++ libftl/handshake.c
++ libftl/ingest.c
++ libftl/ftl_helpers.c
++ libftl/media.c
++ libftl/logging.c)
++
++add_library(ftl ${FTL_LIB_TYPE} ${FTL_HEADERS}
++ ${FTL_HMAC_HEADERS}
++ ${FTL_GETTIMEOFDAY_HEADERS}
++ ${FTLSDK_PLATFORM_HEADERS}
++ ${FTLSDK_PLATFORM_SOURCES})
+ include_directories(libftl libftl/gettimeofday)
+
+ set_target_properties(ftl PROPERTIES VERSION "0.5.0")
+@@ -132,4 +148,19 @@ endif()
+
+ # Install rules
+ install(TARGETS ftl DESTINATION
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+\ No newline at end of file
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++
++if (FTL_INSTALL_INCLUDES)
++foreach(ITEM ${FTL_HEADERS})
++ install(FILES ${ITEM} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ftl)
++endforeach()
++foreach(ITEM ${FTL_HMAC_HEADERS})
++ install(FILES ${ITEM} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ftl/hmac/)
++endforeach()
++foreach(ITEM ${FTL_GETTIMEOFDAY_HEADERS})
++ install(FILES ${ITEM} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ftl/gettimeofday)
++endforeach()
++foreach(ITEM ${FTLSDK_PLATFORM_HEADERS})
++ install(FILES ${ITEM} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ftl)
++endforeach()
++endif()
+\ No newline at end of file
diff --git a/libdir-fix.patch b/libdir-fix.patch
new file mode 100644
index 0000000..2fecbc2
--- /dev/null
+++ b/libdir-fix.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,6 +15,7 @@ find_package(Threads REQUIRED)
+
+ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
++include("GNUInstallDirs")
+
+ if (DISABLE_AUTO_INGEST)
+ add_definitions(-DDISABLE_AUTO_INGEST)
+@@ -130,4 +131,5 @@ if (NOT DISABLE_FTL_APP)
+ endif()
+
+ # Install rules
+-install(TARGETS ftl DESTINATION lib)
+\ No newline at end of file
++install(TARGETS ftl DESTINATION
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+\ No newline at end of file
diff --git a/libftl.spec b/libftl.spec
new file mode 100644
index 0000000..d42e8e8
--- /dev/null
+++ b/libftl.spec
@@ -0,0 +1,59 @@
+Name: libftl
+Version: 0.9.14
+Release: 2%{?dist}
+Summary: FTL audio/video streaming library
+
+License: MIT
+URL: https://github.com/mixer/ftl-sdk
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: libdir-fix.patch
+Patch1: headers-fix.patch
+
+BuildRequires: cmake
+BuildRequires: gcc
+BuildRequires: gcc-c++
+
+%description
+FTL-SDK is a cross platform SDK written in C to enable sending audio/video to
+mixer using FTL service.
+
+
+%prep
+%autosetup -p1 -n ftl-sdk-%{version}
+
+%package devel
+Summary: Development files for libftl
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files for libftl.
+
+
+%build
+mkdir -p build
+pushd build
+%cmake3 -DDISABLE_AUTO_INGEST=TRUE \
+ -DDISABLE_FTL_APP=TRUE \
+ -DFTL_INSTALL_INCLUDES=TRUE ..
+%make_build
+popd
+
+%install
+%make_install -C build
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/%{name}.so.0*
+
+
+%files devel
+%{_libdir}/%{name}.so
+%{_includedir}/ftl/
+
+%changelog
+* Wed Apr 03 2019 Momcilo Medic <fedorauser(a)fedoraproject.org> - 0.9.14-2
+- Added patches for headers and library destination handling
+
+* Tue Apr 02 2019 Momcilo Medic <fedorauser(a)fedoraproject.org> - 0.9.14-1
+- First public release
diff --git a/sources b/sources
index e69de29..69bb3c3 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b736abbe6b9706f5e668c6029476801c libftl-0.9.14.tar.gz
5 years, 1 month
[rpmfusion-nonfree-release/f30] Release for f30
by Leigh Scott
commit 33d04e98ca4598e14c6d7bea3fdbfb2c615fde4e
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Apr 9 09:29:19 2019 +0100
Release for f30
rpmfusion-nonfree-release.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index d8df48a..36aa494 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 30
-Release: 0.3
+Release: 1
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Tue Apr 09 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 30-1
+- Release for f30
+
* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.3
- Switch to branch layout
5 years, 1 month
[rpmfusion-nonfree-release/f30] Switch to release
by Leigh Scott
commit f514a48d8899720f04bd40ec87a63939fc2e307c
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Apr 9 09:27:44 2019 +0100
Switch to release
rpmfusion-nonfree-updates-testing.repo | 3 ++-
rpmfusion-nonfree-updates.repo | 3 ++-
rpmfusion-nonfree.repo | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 36e4d55..498d504 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=1
+enabled=0
+enabled_metadata=0
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree-updates.repo b/rpmfusion-nonfree-updates.repo
index f41d15e..6d4d825 100644
--- a/rpmfusion-nonfree-updates.repo
+++ b/rpmfusion-nonfree-updates.repo
@@ -2,7 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
+enabled_metadata=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 239b8fb..dfb5110 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -3,7 +3,8 @@ name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
enabled=1
-#metadata_expire=14d
+enabled_metadata=1
+metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
5 years, 1 month
[rpmfusion-nonfree-release/f30] Update rawhide nonfree
by Leigh Scott
commit e912bd622eb14650a18ced96691df82966b78f81
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Apr 9 09:17:14 2019 +0100
Update rawhide nonfree
rpmfusion-nonfree-release.spec | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 03d08ec..d8df48a 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -14,9 +14,9 @@ Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
Source5: rpmfusion-%{repo}-tainted.repo
-Source29: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-29-primary
Source30: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-30-primary
Source31: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-31-primary
+Source32: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-32-primary
BuildArch: noarch
Requires: system-release(%{version})
@@ -67,19 +67,19 @@ install -d -m755 \
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE29} \
%{SOURCE30} \
%{SOURCE31} \
+ %{SOURCE32} \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE29}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-29
ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-30
ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-31
+ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-32
# Links for the keys
-ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
-ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
+ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
+ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
# Yum .repo files
5 years, 1 month