commit: e5391e2762f14b9fcf51b3015f1ff0efeefa70d2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 21:38:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 21:38:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5391e27
media-plugins/vdr-xineliboutput: drop removed libextractor references
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-plugins/vdr-xineliboutput/metadata.xml | 2 --
media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild | 7 +++----
media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild | 7 +++----
media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild | 7 +++----
media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild | 7 +++----
profiles/base/package.use.mask | 4 ----
6 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/media-plugins/vdr-xineliboutput/metadata.xml
b/media-plugins/vdr-xineliboutput/metadata.xml
index 1a956bdd07ff..e0b82e8b3016 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -8,8 +8,6 @@
<use>
<flag name="cec">Enable CEC support through
<pkg>dev-libs/libcec</pkg></flag>
<flag name="bluray">Enable BluRay metadata support through
<pkg>media-libs/libbluray</pkg></flag>
- <flag name="libextractor">Use
<pkg>media-libs/libextractor</pkg> to gather
- files' metadata in media-player</flag>
<flag name="vdr">Compile the vdr output plugin to use local or
remote xine as output</flag>
<flag name="xine">Compile the xine input plugin for displaying
vdr video and OSD</flag>
</use>
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index 10af5db34077..71ecae48a267 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,12 +14,11 @@ SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau
+X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg nls opengl +vdr vaapi vdpau +X +xine
xinerama"
COMMON_DEPEND="
vdr? (
media-video/vdr
- libextractor? ( >=media-libs/libextractor-0.5.20 )
caps? ( sys-libs/libcap )
)
@@ -94,7 +93,7 @@ src_configure() {
$(use_enable fbcon fb) \
$(use_enable vdr) \
$(use_enable xine libxine) \
- $(use_enable libextractor) \
+ --disable-libextractor \
$(use_enable caps libcap) \
$(use_enable cec libcec) \
$(use_enable jpeg libjpeg) \
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index 0d2749f4f0a6..a032a30bcf6b 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,12 +15,11 @@ SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau
+X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg nls opengl +vdr vaapi vdpau +X +xine
xinerama"
COMMON_DEPEND="
vdr? (
media-video/vdr
- libextractor? ( >=media-libs/libextractor-0.5.20 )
caps? ( sys-libs/libcap )
)
@@ -100,7 +99,7 @@ src_configure() {
$(use_enable fbcon fb) \
$(use_enable vdr) \
$(use_enable xine libxine) \
- $(use_enable libextractor) \
+ --disable-libextractor \
$(use_enable caps libcap) \
$(use_enable cec libcec) \
$(use_enable jpeg libjpeg) \
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
index 9f405f9f0594..ecd8919475df 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,12 +15,11 @@ SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau
+X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg nls opengl +vdr vaapi vdpau +X +xine
xinerama"
COMMON_DEPEND="
vdr? (
media-video/vdr
- libextractor? ( >=media-libs/libextractor-0.5.20 )
caps? ( sys-libs/libcap )
)
@@ -100,7 +99,7 @@ src_configure() {
$(use_enable fbcon fb) \
$(use_enable vdr) \
$(use_enable xine libxine) \
- $(use_enable libextractor) \
+ --disable-libextractor \
$(use_enable caps libcap) \
$(use_enable cec libcec) \
$(use_enable jpeg libjpeg) \
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index 2ffc32df32a0..a7c7e09d2cde 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,12 +15,11 @@ EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git";
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS=""
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X
+xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg nls opengl +vdr vdpau +X +xine xinerama"
COMMON_DEPEND="
vdr? (
>=media-video/vdr-1.6.0
- libextractor? ( >=media-libs/libextractor-0.5.20 )
caps? ( sys-libs/libcap )
)
@@ -103,7 +102,7 @@ src_configure() {
$(use_enable fbcon fb) \
$(use_enable vdr) \
$(use_enable xine libxine) \
- $(use_enable libextractor) \
+ --disable-libextractor \
$(use_enable caps libcap) \
$(use_enable jpeg libjpeg) \
$(use_enable xinerama) \
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 07060c3795d1..5e6bbe64ef33 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -82,10 +82,6 @@ sci-libs/vtk debug
# See also: https://bugs.gentoo.org/891499
sys-libs/libomp llvm_targets_AMDGPU
-# Michał Górny <mgo...@gentoo.org> (2023-01-21)
-# media-libs/libextractor is masked for removal.
-media-plugins/vdr-xineliboutput libextractor
-
# Michał Górny <mgo...@gentoo.org> (2023-01-21)
# media-libs/qtav is masked for removal.
media-gfx/digikam mediaplayer
