From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DEA8E138353 for ; Sun, 26 Apr 2020 12:05:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00C40E09EF; Sun, 26 Apr 2020 12:05:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1AF7E09EF for ; Sun, 26 Apr 2020 12:05:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D03F834EE67 for ; Sun, 26 Apr 2020 12:05:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09E791F3 for ; Sun, 26 Apr 2020 12:05:05 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1587902679.08ed84d0fee0ef1ce069c42453a28d7fc28248c5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild media-libs/xine-lib/xine-lib-1.2.9999.ebuild X-VCS-Directories: media-libs/xine-lib/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 08ed84d0fee0ef1ce069c42453a28d7fc28248c5 X-VCS-Branch: master Date: Sun, 26 Apr 2020 12:05:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7bc2a069-b3c0-4039-ada8-6fd49dbccf0a X-Archives-Hash: c5fe0e7d11d2234c5dbd3bdfdf69dd34 commit: 08ed84d0fee0ef1ce069c42453a28d7fc28248c5 Author: David Seifert gentoo org> AuthorDate: Sun Apr 26 12:04:39 2020 +0000 Commit: David Seifert gentoo 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 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[@]}" }