[libopenshot/el7: 3/3] Merge branch 'master' into el7
by Frank R Dana
commit 1054a2964bac983643faa0f02b716a74a4a49748
Merge: 6051200 7ed0931
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Wed Sep 18 21:53:18 2019 -0400
Merge branch 'master' into el7
.gitignore | 1 +
libopenshot-fix-tests.patch | 60 -------------------------------------
libopenshot-fix_swig_variable.patch | 22 --------------
libopenshot-py-install-path.patch | 60 +++++++++++++++++++++++++++++++++++++
libopenshot.spec | 31 +++++++++++++++----
sources | 2 +-
6 files changed, 87 insertions(+), 89 deletions(-)
---
diff --cc libopenshot.spec
index 8351bf0,3a6a159..667cb01
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@@ -112,10 -119,15 +122,19 @@@ make os_tes
%changelog
+ * Mon Sep 16 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.3-4
+ - Update to git HEAD for compatibility with OpenShot update
+ - Enable unit tests
+ - Remove CMAKE_SKIP_RPATH to make test binaries runnable from build dir
+ - Delete outdated copy of standard CMake module, causes python3.8 failures
+
+ * Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.2.3-3.20190406git101f25a
+ - Rebuild for new ffmpeg version
+
+* Sun Jun 23 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.3-3
+- Add explicit Requires: zeromq, to work around other EL7
+ packages which provide the required libzmq.so.5
+
* 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
5 years
[libopenshot/el7] (3 commits) ...Merge branch 'master' into el7
by Frank R Dana
Summary of changes:
2d49ca1... Rebuild for new ffmpeg version (*)
7ed0931... Update to git HEAD for new OpenShot build (*)
1054a29... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
5 years
[libopenshot/f30] (6 commits) ...Update to git HEAD for new OpenShot build
by Frank R Dana
Summary of changes:
62cd977... New upstream release (*)
c8086cf... Rebuild for ffmpeg-3.4.5 on el7 (*)
47a3d7d... Merge branch 'el7' (*)
01512cf... deleted: ffmpeg40_buildfix.patch (*)
2d49ca1... Rebuild for new ffmpeg version (*)
7ed0931... Update to git HEAD for new OpenShot build (*)
(*) This commit already existed in another branch; no separate mail sent
5 years
[libopenshot] Update to git HEAD for new OpenShot build
by Frank R Dana
commit 7ed09315d9cb07898e41342399ccf8bf718ed62f
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Wed Sep 18 21:41:53 2019 -0400
Update to git HEAD for new OpenShot build
- Enable unit tests
- Remove CMAKE_SKIP_RPATH to make test binaries runnable from build dir
- Delete outdated copy of standard CMake module, causes python3.8 failures
.gitignore | 1 +
libopenshot-fix-tests.patch | 60 -------------------------------------
libopenshot-fix_swig_variable.patch | 22 --------------
libopenshot-py-install-path.patch | 60 +++++++++++++++++++++++++++++++++++++
libopenshot.spec | 28 +++++++++++++----
sources | 2 +-
6 files changed, 84 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2b4e8f..16305b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ libopenshot-0.0.6.tar.gz
/libopenshot-0.2.2.tar.gz
/libopenshot-0.2.3.tar.gz
/libopenshot-101f25a.tar.gz
+/libopenshot-c685571.tar.gz
diff --git a/libopenshot-py-install-path.patch b/libopenshot-py-install-path.patch
new file mode 100644
index 0000000..f33ef0a
--- /dev/null
+++ b/libopenshot-py-install-path.patch
@@ -0,0 +1,60 @@
+From 160df3ac40e9098942e1d2b9c7b0bd6757f4be05 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com>
+Date: Fri, 2 Aug 2019 07:14:11 -0400
+Subject: [PATCH] Python install path: remove site-packages detection
+
+The path `${CMAKE_INSTALL_PREFIX}/lib/pythonM.N/site-packages` is
+not Debian-specific, and will exist on too many systems where it
+should _not_ be assumed to be the correct install path. (This is
+causing Fedora and other `lib64`-using distros to install the
+bindings into `/usr/lib/`, when they were previously being
+installed into the correct `/usr/lib64/` location.)
+---
+ src/bindings/python/CMakeLists.txt | 27 +++++++++++----------------
+ 1 file changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
+index 9afabd4..80281d7 100644
+--- a/src/bindings/python/CMakeLists.txt
++++ b/src/bindings/python/CMakeLists.txt
+@@ -72,26 +72,21 @@ if (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
+ ${PYTHON_LIBRARIES} openshot)
+
+ ### Check if the following Debian-friendly python module path exists
+- SET(PYTHON_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
++ SET(PYTHON_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages")
+ if (NOT EXISTS ${PYTHON_MODULE_PATH})
+
+- ### Check if another Debian-friendly python module path exists
+- SET(PYTHON_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages")
+- if (NOT EXISTS ${PYTHON_MODULE_PATH})
+-
+- ### Calculate the python module path (using distutils)
+- execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "\
++ ### Calculate the python module path (using distutils)
++ execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "\
+ from distutils.sysconfig import get_python_lib; \
+ print( get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )"
+- OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
+- OUTPUT_STRIP_TRAILING_WHITESPACE )
+-
+- GET_FILENAME_COMPONENT(_ABS_PYTHON_MODULE_PATH
+- "${_ABS_PYTHON_MODULE_PATH}" ABSOLUTE)
+- FILE(RELATIVE_PATH _REL_PYTHON_MODULE_PATH
+- ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
+- SET(PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH})
+- endif()
++ OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
++ OUTPUT_STRIP_TRAILING_WHITESPACE )
++
++ GET_FILENAME_COMPONENT(_ABS_PYTHON_MODULE_PATH
++ "${_ABS_PYTHON_MODULE_PATH}" ABSOLUTE)
++ FILE(RELATIVE_PATH _REL_PYTHON_MODULE_PATH
++ ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
++ SET(PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH})
+ endif()
+ message("PYTHON_MODULE_PATH: ${PYTHON_MODULE_PATH}")
+
+--
+2.21.0
+
diff --git a/libopenshot.spec b/libopenshot.spec
index 2ed6f58..3a6a159 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,18 +1,19 @@
-%global gitrev 101f25a7f5a1623cca2b2514fa2f7aed93799324
+%global gitrev c685571e6388ad5cc6c40661fd51bd15b436ccac
%global shortrev %(c=%{gitrev}; echo ${c:0:7})
-%global gitdate 20190406
+%global gitdate 20190912
Name: libopenshot
Version: 0.2.3
-Release: 3.%{gitdate}git%{shortrev}%{?dist}
+Release: 4.%{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/%{gitrev}.tar.gz#/%{name}-%{s...
-# Fixed upstream
-#Patch1: %{name}-fix_swig_variable.patch
+# A fix has already been proposed upstream, but not yet accepted
+# https://github.com/OpenShot/libopenshot/pull/290
+Patch1: %{name}-py-install-path.patch
BuildRequires: gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
@@ -53,6 +54,7 @@ developing applications that use %{name}.
%package -n python%{python3_pkgversion}-%{name}
Summary: Python bindings for %{name}
BuildRequires: swig
+BuildRequires: python%{python3_pkgversion}-libs
BuildRequires: python%{python3_pkgversion}-devel
Requires: %{name}%{?_isa} = %{version}-%{release}
Obsoletes: python-%{name} < 0.1.1-2
@@ -79,12 +81,20 @@ applications that use %{name}.
sed -e 's|-g -ggdb|-g|g' -i src/CMakeLists.txt tests/CMakeLists.txt
%build
+
+# Package includes an outdated FindPythonLibs.cmake module
+# Reported upstream: https://github.com/OpenShot/libopenshot/pull/331
+rm cmake/Modules/FindPythonLibs.cmake
+
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 .
+ -DUSE_SYSTEM_JSONCPP:BOOL=ON .
%make_build
+%check
+make os_test
+
%install
%make_install
@@ -109,6 +119,12 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}"
%changelog
+* Mon Sep 16 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.3-4
+- Update to git HEAD for compatibility with OpenShot update
+- Enable unit tests
+- Remove CMAKE_SKIP_RPATH to make test binaries runnable from build dir
+- Delete outdated copy of standard CMake module, causes python3.8 failures
+
* Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.2.3-3.20190406git101f25a
- Rebuild for new ffmpeg version
diff --git a/sources b/sources
index f56116a..b91f788 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccadd77620b6c53f19e916b1ec96556d libopenshot-101f25a.tar.gz
+21b97efdab0832c017bd924ce1461f46 libopenshot-c685571.tar.gz
5 years
[kdenlive: 3/4] Merge branch 'f30'
by Sérgio M. Basto
commit da0d9551e2c6dbe6e93383a81db8ee82d73a9a3a
Merge: d2cc33e 9cf2ea5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Sep 18 17:46:46 2019 +0100
Merge branch 'f30'
---
5 years
[kdenlive: 2/4] Revert "Update kdenlive to 19.04.3"
by Sérgio M. Basto
commit 9cf2ea585b759bcb92f9af3381eb80300589d30b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Sep 18 17:43:28 2019 +0100
Revert "Update kdenlive to 19.04.3"
This reverts commit 970d209a88734266a55fbd266ce62b03c6814a3c.
.gitignore | 1 -
kdenlive.spec | 7 ++-----
sources | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bc41ad..bec0ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,3 @@
/kdenlive-18.08.2.tar.xz
/kdenlive-18.12.2.tar.xz
/kdenlive-18.12.3.tar.xz
-/kdenlive-19.04.3.tar.xz
diff --git a/kdenlive.spec b/kdenlive.spec
index 638e4dc..ab531c5 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -1,8 +1,8 @@
Name: kdenlive
Summary: Non-linear video editor
-Version: 19.04.3
-Release: 1%{?dist}
+Version: 18.12.3
+Release: 4%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -160,9 +160,6 @@ fi
%changelog
-* Wed Sep 18 2019 Sérgio Basto <sergio(a)serjux.com> - 19.04.3-1
-- Update kdenlive to 19.04.3
-
* Sun May 12 2019 Leigh Scott <leigh123linux(a)gmail.com> - 18.12.3-4
- Rebuild for new mlt version
diff --git a/sources b/sources
index bacc578..6a93a44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdd0cf780bd1e989c62b58ec217c1763 kdenlive-19.04.3.tar.xz
+57e49c3995117945938669e24aff9352 kdenlive-18.12.3.tar.xz
5 years
[kdenlive] (4 commits) ...Remove backported patch
by Sérgio M. Basto
Summary of changes:
970d209... Update kdenlive to 19.04.3 (*)
9cf2ea5... Revert "Update kdenlive to 19.04.3"
da0d955... Merge branch 'f30'
416102d... Remove backported patch
(*) This commit already existed in another branch; no separate mail sent
5 years