commit: efc4511fa5660df7fd4384cea31bfbccbfc7a90e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 10:05:56 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 10:05:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc4511f
media-video/ffmpeg: rename rtmp useflag to librtmp, bug #509974
Package-Manager: portage-2.2.20.1
media-video/ffmpeg/ffmpeg-2.6.3.ebuild | 6 +++---
media-video/ffmpeg/ffmpeg-2.6.4.ebuild | 6 +++---
media-video/ffmpeg/ffmpeg-2.7.2.ebuild | 6 +++---
media-video/ffmpeg/ffmpeg-9999.ebuild | 6 +++---
media-video/ffmpeg/metadata.xml | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index 2f513ba..cc84933 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme
gsm:libgsm
- modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp
ssh:libssh
+ modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -207,7 +207,7 @@ RDEPEND="
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -243,7 +243,7 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
- rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
test? ( net-misc/wget sys-devel/bc )
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
index f4e269c..b9a6919 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme
gsm:libgsm
- modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp
ssh:libssh
+ modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -207,7 +207,7 @@ RDEPEND="
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -243,7 +243,7 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
- rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
test? ( net-misc/wget sys-devel/bc )
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
index c568a8f..83094e5 100644
--- a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme
gsm:libgsm
- modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp
ssh:libssh
+ modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -207,7 +207,7 @@ RDEPEND="
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -243,7 +243,7 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
- rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
test? ( net-misc/wget sys-devel/bc )
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index fa8dea8..47175a4 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme
gsm:libgsm
- modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp
ssh:libssh
+ modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis
vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -209,7 +209,7 @@ RDEPEND="
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -245,7 +245,7 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
- rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+ librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
test? ( net-misc/wget sys-devel/bc )
truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index f5dbd10..8f0f349 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -38,7 +38,7 @@
<flag name="pic">Force shared libraries to be built as PIC (this is
slower)</flag>
<flag name="postproc">Build and install libpostproc.</flag>
<flag name="quvi">Adds support for playing media from Internet services
using the quvi project.</flag>
- <flag name="rtmp">Enable Real Time Messaging Protocol using
librtmp</flag>
+ <flag name="librtmp">Enable Real Time Messaging Protocol using
librtmp</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="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required
for e.g. Vidvox Hap encoder.</flag>
<flag name="ssh">Enable SSH/sftp support via
<pkg>net-libs/libssh</pkg>.</flag>
