* [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2016-03-15 13:32 Ian Delaney
0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2016-03-15 13:32 UTC (permalink / raw
To: gentoo-commits
commit: fe2742014af5a4a1f306cc3f1ee5d3e5be7ed64c
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Thu Mar 10 11:01:57 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 13:32:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe274201
media-libs/libopenshot: new ebuild, version 0.1.0
Needed for media-video/openshot-2.0.6
Package-Manager: portage-2.2.27
Closes: https://github.com/gentoo/gentoo/pull/1023
media-libs/libopenshot/Manifest | 1 +
.../libopenshot-0.1.0-fix-tests-exit-code.patch | 31 +++++++++
media-libs/libopenshot/libopenshot-0.1.0.ebuild | 76 ++++++++++++++++++++++
media-libs/libopenshot/metadata.xml | 19 ++++++
4 files changed, 127 insertions(+)
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
new file mode 100644
index 0000000..2a3fdca
--- /dev/null
+++ b/media-libs/libopenshot/Manifest
@@ -0,0 +1 @@
+DIST libopenshot-0.1.0.tar.gz 10970157 SHA256 1eb3cc27d9d5a5c966dd5dd445567239c6cbcc08772ba99e5f3b52c87a28d809 SHA512 bd5767b96ae38da7f31bfcca3ec5b34c458ab271d3e899b1982cd09b0576d29a3101c54fc840766d40aa7cbc83130064f0440f5c465999f0518449318ab87480 WHIRLPOOL c485271357545e85b94753659f0a58f4e7b0f4c4ee2a4d53bbcb1d650a3cef730103b73577848d0e2e6a355d42788451fbc1839c82343b2f172c3fd725906f29
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.0-fix-tests-exit-code.patch b/media-libs/libopenshot/files/libopenshot-0.1.0-fix-tests-exit-code.patch
new file mode 100644
index 0000000..ba6cb8e
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.1.0-fix-tests-exit-code.patch
@@ -0,0 +1,31 @@
+From c7dcc18b23e6bfeff8c37f542b37b081bc422f9b Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Tue, 15 Mar 2016 00:35:16 +0100
+Subject: [PATCH] Exit tests with the return value from RunAllTests()
+
+---
+ tests/tests.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/tests.cpp b/tests/tests.cpp
+index 5265959..2321513 100644
+--- a/tests/tests.cpp
++++ b/tests/tests.cpp
+@@ -33,14 +33,15 @@ using namespace UnitTest;
+
+ int main()
+ {
++ int exit_code = 0;
+ cout << "----------------------------" << endl;
+ cout << " RUNNING ALL TESTS" << endl;
+ cout << "----------------------------" << endl;
+
+ // Run all unit tests
+- RunAllTests();
++ exit_code = RunAllTests();
+
+ cout << "----------------------------" << endl;
+
+- return 0;
++ return exit_code;
+ }
diff --git a/media-libs/libopenshot/libopenshot-0.1.0.ebuild b/media-libs/libopenshot/libopenshot-0.1.0.ebuild
new file mode 100644
index 0000000..b7907a9
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="http://www.openshotvideo.com/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav +python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ media-gfx/imagemagick
+ media-libs/libopenshot-audio
+ libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
+ !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+ ${RDEPEND}
+ python? ( dev-lang/swig )
+ test? ( dev-libs/unittest++ )
+"
+
+# https://github.com/OpenShot/libopenshot/pull/19
+PATCHES=( "${FILESDIR}/${P}-fix-tests-exit-code.patch" )
+
+S="${WORKDIR}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ use test || cmake_comment_add_subdirectory tests
+ pushd src > /dev/null || die
+ if use python; then
+ pushd bindings > /dev/null || die
+ cmake_comment_add_subdirectory ruby # TODO: support ruby
+ popd > /dev/null || die
+ else
+ cmake_comment_add_subdirectory bindings
+ fi
+ popd > /dev/null || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ if use python; then
+ local mycmakeargs=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_test() {
+ pushd "${BUILD_DIR}/tests" > /dev/null || die
+ ./openshot-test || die "Tests failed"
+ popd > /dev/null || die
+}
diff --git a/media-libs/libopenshot/metadata.xml b/media-libs/libopenshot/metadata.xml
new file mode 100644
index 0000000..6d948f2
--- /dev/null
+++ b/media-libs/libopenshot/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sautier.louis@gmail.com</email>
+ <name>Louis Sautier</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">libopenshot</remote-id>
+ <remote-id type="github">OpenShot/libopenshot</remote-id>
+ <bugs-to>https://github.com/OpenShot/libopenshot/issues</bugs-to>
+ <bugs-to>https://bugs.launchpad.net/libopenshot/+bugs</bugs-to>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2018-10-13 17:36 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2018-10-13 17:36 UTC (permalink / raw
To: gentoo-commits
commit: bad3fc7781b78f014469f8f8d278bdf305572cd6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 17:33:06 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 17:35:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad3fc77
media-libs/libopenshot: Drop old
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-libs/libopenshot/Manifest | 2 -
.../files/libopenshot-0.1.3-fix-tests.patch | 26 -------
media-libs/libopenshot/libopenshot-0.1.3.ebuild | 84 ----------------------
media-libs/libopenshot/libopenshot-0.1.7.ebuild | 83 ---------------------
4 files changed, 195 deletions(-)
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index be122d9c41a..d1299bd05fb 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,4 +1,2 @@
-DIST libopenshot-0.1.3.tar.gz 11019740 BLAKE2B a706889f709024300ef79518406da861111a8445b5ce23364b8492a72e74e7944c88ba9b4a29da356ca21500253d19e8c32abe7b5aaa0ac35bebec85e52ba970 SHA512 d59817505812868db408a88dc1d30b5b1833910f45dd0df03937110b7d4cbd85a270773008e75a1501f4b3b89a09ea798ed9b580755adf3ae79ac24d403f6982
-DIST libopenshot-0.1.7.tar.gz 11022594 BLAKE2B f3e0836ebb6dd89ce42085dc9d18dd3bce9ab3011550958bec41eead2c62b454459d219d2efeece1a43eb0536cb99866eaf9b478205d717da4c173e954772a46 SHA512 4c8871ff30c03a14766e35a64052695768311afd81ecc55598720ad146f53c122ef3b1293467670f7dd48da77bf6cb4f4f14a18c298a649b8827f901ed653709
DIST libopenshot-0.1.8.tar.gz 11019495 BLAKE2B a86994a09328e24705fe06ec3c47cbedb89815e6ec1440237dc58babfc066655f1c7dacc19257b02b645a9415c63cd4e0c1191fa452b7632cf531d98a1b073c3 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c
DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch b/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch
deleted file mode 100644
index 8ed3102b7ad..00000000000
--- a/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 29fbe45..ff67cb5 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -24,16 +24,19 @@
- # along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
- ################################################################################
-
-+SET(TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
-
- ################ WINDOWS ##################
- # Set some compiler options for Windows
- # required for libopenshot-audio headers
- IF (WIN32)
-- STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
-- add_definitions( -DIGNORE_JUCE_HYPOT=1 -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+ STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
-+ add_definitions( -DIGNORE_JUCE_HYPOT=1 )
- SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath -std=c++0x")
- ENDIF(WIN32)
-
-+add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+
- ################### UNITTEST++ #####################
- # Find UnitTest++ libraries (used for unit testing)
- FIND_PACKAGE(UnitTest++ REQUIRED)
diff --git a/media-libs/libopenshot/libopenshot-0.1.3.ebuild b/media-libs/libopenshot/libopenshot-0.1.3.ebuild
deleted file mode 100644
index cc13df34d2a..00000000000
--- a/media-libs/libopenshot/libopenshot-0.1.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+imagemagick libav +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/cppzmq
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- media-libs/libopenshot-audio
- imagemagick? ( media-gfx/imagemagick:0=[cxx] )
- libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
- !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
- ${RDEPEND}
- python? ( dev-lang/swig )
- test? ( dev-libs/unittest++ )
-"
-
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${P}-fix-tests.patch )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
- eerror "${P} requires a compiler with OpenMP support. Your current"
- eerror "compiler does not support it. If you use gcc, you can"
- eerror "re-emerge it with the 'openmp' use flag enabled."
- die "The current compiler does not support OpenMP"
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # https://github.com/OpenShot/libopenshot/issues/17
- use test || cmake_comment_add_subdirectory tests
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_RUBY=OFF # TODO: add ruby support
- -DENABLE_PYTHON=$(usex python)
- -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick)
- )
- use python && mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- emake test
-}
-
-src_install() {
- cmake-utils_src_install
- python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.1.7.ebuild b/media-libs/libopenshot/libopenshot-0.1.7.ebuild
deleted file mode 100644
index 4f9643afa9b..00000000000
--- a/media-libs/libopenshot/libopenshot-0.1.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+imagemagick libav +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/cppzmq
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- media-libs/libopenshot-audio
- imagemagick? ( <media-gfx/imagemagick-7:0=[cxx] )
- libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
- !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
- ${RDEPEND}
- python? ( dev-lang/swig )
- test? ( dev-libs/unittest++ )
-"
-
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${PN}-0.1.3-fix-tests.patch )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
- eerror "${P} requires a compiler with OpenMP support. Your current"
- eerror "compiler does not support it. If you use gcc, you can"
- eerror "re-emerge it with the 'openmp' use flag enabled."
- die "The current compiler does not support OpenMP"
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # https://github.com/OpenShot/libopenshot/issues/17
- use test || cmake_comment_add_subdirectory tests
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_RUBY=OFF # TODO: add ruby support
- -DENABLE_PYTHON=$(usex python)
- -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick)
- )
- use python && mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- cmake-utils_src_make test
-}
-
-src_install() {
- cmake-utils_src_install
- python_optimize
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2020-05-16 2:44 Stefan Strogin
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2020-05-16 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 04651aa3213e2e49f37657c1a5643e7c83a7f4e3
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 02:32:55 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat May 16 02:42:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04651aa3
media-libs/libopenshot: version bump to 0.2.5
- Fix sub-slot operator for dev-libs/jsoncpp dependency.
- SLOT="0/19".
- Add python3_8 to PYTHON_COMPAT.
- Add patch for gcc-10.
Closes: https://bugs.gentoo.org/721142
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-libs/libopenshot/Manifest | 1 +
.../files/libopenshot-0.2.5-gcc10.patch | 58 +++++++++++++
media-libs/libopenshot/libopenshot-0.2.5.ebuild | 98 ++++++++++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 4c8719808da..12ce0990164 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,3 +1,4 @@
DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
+DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch b/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch
new file mode 100644
index 00000000000..4a116b12008
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch
@@ -0,0 +1,58 @@
+From 13290364e7bea54164ab83d973951f2898ad9e23 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sat, 16 May 2020 02:33:37 +0300
+Subject: [PATCH] FFmpegUtilities: replace variable definition with statement
+ expression
+
+It is needed to avoid multiple definitions of AV_GET_CODEC_CONTEXT,
+which is considered as an error with '-fno-common' which is default
+since gcc-10.
+
+Fixes: #511
+
+Upstream-Status: Submitted
+[https://github.com/OpenShot/libopenshot/pull/512]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ include/FFmpegUtilities.h | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
+index 62d64df..b4ec951 100644
+--- a/include/FFmpegUtilities.h
++++ b/include/FFmpegUtilities.h
+@@ -163,11 +163,10 @@
+ #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+- AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+- avcodec_parameters_to_context(context, av_stream->codecpar); \
+- return context; \
+- };
++ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++ avcodec_parameters_to_context(context, av_stream->codecpar); \
++ context; })
+ #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
+@@ -199,11 +198,10 @@
+ #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+- AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+- avcodec_parameters_to_context(context, av_stream->codecpar); \
+- return context; \
+- };
++ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++ avcodec_parameters_to_context(context, av_stream->codecpar); \
++ context; })
+ #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
+--
+2.26.2
+
diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
new file mode 100644
index 00000000000..840b5fb4de8
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1 toolchain-funcs
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/19"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/jsoncpp:0=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ >=media-libs/libopenshot-audio-0.2.0:0=
+ net-libs/cppzmq
+ net-libs/zeromq
+ imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+ media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ python? ( dev-lang/swig )
+ test? ( dev-libs/unittest++ )
+"
+
+PATCHES=( ${FILESDIR}/${PN}-0.2.5-gcc10.patch )
+
+check_compiler() {
+ if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+ eerror "${P} requires a compiler with OpenMP support. Your current"
+ eerror "compiler does not support it. If you use gcc, you can"
+ eerror "re-emerge it with the 'openmp' use flag enabled."
+ die "The current compiler does not support OpenMP"
+ fi
+}
+
+pkg_pretend() {
+ check_compiler
+}
+
+pkg_setup() {
+ check_compiler
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+ # https://github.com/OpenShot/libopenshot/issues/17
+ use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_RUBY=OFF # TODO: add ruby support
+ -DENABLE_PYTHON=$(usex python)
+ -DUSE_SYSTEM_JSONCPP=ON
+ $(cmake_use_find_package imagemagick ImageMagick)
+ )
+ use python && mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_build doc
+}
+
+src_test() {
+ cmake_build os_test
+}
+
+src_install() {
+ local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+ use examples && DOCS+=( src/examples/ )
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+ cmake_src_install
+ use python && python_optimize
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2020-12-25 15:05 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-12-25 15:05 UTC (permalink / raw
To: gentoo-commits
commit: bf8cb32d4ec64b747e310012e3af7fcb905fccf7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 15:04:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:05:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8cb32d
media-libs/libopenshot: Try to fix tests
Minor: Fix Unquoted Variable
Bug: https://bugs.gentoo.org/739638
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libopenshot-0.2.5-no-hwaccel-testfix.patch | 45 ++++++++++++++++++++++
media-libs/libopenshot/libopenshot-0.2.5.ebuild | 5 ++-
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch b/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch
new file mode 100644
index 00000000000..a079d9746c0
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch
@@ -0,0 +1,45 @@
+From f71051e8f1add0b893ffaa9a799625017978e7f8 Mon Sep 17 00:00:00 2001
+From: Frank Dana <ferdnyc@gmail.com>
+Date: Thu, 20 Aug 2020 21:13:42 -0400
+Subject: [PATCH] Tests: Don't enable HW accel as side-effect (#557)
+
+The Settings test attempts to test the class by changing settings
+variables and reading them back again. Problem is, that affects
+the REST of the unit tests. So instead of enabling HW accel and
+causing crashes, we'll diddle something innocuous, like OMP_THREADS.
+---
+ tests/Settings_Tests.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/Settings_Tests.cpp b/tests/Settings_Tests.cpp
+index b63b56a8..65bd66a6 100644
+--- a/tests/Settings_Tests.cpp
++++ b/tests/Settings_Tests.cpp
+@@ -41,7 +41,7 @@ TEST(Settings_Default_Constructor)
+ // Create an empty color
+ Settings *s = Settings::Instance();
+
+- CHECK_EQUAL(0, s->HARDWARE_DECODER);
++ CHECK_EQUAL(12, s->OMP_THREADS);
+ CHECK_EQUAL(false, s->HIGH_QUALITY_SCALING);
+ CHECK_EQUAL(false, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
+ }
+@@ -50,15 +50,15 @@ TEST(Settings_Change_Settings)
+ {
+ // Create an empty color
+ Settings *s = Settings::Instance();
+- s->HARDWARE_DECODER = 1;
++ s->OMP_THREADS = 8;
+ s->HIGH_QUALITY_SCALING = true;
+ s->WAIT_FOR_VIDEO_PROCESSING_TASK = true;
+
+- CHECK_EQUAL(1, s->HARDWARE_DECODER);
++ CHECK_EQUAL(8, s->OMP_THREADS);
+ CHECK_EQUAL(true, s->HIGH_QUALITY_SCALING);
+ CHECK_EQUAL(true, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
+
+- CHECK_EQUAL(1, s->HARDWARE_DECODER);
++ CHECK_EQUAL(8, Settings::Instance()->OMP_THREADS);
+ CHECK_EQUAL(true, Settings::Instance()->HIGH_QUALITY_SCALING);
+ CHECK_EQUAL(true, Settings::Instance()->WAIT_FOR_VIDEO_PROCESSING_TASK);
+ }
diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
index fdfa393fcfc..37973900308 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5.ebuild
@@ -38,7 +38,10 @@ BDEPEND="
test? ( dev-libs/unittest++ )
"
-PATCHES=( ${FILESDIR}/${PN}-0.2.5-gcc10.patch )
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10.patch"
+ "${FILESDIR}/${P}-no-hwaccel-testfix.patch"
+)
check_compiler() {
if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2021-05-30 19:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-05-30 19:04 UTC (permalink / raw
To: gentoo-commits
commit: 4d3ff2f1924ae1df716b910b256352c7c0c5bf90
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 11:02:26 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 30 19:04:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3ff2f1
media-libs/libopenshot: Drop 0.2.4_pre20190609
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/libopenshot/Manifest | 1 -
.../files/libopenshot-0.2.2-imagemagick7.patch | 78 ----------------
.../libopenshot-0.2.4_pre20190609.ebuild | 101 ---------------------
3 files changed, 180 deletions(-)
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 3d66306ec18..fd37645a4e6 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,2 +1 @@
-DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch b/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
deleted file mode 100644
index bc5f738d7f6..00000000000
--- a/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Nru a/include/TextReader.h b/include/TextReader.h
---- a/include/TextReader.h 2018-09-22 21:47:46.000000000 +0200
-+++ b/include/TextReader.h 2018-09-23 16:17:21.212888285 +0200
-@@ -91,7 +91,7 @@
- string text_color;
- string background_color;
- std::shared_ptr<Magick::Image> image;
-- list<Magick::Drawable> lines;
-+ vector<Magick::Drawable> lines;
- bool is_open;
- GravityType gravity;
-
-diff -Nru a/src/Frame.cpp b/src/Frame.cpp
---- a/src/Frame.cpp 2018-09-22 21:47:46.000000000 +0200
-+++ b/src/Frame.cpp 2018-09-23 16:21:44.921563711 +0200
-@@ -29,6 +29,9 @@
-
- using namespace std;
- using namespace openshot;
-+#ifdef USE_IMAGEMAGICK
-+using namespace Magick;
-+#endif
-
- // Constructor - blank frame (300x200 blank image, 48kHz audio silence)
- Frame::Frame() : number(1), pixel_ratio(1,1), channels(2), width(1), height(1), color("#000000"),
-@@ -904,7 +907,7 @@
- // Give image a transparent background color
- magick_image->backgroundColor(Magick::Color("none"));
- magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod);
-- magick_image->matte(true);
-+ magick_image->alpha(true);
-
- return magick_image;
- }
-@@ -926,13 +929,14 @@
- // Iterate through the pixel packets, and load our own buffer
- // Each color needs to be scaled to 8 bit (using the ImageMagick built-in ScaleQuantumToChar function)
- int numcopied = 0;
-- Magick::PixelPacket *pixels = new_image->getPixels(0,0, new_image->columns(), new_image->rows());
-+ const Quantum *pixels = new_image->getConstPixels(0,0, new_image->columns(), new_image->rows());
- for (int n = 0, i = 0; n < new_image->columns() * new_image->rows(); n += 1, i += 4) {
-- buffer[i+0] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].red);
-- buffer[i+1] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].green);
-- buffer[i+2] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].blue);
-- buffer[i+3] = 255 - MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].opacity);
-+ buffer[i+0] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelRed(new_image->image(), pixels));
-+ buffer[i+1] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelGreen(new_image->image(), pixels));
-+ buffer[i+2] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelBlue(new_image->image(), pixels));
-+ buffer[i+3] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelAlpha(new_image->image(), pixels));
- numcopied+=4;
-+ pixels += MagickCore::GetPixelChannels(new_image->image());
- }
-
- // Create QImage of frame data
-diff -Nru a/src/ImageReader.cpp b/src/ImageReader.cpp
---- a/src/ImageReader.cpp 2018-09-22 21:47:46.000000000 +0200
-+++ b/src/ImageReader.cpp 2018-09-23 16:22:32.330865516 +0200
-@@ -59,7 +59,7 @@
-
- // Give image a transparent background color
- image->backgroundColor(Magick::Color("none"));
-- image->matte(true);
-+ image->alpha(true);
- }
- catch (Magick::Exception e) {
- // raise exception
-diff -Nru a/src/ImageWriter.cpp b/src/ImageWriter.cpp
---- a/src/ImageWriter.cpp 2018-09-22 21:47:46.000000000 +0200
-+++ b/src/ImageWriter.cpp 2018-09-23 16:22:58.380031419 +0200
-@@ -97,7 +97,7 @@
- std::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
- frame_image->magick( info.vcodec );
- frame_image->backgroundColor(Magick::Color("none"));
-- frame_image->matte(true);
-+ frame_image->alpha(true);
- frame_image->quality(image_quality);
- frame_image->animationDelay(info.video_timebase.ToFloat() * 100);
- frame_image->animationIterations(number_of_loops);
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
deleted file mode 100644
index eea5ca7a14f..00000000000
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit cmake python-single-r1 toolchain-funcs
-
-COMMIT="0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997"
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/17"
-KEYWORDS="amd64 x86"
-IUSE="doc examples +imagemagick +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/cppzmq
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- >=media-libs/libopenshot-audio-0.1.9_pre20190502:0=
- imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
- media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( app-doc/doxygen )
- python? ( dev-lang/swig )
- test? ( dev-libs/unittest++ )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-# From Mageia
-# https://github.com/OpenShot/libopenshot/issues/60
-PATCHES=( ${FILESDIR}/${PN}-0.2.2-imagemagick7.patch )
-
-check_compiler() {
- if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
- eerror "${P} requires a compiler with OpenMP support. Your current"
- eerror "compiler does not support it. If you use gcc, you can"
- eerror "re-emerge it with the 'openmp' use flag enabled."
- die "The current compiler does not support OpenMP"
- fi
-}
-
-pkg_pretend() {
- check_compiler
-}
-
-pkg_setup() {
- check_compiler
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # https://github.com/OpenShot/libopenshot/issues/17
- use test || cmake_comment_add_subdirectory tests
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_RUBY=OFF # TODO: add ruby support
- -DENABLE_PYTHON=$(usex python)
- $(cmake_use_find_package imagemagick ImageMagick)
- )
- use python && mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_build doc
-}
-
-src_test() {
- cmake_build os_test
-}
-
-src_install() {
- local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
- use examples && DOCS+=( src/examples/ )
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
- cmake_src_install
- use python && python_optimize
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2023-07-09 22:21 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-07-09 22:21 UTC (permalink / raw
To: gentoo-commits
commit: d97b4ecd2291523baf3caeb93d0b0f884a074031
Author: Ninpo <ninpo <AT> qap <DOT> la>
AuthorDate: Sun Jul 9 11:24:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 22:20:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97b4ecd
media-libs/libopenshot: Two test fixes
* Fix parallel test issues by renaming the output files
to avoid clobbering (reported upstream at
https://github.com/OpenShot/libopenshot/issues/933)
* Skip flaky test (reported upstream at https://github.com/OpenShot/libopenshot/issues/934)
Closes: https://bugs.gentoo.org/909759
Signed-off-by: Ninpo <ninpo <AT> qap.la>
Closes: https://github.com/gentoo/gentoo/pull/31810
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ibopenshot-0.3.2-fix-test-file-collisions.patch | 89 ++++++++++++++++++++++
media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild | 6 +-
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch b/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch
new file mode 100644
index 000000000000..38bb96c5e048
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch
@@ -0,0 +1,89 @@
+Fixes test file collisions with high concurrency builds
+Fix by Ninpo <ninpo@qap.la>
+https://bugs.gentoo.org/909759, https://github.com/OpenShot/libopenshot/issues/933
+
+--- a/tests/FFmpegWriter.cpp
++++ b/tests/FFmpegWriter.cpp
+@@ -34,7 +34,7 @@ TEST_CASE( "Webm", "[libopenshot][ffmpegwriter]" )
+ r.Open();
+
+ /* WRITER ---------------- */
+- FFmpegWriter w("output1.webm");
++ FFmpegWriter w("Webm-output1.webm");
+
+ // Set options
+ w.SetAudioOptions(true, "libvorbis", 44100, 2, LAYOUT_STEREO, 188000);
+@@ -50,7 +50,7 @@ TEST_CASE( "Webm", "[libopenshot][ffmpegwriter]" )
+ w.Close();
+ r.Close();
+
+- FFmpegReader r1("output1.webm");
++ FFmpegReader r1("Webm-output1.webm");
+ r1.Open();
+
+ // Verify various settings on new MP4
+@@ -81,7 +81,7 @@ TEST_CASE( "Options_Overloads", "[libopenshot][ffmpegwriter]" )
+ r.Open();
+
+ /* WRITER ---------------- */
+- FFmpegWriter w("output1.mp4");
++ FFmpegWriter w("Options_Overloads-output1.mp4");
+
+ // Set options
+ w.SetAudioOptions("aac", 48000, 192000);
+@@ -97,7 +97,7 @@ TEST_CASE( "Options_Overloads", "[libopenshot][ffmpegwriter]" )
+ w.Close();
+ r.Close();
+
+- FFmpegReader r1("output1.mp4");
++ FFmpegReader r1("Options_Overloads-output1.mp4");
+ r1.Open();
+
+ // Verify implied settings
+@@ -123,7 +123,7 @@ TEST_CASE( "DisplayInfo", "[libopenshot][ffmpegwriter]" )
+ r.Open();
+
+ /* WRITER ---------------- */
+- FFmpegWriter w("output1.webm");
++ FFmpegWriter w("DisplayInfo-output1.webm");
+
+ // Set options
+ w.SetAudioOptions(true, "libvorbis", 44100, 2, LAYOUT_STEREO, 188000);
+@@ -203,7 +203,7 @@ TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" )
+ t.Open();
+
+ /* WRITER ---------------- */
+- FFmpegWriter w("output1.gif");
++ FFmpegWriter w("Gif-output1.gif");
+
+ // Set options (no audio options are set)
+ w.SetVideoOptions(true, "gif", Fraction(24,1), 1280, 720, Fraction(1,1), false, false, 15000000);
+@@ -221,7 +221,7 @@ TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" )
+ w.Close();
+ t.Close();
+
+- FFmpegReader r1("output1.gif");
++ FFmpegReader r1("Gif-output1.gif");
+ r1.Open();
+
+ // Verify various settings on new Gif
+--- a/tests/ImageWriter.cpp
++++ b/tests/ImageWriter.cpp
+@@ -64,7 +64,7 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" )
+ r.Open();
+
+ /* WRITER ---------------- */
+- ImageWriter w("output1.gif");
++ ImageWriter w("ImageWriter-Gif-output1.gif");
+
+ CHECK_FALSE(w.IsOpen());
+
+@@ -87,7 +87,7 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" )
+ r.Close();
+
+ // Open up the 5th frame from the newly created GIF
+- ImageReader r1("output1.gif[4]");
++ ImageReader r1("ImageWriter-Gif-output1.gif[4]");
+
+ // Basic Reader state queries
+ CHECK(r1.Name() == "ImageReader");
diff --git a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
index f15646eaddd7..392a75b44969 100644
--- a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
@@ -41,6 +41,10 @@ BDEPEND="doc? ( app-doc/doxygen )
dev-libs/unittest++
)"
+PATCHES=(
+ "${FILESDIR}"/libopenshot-0.3.2-fix-test-file-collisions.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
}
@@ -86,7 +90,7 @@ src_compile() {
src_test() {
# https://github.com/OpenShot/libopenshot/issues/922 exclude broken test
- virtx cmake_src_test -E '(Caption:caption effect)' || die
+ virtx cmake_src_test -E '(Caption:caption effect|Timeline:Multi-threaded Timeline GetFrame)' || die
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-09 22:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-15 13:32 [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenshot/, media-libs/libopenshot/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2018-10-13 17:36 Pacho Ramos
2020-05-16 2:44 Stefan Strogin
2020-12-25 15:05 Andreas Sturmlechner
2021-05-30 19:04 Andreas Sturmlechner
2023-07-09 22:21 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox