8:04 a.m.
commit 0ff1b632c31db6709d2f5e4440fa519cb3a3afd3
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 04:04:31 2018 -0400
New upstream 0.2.2
.gitignore | 1 +
libopenshot-fix-tests.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++
libopenshot.spec | 19 +++++++++++---
sources | 2 +-
4 files changed, 77 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d2ecaa..dd0c4a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ libopenshot-0.0.6.tar.gz
/libopenshot-0.1.8.tar.gz
/libopenshot-0.1.9.tar.gz
/libopenshot-0.2.0.tar.gz
+/libopenshot-0.2.2.tar.gz
diff --git a/libopenshot-fix-tests.patch b/libopenshot-fix-tests.patch
new file mode 100644
index 0000000..a0a0203
--- /dev/null
+++ b/libopenshot-fix-tests.patch
@@ -0,0 +1,60 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 2c45550..fddaa9e 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -79,7 +79,33 @@ ENDIF (ImageMagick_FOUND)
+ FIND_PACKAGE(FFmpeg REQUIRED)
+
+ # Include FFmpeg headers (needed for compile)
+-include_directories(${FFMPEG_INCLUDE_DIR})
++IF (AVCODEC_FOUND)
++ include_directories(${AVCODEC_INCLUDE_DIRS})
++ENDIF (AVCODEC_FOUND)
++IF (AVDEVICE_FOUND)
++ include_directories(${AVDEVICE_INCLUDE_DIRS})
++ENDIF (AVDEVICE_FOUND)
++IF (AVFORMAT_FOUND)
++ include_directories(${AVFORMAT_INCLUDE_DIRS})
++ENDIF (AVFORMAT_FOUND)
++IF (AVFILTER_FOUND)
++ include_directories(${AVFILTER_INCLUDE_DIRS})
++ENDIF (AVFILTER_FOUND)
++IF (AVUTIL_FOUND)
++ include_directories(${AVUTIL_INCLUDE_DIRS})
++ENDIF (AVUTIL_FOUND)
++IF (POSTPROC_FOUND)
++ include_directories(${POSTPROC_INCLUDE_DIRS})
++ENDIF (POSTPROC_FOUND)
++IF (SWSCALE_FOUND)
++ include_directories(${SWSCALE_INCLUDE_DIRS})
++ENDIF (SWSCALE_FOUND)
++IF (SWRESAMPLE_FOUND)
++ include_directories(${SWRESAMPLE_INCLUDE_DIRS})
++ENDIF (SWRESAMPLE_FOUND)
++IF (AVRESAMPLE_FOUND)
++ include_directories(${AVRESAMPLE_INCLUDE_DIRS})
++ENDIF (AVRESAMPLE_FOUND)
+
+ ################# LIBOPENSHOT-AUDIO ###################
+ # Find JUCE-based openshot Audio libraries
+@@ -150,12 +176,18 @@ endif(OPENMP_FOUND)
+ # Find ZeroMQ library (used for socket communication & logging)
+ FIND_PACKAGE(ZMQ REQUIRED)
+
+-# Include FFmpeg headers (needed for compile)
++# Include ZeroMQ headers (needed for compile)
+ include_directories(${ZMQ_INCLUDE_DIRS})
+
+ ################### JSONCPP #####################
+ # Include jsoncpp headers (needed for JSON parsing)
+-include_directories("../thirdparty/jsoncpp/include")
++if (USE_SYSTEM_JSONCPP)
++ find_package(JsonCpp REQUIRED)
++ include_directories(${JSONCPP_INCLUDE_DIRS})
++else()
++ message("Using embedded JsonCpp")
++ include_directories("../thirdparty/jsoncpp/include")
++endif(USE_SYSTEM_JSONCPP)
+
+ IF (NOT DISABLE_TESTS)
+ ############### SET TEST SOURCE FILES #################
diff --git a/libopenshot.spec b/libopenshot.spec
index dcb8787..81881a8 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,12 +1,17 @@
Name: libopenshot
-Version: 0.2.0
-Release: 2%{?dist}
+Version: 0.2.2
+Release: 1%{?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...
-Patch0: ffmpeg40_buildfix.patch
+# Upstreamed
+#Patch0: ffmpeg40_buildfix.patch
+
+# The cmake environment for tests doesn't match the source build
+# Filed upstream as https://github.com/OpenShot/libopenshot/pull/163
+Patch0: libopenshot-fix-tests.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -20,6 +25,7 @@ BuildRequires: qt5-qtmultimedia-devel
BuildRequires: unittest-cpp-devel
BuildRequires: cppzmq-devel
BuildRequires: zeromq-devel
+BuildRequires: jsoncpp-devel
BuildRequires: ruby-devel
@@ -67,7 +73,7 @@ applications that use %{name}.
%build
export CXXFLAGS="%{optflags} -Wl,--as-needed -Wno-error"
-%cmake .
+%cmake -DUSE_SYSTEM_JSONCPP:BOOL=ON .
%make_build
@@ -97,6 +103,11 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed -Wno-error"
%changelog
+* Mon Sep 24 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.2-1
+- New upstream release
+- Unbundle jsoncpp
+- Drop ffmpeg patch (upstreamed), add patch to fix tests env
+
* Wed Aug 29 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.0-2
- Rebuilt for new ImageMagick 6.9.10.10
diff --git a/sources b/sources
index e8c2e7c..04bcc01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09b05e23356d53777bcb2cad1615683b libopenshot-0.2.0.tar.gz
+4f4597b8e4546d3edf55377bfe846b69 libopenshot-0.2.2.tar.gz