public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-video/libav/, profiles/arch/arm64/, profiles/arch/ia64/, ...
@ 2018-12-11 15:33 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2018-12-11 15:33 UTC (permalink / raw
  To: gentoo-commits

commit:     dedcd185fea5d61b3c908a360788c8f4bab61432
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 15:01:14 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 15:33:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedcd185

media-video/libav: [QA] Punt removed schroedinger dep

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-video/libav/libav-12.3.ebuild           | 6 ++----
 media-video/libav/libav-13_pre20171219.ebuild | 8 +++-----
 media-video/libav/libav-9999.ebuild           | 6 ++----
 media-video/libav/metadata.xml                | 1 -
 profiles/arch/alpha/use.mask                  | 3 +--
 profiles/arch/arm64/use.mask                  | 1 -
 profiles/arch/ia64/use.mask                   | 1 -
 profiles/arch/powerpc/use.mask                | 5 +----
 profiles/arch/sparc/use.mask                  | 3 +--
 profiles/base/package.use.mask                | 4 ----
 10 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
index bdf3f3bd00d..043a37a0eaf 100644
--- a/media-video/libav/libav-12.3.ebuild
+++ b/media-video/libav/libav-12.3.ebuild
@@ -33,7 +33,7 @@ SLOT="0/12"
 [[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	+network nvidia openssl opus oss pic pulseaudio rtmp sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
 
@@ -96,7 +96,6 @@ RDEPEND="
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
@@ -113,7 +112,6 @@ DEPEND="${RDEPEND}
 	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( dev-lang/yasm )
 	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
 	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
@@ -240,7 +238,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
 	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=( --enable-lib${i} )
 	done

diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
index 6bd86f8e6d1..899dd07f7e1 100644
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ b/media-video/libav/libav-13_pre20171219.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,7 @@ SLOT="0/13"
 ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
 
@@ -94,7 +94,6 @@ RDEPEND="
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
@@ -111,7 +110,6 @@ DEPEND="${RDEPEND}
 	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
 	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
 	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
@@ -229,7 +227,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
 	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=( --enable-lib${i} )
 	done

diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index dc8296df27e..9d1c7550d6d 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -30,7 +30,7 @@ SLOT="0/13"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
 
@@ -92,7 +92,6 @@ RDEPEND="
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
@@ -109,7 +108,6 @@ DEPEND="${RDEPEND}
 	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
 	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
 	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
@@ -230,7 +228,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
 	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=( --enable-lib${i} )
 	done

diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index b08ce591f47..82ff0f291ef 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -26,7 +26,6 @@
 	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
 	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag>
-	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag>
 	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
 	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 4a2c498a512..007d05cb443 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
@@ -98,7 +98,6 @@ openexr
 
 # Stuff we don't want
 afs
-schroedinger
 ots
 frei0r
 libev

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index eb20ce81e8d..67dc0c017e2 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -128,7 +128,6 @@ tracker
 xindy
 mpi
 lasi
-schroedinger
 hardened
 frei0r
 pdfannotextractor

diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 48fcf4b7850..b1d086ed1a6 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -86,7 +86,6 @@ nut
 sctp
 bs2b
 tokyocabinet
-schroedinger
 ots
 vaapi
 librtmp

diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 34daf1c1ef7..a934f5e54a2 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # PPC Specific use flags
@@ -124,9 +124,6 @@ lcd_devices_stv5730
 # Both
 lcd_devices_t6963
 
-# dev-lang/orc doesn't play nice
-schroedinger
-
 # This will need >=media-libs/libgpod-0.8.0 keyworded and stabilized on both ppc/ppc64, bugs 313691 and 325839
 ipod
 ios

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 1d103ba87e0..9522e450c04 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -162,7 +162,6 @@ bluray
 gps
 
 # Stuff we don't want
-schroedinger
 ots
 frei0r
 prelude

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e3dd8800c06..468c52ff905 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse
 # upower-pm-utils will be removed (#596988)
 mate-extra/mate-power-manager pm-utils
 
-# Pacho Ramos <pacho@gento.org> (04 Nov 2018)
-# media-libs/schroedinger will be removed (#602938)
-media-video/libav schroedinger
-
 # Pacho Ramos <pacho@gento.org> (04 Nov 2018)
 # cman and co. are going to be removed (#650738)
 sys-cluster/pacemaker cman


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-12-11 15:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-11 15:33 [gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-video/libav/, profiles/arch/arm64/, profiles/arch/ia64/, 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