* [gentoo-commits] repo/gentoo:master commit in: profiles/, media-libs/libopenshot/, media-libs/libopenshot/files/
@ 2024-05-08 9:24 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2024-05-08 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 89857aa0325f5a21d46baa7c8fbe23d474bd9fd9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 09:13:27 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 8 09:17:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89857aa0
media-libs/libopenshot: Remove last-rited pkg
Bug: https://bugs.gentoo.org/909996
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/libopenshot/Manifest | 2 -
...ibopenshot-0.3.2-fix-test-file-collisions.patch | 89 ------------------
media-libs/libopenshot/libopenshot-0.2.7-r1.ebuild | 92 ------------------
media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild | 103 ---------------------
media-libs/libopenshot/metadata.xml | 24 -----
profiles/package.mask | 6 --
6 files changed, 316 deletions(-)
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
deleted file mode 100644
index a4e5e56b70a7..000000000000
--- a/media-libs/libopenshot/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
-DIST libopenshot-0.3.2.tar.gz 26132237 BLAKE2B 5bc371481ddf69b5de909963cb83d1128066280e1259ae8b23f7ef5450f3da00ef1137dcefe2978e10d1a51931529f104aebdf0601be4b066c7ed371ea43439e SHA512 8891077af28a4db6bc3a7cd078ce5570a8f62e0795c13b0fff795eba60c3e977ece70247033ee4017c9785592355b7421655246a5d6807a5790bd18927739795
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
deleted file mode 100644
index 38bb96c5e048..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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.2.7-r1.ebuild b/media-libs/libopenshot/libopenshot-0.2.7-r1.ebuild
deleted file mode 100644
index 915385d454bb..000000000000
--- a/media-libs/libopenshot/libopenshot-0.2.7-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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/21"
-KEYWORDS="amd64 x86"
-IUSE="doc examples +imagemagick +opencv +python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/jsoncpp:0=
- dev-libs/protobuf:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- >=media-libs/libopenshot-audio-0.2.1:0=
- media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis]
- net-libs/cppzmq
- net-libs/zeromq
- imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
- opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-text/doxygen )
- python? ( dev-lang/swig )
- test? (
- dev-cpp/catch:0
- dev-libs/unittest++
- )"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
- 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=(
- -DDISABLE_BUNDLED_JSONCPP=ON
- -DENABLE_MAGICK=$(usex imagemagick)
- -DENABLE_OPENCV=$(usex opencv)
- -DENABLE_RUBY=OFF # TODO: add ruby support
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_TESTS=$(usex test)
- -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 test
-}
-
-src_install() {
- local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
- use examples && DOCS+=( examples/ )
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
- cmake_src_install
- use python && python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
deleted file mode 100644
index 3d319121df73..000000000000
--- a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake python-single-r1 toolchain-funcs virtualx
-
-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/21"
-KEYWORDS="amd64 ~x86"
-IUSE="babl doc examples +imagemagick +opencv +python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/jsoncpp:0=
- dev-libs/protobuf:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtsvg:5
- >=media-libs/libopenshot-audio-0.3.0:0=
- media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis]
- net-libs/cppzmq
- net-libs/zeromq
- babl? ( media-libs/babl )
- imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
- opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-text/doxygen )
- python? ( dev-lang/swig )
- test? (
- dev-cpp/catch:0
- dev-libs/unittest++
- )"
-
-PATCHES=(
- "${FILESDIR}"/libopenshot-0.3.2-fix-test-file-collisions.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
- 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=(
- -DDISABLE_BUNDLED_JSONCPP=ON
- -DENABLE_MAGICK=$(usex imagemagick)
- -DENABLE_OPENCV=$(usex opencv)
- -DENABLE_RUBY=OFF # TODO: add ruby support
- -DENABLE_PYTHON=$(usex python)
- -DBUILD_TESTING=$(usex test)
- -DENABLE_LIB_DOCS=$(usex doc)
- -DUSE_SYSTEM_JSONCPP=ON
- # Resvg not packaged yet
- -DCMAKE_DISABLE_FIND_PACKAGE_Resvg=ON
- $(cmake_use_find_package imagemagick ImageMagick)
- $(cmake_use_find_package babl babl)
- )
- 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() {
- # https://github.com/OpenShot/libopenshot/issues/922 exclude broken test
- virtx cmake_src_test -E '(Caption:caption effect|Timeline:Multi-threaded Timeline GetFrame)' || die
-}
-
-src_install() {
- local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
- use examples && DOCS+=( examples/ )
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
- cmake_src_install
- use python && python_optimize
-}
diff --git a/media-libs/libopenshot/metadata.xml b/media-libs/libopenshot/metadata.xml
deleted file mode 100644
index 4919bd8be349..000000000000
--- a/media-libs/libopenshot/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>steils@gentoo.org</email>
- <name>Stefan Strogin</name>
- </maintainer>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">OpenShot/libopenshot</remote-id>
- <bugs-to>https://github.com/OpenShot/libopenshot/issues</bugs-to>
- </upstream>
- <use>
- <flag name="opencv">
- Enable <pkg>media-libs/opencv</pkg> support
- </flag>
- <flag name="babl">
- Enable <pkg>media-libs/babl</pkg> support
- </flag>
- </use>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 6c7c882a2fd5..6edf39fe0348 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -394,12 +394,6 @@ sec-keys/openpgp-keys-jiatan
~app-arch/xz-utils-5.6.0
~app-arch/xz-utils-5.6.1
-# Michał Górny <mgorny@gentoo.org> (2024-03-26)
-# Uses deprecated distutils-r1 API. Depends on dev-qt/qtwebengine:5.
-# Includes the libraries with no other reverse dependencies.
-# Removal on 2024-04-25. Bug #909996.
-media-libs/libopenshot
-
# Eray Aslan <eras@gentoo.org> (2024-03-10)
# Mask experimental software
=mail-mta/postfix-3.10*
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-05-08 9:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-08 9:24 [gentoo-commits] repo/gentoo:master commit in: profiles/, media-libs/libopenshot/, media-libs/libopenshot/files/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox