Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, profiles/base/
Date: Tue, 11 Dec 2018 15:33:39
Message-Id: 1544542406.ee8808a12ccc4fbe0ee4e81ea910a9a29c66a85c.mgorny@gentoo
1 commit: ee8808a12ccc4fbe0ee4e81ea910a9a29c66a85c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 14:59:21 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 15:33:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8808a1
7
8 media-video/ffmpeg: [QA] Punt removed schreodinger dep
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 media-video/ffmpeg/ffmpeg-3.2.6.ebuild | 3 +--
13 media-video/ffmpeg/ffmpeg-3.2.7.ebuild | 3 +--
14 media-video/ffmpeg/ffmpeg-3.3.4.ebuild | 3 +--
15 media-video/ffmpeg/ffmpeg-3.3.6.ebuild | 3 +--
16 media-video/ffmpeg/ffmpeg-3.3.8.ebuild | 3 +--
17 media-video/ffmpeg/metadata.xml | 1 -
18 profiles/base/package.use.mask | 1 -
19 7 files changed, 5 insertions(+), 12 deletions(-)
20
21 diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
22 index 51bc4aba9a9..a6291d34e90 100644
23 --- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
24 +++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
25 @@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
26 amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
27 jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
28 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
29 - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
30 + speex:libspeex vorbis:libvorbis vpx:libvpx
31 zvbi:libzvbi
32 # libavfilter options
33 bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
34 @@ -217,7 +217,6 @@ RDEPEND="
35 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
36 rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
37 samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
38 - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
39 sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
40 speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
41 ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
42
43 diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
44 index 326439232c9..ac8492a79df 100644
45 --- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
46 +++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
47 @@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
48 amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
49 jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
50 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
51 - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
52 + speex:libspeex vorbis:libvorbis vpx:libvpx
53 zvbi:libzvbi
54 # libavfilter options
55 bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
56 @@ -217,7 +217,6 @@ RDEPEND="
57 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
58 rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
59 samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
60 - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
61 sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
62 speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
63 ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
64
65 diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
66 index f6b827597e8..d55a0875bac 100644
67 --- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
68 +++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
69 @@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
70 amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
71 jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
72 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
73 - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
74 + speex:libspeex vorbis:libvorbis vpx:libvpx
75 zvbi:libzvbi
76 # libavfilter options
77 bs2b:libbs2b chromaprint flite:libflite frei0r
78 @@ -233,7 +233,6 @@ RDEPEND="
79 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
80 rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
81 samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
82 - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
83 sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
84 sofalizer? (
85 >=sci-libs/netcdf-4.3.2-r1[hdf5]
86
87 diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
88 index 5e1f935e172..c86f3c9aece 100644
89 --- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
90 +++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
91 @@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
92 amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
93 jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
94 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
95 - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
96 + speex:libspeex vorbis:libvorbis vpx:libvpx
97 zvbi:libzvbi
98 # libavfilter options
99 bs2b:libbs2b chromaprint flite:libflite frei0r
100 @@ -233,7 +233,6 @@ RDEPEND="
101 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
102 rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
103 samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
104 - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
105 sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
106 sofalizer? (
107 >=sci-libs/netcdf-4.3.2-r1[hdf5]
108
109 diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
110 index 6a794f83105..fe80b8d1262 100644
111 --- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
112 +++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
113 @@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
114 amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
115 jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
116 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
117 - schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
118 + speex:libspeex vorbis:libvorbis vpx:libvpx
119 zvbi:libzvbi
120 # libavfilter options
121 bs2b:libbs2b chromaprint flite:libflite frei0r
122 @@ -233,7 +233,6 @@ RDEPEND="
123 librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
124 rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
125 samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
126 - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
127 sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
128 sofalizer? (
129 >=sci-libs/netcdf-4.3.2-r1[hdf5]
130
131 diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
132 index ac9e4e532cc..35024c9f8c5 100644
133 --- a/media-video/ffmpeg/metadata.xml
134 +++ b/media-video/ffmpeg/metadata.xml
135 @@ -49,7 +49,6 @@
136 <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
137 <flag name="postproc">Build and install libpostproc.</flag>
138 <flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
139 - <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>
140 <flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
141 <flag name="sofalizer">Enables Sofalizer filter</flag>
142 <flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
143
144 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
145 index 961109f8df4..e3dd8800c06 100644
146 --- a/profiles/base/package.use.mask
147 +++ b/profiles/base/package.use.mask
148 @@ -50,7 +50,6 @@ mate-extra/mate-power-manager pm-utils
149
150 # Pacho Ramos <pacho@×××××.org> (04 Nov 2018)
151 # media-libs/schroedinger will be removed (#602938)
152 -media-video/ffmpeg schroedinger
153 media-video/libav schroedinger
154
155 # Pacho Ramos <pacho@×××××.org> (04 Nov 2018)