From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/
Date: Sun, 26 Apr 2020 12:05:05 +0000 (UTC) [thread overview]
Message-ID: <1587902679.08ed84d0fee0ef1ce069c42453a28d7fc28248c5.soap@gentoo> (raw)
commit: 08ed84d0fee0ef1ce069c42453a28d7fc28248c5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 12:04:39 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 12:04:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ed84d0
media-libs/xine-lib: Remove media-video/libav
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 13 +++----------
media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 13 +++----------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
index 57cd4e37dc9..f1ccbed7984 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -24,11 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
media-libs/libdvdnav
+ media-video/ffmpeg:0=
sys-libs/zlib:=
virtual/libiconv
a52? ( media-libs/a52dec )
@@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND}
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- !libav? ( media-video/ffmpeg:0= )
- libav? (
- media-libs/libpostproc:0=
- media-video/libav:0=
- )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )
@@ -154,6 +150,7 @@ src_configure() {
--disable-real-codecs
--disable-v4l
--disable-w32dll
+ --enable-avformat
--with-external-dvdnav
--with-real-codecs-path=/usr/$(get_libdir)/codecs
--with-w32-path=${win32dir}
@@ -210,10 +207,6 @@ src_configure() {
)
[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
- if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
- myconf+=( --enable-avformat ) #507474
- fi
-
econf "${myconf[@]}"
}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index e8d87db18ee..bf3fbf83a91 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,11 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
media-libs/libdvdnav
+ media-video/ffmpeg:0=
sys-libs/zlib:=
virtual/libiconv
a52? ( media-libs/a52dec )
@@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND}
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- !libav? ( media-video/ffmpeg:0= )
- libav? (
- media-libs/libpostproc:0=
- media-video/libav:0=
- )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )
@@ -150,6 +146,7 @@ src_configure() {
--disable-real-codecs
--disable-v4l
--disable-w32dll
+ --enable-avformat
--with-external-dvdnav
--with-real-codecs-path=/usr/$(get_libdir)/codecs
--with-w32-path=${win32dir}
@@ -206,10 +203,6 @@ src_configure() {
)
[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
- if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
- myconf+=( --enable-avformat ) #507474
- fi
-
econf "${myconf[@]}"
}
next reply other threads:[~2020-04-26 12:05 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 12:05 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-12 10:14 [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/ Ionen Wolkens
2024-11-24 23:15 Sam James
2023-06-01 6:58 Jakov Smolić
2023-06-01 6:45 Sam James
2023-06-01 6:22 Sam James
2023-06-01 5:22 Sam James
2023-04-17 1:25 Matt Turner
2023-04-17 1:25 Matt Turner
2023-01-26 6:29 Sam James
2022-11-12 17:48 Matt Turner
2022-11-12 17:48 Matt Turner
2022-11-12 16:06 Arthur Zamarin
2022-11-12 16:06 Arthur Zamarin
2022-11-05 2:07 Sam James
2022-09-05 3:56 Sam James
2022-09-03 5:27 Sam James
2022-09-03 5:27 Sam James
2022-07-20 20:26 Matt Turner
2022-07-15 7:58 David Seifert
2022-07-14 18:50 David Seifert
2022-05-19 22:46 Sam James
2022-05-05 9:50 Agostino Sarubbo
2022-05-03 17:48 Arthur Zamarin
2022-05-03 17:48 Arthur Zamarin
2022-05-03 17:48 Arthur Zamarin
2022-05-02 19:03 Sam James
2022-03-15 13:27 Alexis Ballier
2021-08-25 0:10 Marek Szuba
2021-05-16 18:58 Sam James
2021-03-06 21:38 Sergei Trofimovich
2021-03-06 21:38 Sergei Trofimovich
2021-03-05 7:32 Agostino Sarubbo
2021-03-05 7:27 Agostino Sarubbo
2021-03-04 1:45 Sam James
2020-12-20 16:40 Thomas Deutschmann
2020-12-18 10:25 Sergei Trofimovich
2020-12-17 7:48 Sam James
2020-12-17 5:32 Sam James
2020-12-06 20:26 Sam James
2020-12-06 19:49 Sam James
2020-09-04 16:47 Alexis Ballier
2020-01-23 19:18 Matt Turner
2019-07-24 20:56 Aaron Bauman
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-08-13 21:40 Andreas Sturmlechner
2018-06-16 18:03 Pacho Ramos
2018-05-09 7:46 Lars Wendler
2018-03-22 22:54 Sergei Trofimovich
2018-03-18 22:52 Sergei Trofimovich
2018-02-25 18:21 Thomas Deutschmann
2018-02-22 9:15 Jason Zaman
2018-02-14 20:07 Pacho Ramos
2018-02-06 16:24 Thomas Deutschmann
2018-01-13 12:47 Lars Wendler
2018-01-13 12:16 Alexis Ballier
2017-12-28 12:40 Sergei Trofimovich
2017-12-27 23:45 Sergei Trofimovich
2017-12-19 5:16 Jason Zaman
2017-07-03 9:12 Alexis Ballier
2017-06-26 16:21 Alexis Ballier
2017-03-04 13:37 Alexis Ballier
2017-02-28 11:52 Lars Wendler
2017-02-11 16:33 Pacho Ramos
2016-12-30 12:07 Pacho Ramos
2016-11-27 20:03 Pacho Ramos
2016-08-11 19:19 Lars Wendler
2016-07-22 8:53 Lars Wendler
2016-06-21 19:42 Michał Górny
2016-05-02 7:51 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1587902679.08ed84d0fee0ef1ce069c42453a28d7fc28248c5.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox