| 1 |
commit: dedcd185fea5d61b3c908a360788c8f4bab61432 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 15:01:14 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 15:33:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedcd185 |
| 7 |
|
| 8 |
media-video/libav: [QA] Punt removed schroedinger dep |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
media-video/libav/libav-12.3.ebuild | 6 ++---- |
| 13 |
media-video/libav/libav-13_pre20171219.ebuild | 8 +++----- |
| 14 |
media-video/libav/libav-9999.ebuild | 6 ++---- |
| 15 |
media-video/libav/metadata.xml | 1 - |
| 16 |
profiles/arch/alpha/use.mask | 3 +-- |
| 17 |
profiles/arch/arm64/use.mask | 1 - |
| 18 |
profiles/arch/ia64/use.mask | 1 - |
| 19 |
profiles/arch/powerpc/use.mask | 5 +---- |
| 20 |
profiles/arch/sparc/use.mask | 3 +-- |
| 21 |
profiles/base/package.use.mask | 4 ---- |
| 22 |
10 files changed, 10 insertions(+), 28 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild |
| 25 |
index bdf3f3bd00d..043a37a0eaf 100644 |
| 26 |
--- a/media-video/libav/libav-12.3.ebuild |
| 27 |
+++ b/media-video/libav/libav-12.3.ebuild |
| 28 |
@@ -33,7 +33,7 @@ SLOT="0/12" |
| 29 |
[[ ${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" |
| 30 |
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk |
| 31 |
frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 |
| 32 |
- +network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl |
| 33 |
+ +network nvidia openssl opus oss pic pulseaudio rtmp sdl speex ssl |
| 34 |
static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X |
| 35 |
wavpack webp x264 x265 xvid +zlib" |
| 36 |
|
| 37 |
@@ -96,7 +96,6 @@ RDEPEND=" |
| 38 |
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) |
| 39 |
) |
| 40 |
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) |
| 41 |
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) |
| 42 |
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) |
| 43 |
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) |
| 44 |
fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) |
| 45 |
@@ -113,7 +112,6 @@ DEPEND="${RDEPEND} |
| 46 |
ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 47 |
cpu_flags_x86_mmx? ( dev-lang/yasm ) |
| 48 |
rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 49 |
- schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 50 |
ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 51 |
test? ( sys-devel/bc ) |
| 52 |
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 53 |
@@ -240,7 +238,7 @@ multilib_src_configure() { |
| 54 |
# Decoders |
| 55 |
use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) |
| 56 |
use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) |
| 57 |
- uses="gsm opus rtmp schroedinger speex vpx" |
| 58 |
+ uses="gsm opus rtmp speex vpx" |
| 59 |
for i in ${uses}; do |
| 60 |
use ${i} && myconf+=( --enable-lib${i} ) |
| 61 |
done |
| 62 |
|
| 63 |
diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild |
| 64 |
index 6bd86f8e6d1..899dd07f7e1 100644 |
| 65 |
--- a/media-video/libav/libav-13_pre20171219.ebuild |
| 66 |
+++ b/media-video/libav/libav-13_pre20171219.ebuild |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-# Copyright 1999-2017 Gentoo Foundation |
| 69 |
+# Copyright 1999-2018 Gentoo Authors |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
EAPI=5 |
| 73 |
@@ -32,7 +32,7 @@ SLOT="0/13" |
| 74 |
~x64-solaris ~x86-solaris" |
| 75 |
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk |
| 76 |
frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 |
| 77 |
- +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl |
| 78 |
+ +network openssl opus oss pic pulseaudio rtmp sdl speex ssl |
| 79 |
static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X |
| 80 |
wavpack webp x264 x265 xvid +zlib" |
| 81 |
|
| 82 |
@@ -94,7 +94,6 @@ RDEPEND=" |
| 83 |
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) |
| 84 |
) |
| 85 |
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) |
| 86 |
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) |
| 87 |
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) |
| 88 |
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) |
| 89 |
fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) |
| 90 |
@@ -111,7 +110,6 @@ DEPEND="${RDEPEND} |
| 91 |
ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 92 |
cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 ) |
| 93 |
rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 94 |
- schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 95 |
ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 96 |
test? ( sys-devel/bc ) |
| 97 |
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 98 |
@@ -229,7 +227,7 @@ multilib_src_configure() { |
| 99 |
# Decoders |
| 100 |
use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) |
| 101 |
use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) |
| 102 |
- uses="gsm opus rtmp schroedinger speex vpx" |
| 103 |
+ uses="gsm opus rtmp speex vpx" |
| 104 |
for i in ${uses}; do |
| 105 |
use ${i} && myconf+=( --enable-lib${i} ) |
| 106 |
done |
| 107 |
|
| 108 |
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild |
| 109 |
index dc8296df27e..9d1c7550d6d 100644 |
| 110 |
--- a/media-video/libav/libav-9999.ebuild |
| 111 |
+++ b/media-video/libav/libav-9999.ebuild |
| 112 |
@@ -30,7 +30,7 @@ SLOT="0/13" |
| 113 |
[[ ${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" |
| 114 |
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk |
| 115 |
frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 |
| 116 |
- +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl |
| 117 |
+ +network openssl opus oss pic pulseaudio rtmp sdl speex ssl |
| 118 |
static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X |
| 119 |
wavpack webp x264 x265 xvid +zlib" |
| 120 |
|
| 121 |
@@ -92,7 +92,6 @@ RDEPEND=" |
| 122 |
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) |
| 123 |
) |
| 124 |
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) |
| 125 |
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) |
| 126 |
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) |
| 127 |
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) |
| 128 |
fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) |
| 129 |
@@ -109,7 +108,6 @@ DEPEND="${RDEPEND} |
| 130 |
ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 131 |
cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 ) |
| 132 |
rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 133 |
- schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 134 |
ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 135 |
test? ( sys-devel/bc ) |
| 136 |
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) |
| 137 |
@@ -230,7 +228,7 @@ multilib_src_configure() { |
| 138 |
# Decoders |
| 139 |
use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) |
| 140 |
use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) |
| 141 |
- uses="gsm opus rtmp schroedinger speex vpx" |
| 142 |
+ uses="gsm opus rtmp speex vpx" |
| 143 |
for i in ${uses}; do |
| 144 |
use ${i} && myconf+=( --enable-lib${i} ) |
| 145 |
done |
| 146 |
|
| 147 |
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml |
| 148 |
index b08ce591f47..82ff0f291ef 100644 |
| 149 |
--- a/media-video/libav/metadata.xml |
| 150 |
+++ b/media-video/libav/metadata.xml |
| 151 |
@@ -26,7 +26,6 @@ |
| 152 |
<flag name="pulseaudio">Enable pulseaudio input support.</flag> |
| 153 |
<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag> |
| 154 |
<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag> |
| 155 |
- <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> |
| 156 |
<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag> |
| 157 |
<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag> |
| 158 |
<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag> |
| 159 |
|
| 160 |
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask |
| 161 |
index 4a2c498a512..007d05cb443 100644 |
| 162 |
--- a/profiles/arch/alpha/use.mask |
| 163 |
+++ b/profiles/arch/alpha/use.mask |
| 164 |
@@ -1,4 +1,4 @@ |
| 165 |
-# Copyright 1999-2017 Gentoo Foundation. |
| 166 |
+# Copyright 1999-2018 Gentoo Authors. |
| 167 |
# Distributed under the terms of the GNU General Public License, v2 |
| 168 |
|
| 169 |
# Michał Górny <mgorny@g.o> (16 Jul 2018) |
| 170 |
@@ -98,7 +98,6 @@ openexr |
| 171 |
|
| 172 |
# Stuff we don't want |
| 173 |
afs |
| 174 |
-schroedinger |
| 175 |
ots |
| 176 |
frei0r |
| 177 |
libev |
| 178 |
|
| 179 |
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask |
| 180 |
index eb20ce81e8d..67dc0c017e2 100644 |
| 181 |
--- a/profiles/arch/arm64/use.mask |
| 182 |
+++ b/profiles/arch/arm64/use.mask |
| 183 |
@@ -128,7 +128,6 @@ tracker |
| 184 |
xindy |
| 185 |
mpi |
| 186 |
lasi |
| 187 |
-schroedinger |
| 188 |
hardened |
| 189 |
frei0r |
| 190 |
pdfannotextractor |
| 191 |
|
| 192 |
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask |
| 193 |
index 48fcf4b7850..b1d086ed1a6 100644 |
| 194 |
--- a/profiles/arch/ia64/use.mask |
| 195 |
+++ b/profiles/arch/ia64/use.mask |
| 196 |
@@ -86,7 +86,6 @@ nut |
| 197 |
sctp |
| 198 |
bs2b |
| 199 |
tokyocabinet |
| 200 |
-schroedinger |
| 201 |
ots |
| 202 |
vaapi |
| 203 |
librtmp |
| 204 |
|
| 205 |
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask |
| 206 |
index 34daf1c1ef7..a934f5e54a2 100644 |
| 207 |
--- a/profiles/arch/powerpc/use.mask |
| 208 |
+++ b/profiles/arch/powerpc/use.mask |
| 209 |
@@ -1,4 +1,4 @@ |
| 210 |
-# Copyright 1999-2017 Gentoo Foundation |
| 211 |
+# Copyright 1999-2018 Gentoo Authors |
| 212 |
# Distributed under the terms of the GNU General Public License v2 |
| 213 |
|
| 214 |
# PPC Specific use flags |
| 215 |
@@ -124,9 +124,6 @@ lcd_devices_stv5730 |
| 216 |
# Both |
| 217 |
lcd_devices_t6963 |
| 218 |
|
| 219 |
-# dev-lang/orc doesn't play nice |
| 220 |
-schroedinger |
| 221 |
- |
| 222 |
# This will need >=media-libs/libgpod-0.8.0 keyworded and stabilized on both ppc/ppc64, bugs 313691 and 325839 |
| 223 |
ipod |
| 224 |
ios |
| 225 |
|
| 226 |
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask |
| 227 |
index 1d103ba87e0..9522e450c04 100644 |
| 228 |
--- a/profiles/arch/sparc/use.mask |
| 229 |
+++ b/profiles/arch/sparc/use.mask |
| 230 |
@@ -1,4 +1,4 @@ |
| 231 |
-# Copyright 1999-2017 Gentoo Foundation |
| 232 |
+# Copyright 1999-2018 Gentoo Authors |
| 233 |
# Distributed under the terms of the GNU General Public License, v2 |
| 234 |
|
| 235 |
# Unmask the flag which corresponds to ARCH. |
| 236 |
@@ -162,7 +162,6 @@ bluray |
| 237 |
gps |
| 238 |
|
| 239 |
# Stuff we don't want |
| 240 |
-schroedinger |
| 241 |
ots |
| 242 |
frei0r |
| 243 |
prelude |
| 244 |
|
| 245 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 246 |
index e3dd8800c06..468c52ff905 100644 |
| 247 |
--- a/profiles/base/package.use.mask |
| 248 |
+++ b/profiles/base/package.use.mask |
| 249 |
@@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse |
| 250 |
# upower-pm-utils will be removed (#596988) |
| 251 |
mate-extra/mate-power-manager pm-utils |
| 252 |
|
| 253 |
-# Pacho Ramos <pacho@×××××.org> (04 Nov 2018) |
| 254 |
-# media-libs/schroedinger will be removed (#602938) |
| 255 |
-media-video/libav schroedinger |
| 256 |
- |
| 257 |
# Pacho Ramos <pacho@×××××.org> (04 Nov 2018) |
| 258 |
# cman and co. are going to be removed (#650738) |
| 259 |
sys-cluster/pacemaker cman |
Archives