* [gentoo-commits] gentoo-x86 commit in media-video/libav: metadata.xml ChangeLog libav-0.8.2-r2.ebuild libav-9999.ebuild libav-0.8.9999.ebuild libav-0.8.2-r1.ebuild
@ 2012-05-15 6:10 Luca Barbato (lu_zero)
0 siblings, 0 replies; only message in thread
From: Luca Barbato (lu_zero) @ 2012-05-15 6:10 UTC (permalink / raw
To: gentoo-commits
lu_zero 12/05/15 06:10:50
Modified: metadata.xml ChangeLog libav-9999.ebuild
libav-0.8.9999.ebuild
Added: libav-0.8.2-r2.ebuild
Removed: libav-0.8.2-r1.ebuild
Log:
Cleanup ebuilds, enable fate for 0.8
(Portage version: 2.2.0_alpha103/cvs/Linux x86_64)
Revision Changes Path
1.10 media-video/libav/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/metadata.xml?r1=1.9&r2=1.10
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml 13 May 2012 19:48:17 -0000 1.9
+++ metadata.xml 15 May 2012 06:10:50 -0000 1.10
@@ -12,20 +12,15 @@
3dnowext in /proc/cpuinfo to know whether your CPU supports it).
</flag>
<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
- <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
- <flag name="ass">Enables <pkg>media-libs/libass</pkg> based subtitle renderer.</flag>
<flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
- <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
- <flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).</flag>
<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
<flag name="faac">Use external faac library for AAC encoding</flag>
<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
- <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
<flag name="mmxext">Enable mmx2 support.</flag>
<flag name="network">Enable network streaming support.</flag>
<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
1.85 media-video/libav/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?r1=1.84&r2=1.85
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog 14 May 2012 18:29:13 -0000 1.84
+++ ChangeLog 15 May 2012 06:10:50 -0000 1.85
@@ -1,6 +1,13 @@
# ChangeLog for media-video/libav
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.84 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.85 2012/05/15 06:10:50 lu_zero Exp $
+
+*libav-0.8.2-r2 (15 May 2012)
+
+ 15 May 2012; Luca Barbato <lu_zero@gentoo.org> -libav-0.8.2-r1.ebuild,
+ +libav-0.8.2-r2.ebuild, libav-0.8.9999.ebuild, libav-9999.ebuild,
+ metadata.xml:
+ Cleanup ebuilds, enable fate for 0.8
14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r1.ebuild,
libav-0.8.9999.ebuild, libav-9999.ebuild:
1.45 media-video/libav/libav-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?r1=1.44&r2=1.45
Index: libav-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libav-9999.ebuild 14 May 2012 18:29:13 -0000 1.44
+++ libav-9999.ebuild 15 May 2012 06:10:50 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.44 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.45 2012/05/15 06:10:50 lu_zero Exp $
EAPI=4
@@ -27,90 +27,63 @@
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~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 aacplus alsa ass amr bindist bluray +bzip2 cdio celt cpudetection
- custom-cflags debug doc +encode faac fontconfig frei0r +gpl gsm
- +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openssl oss
- pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads
- truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
-for i in ${CPU_FEATURES} ; do
- IUSE+=" ${i%:*}"
-done
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
+ custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+ +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
+ oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs
+ test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
+
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
+neon ssse3 vis"
-FFTOOLS="aviocat cws2fws graph2dot ismindex pktdumper qt-faststart trasher"
-for i in ${FFTOOLS} ; do
- IUSE+=" +fftools_${i}"
+for i in ${CPU_FEATURES}; do
+ IUSE+=" ${i%:*}"
done
RDEPEND="
!media-video/ffmpeg
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
- ass? ( media-libs/libass )
- bluray? ( media-libs/libbluray )
bzip2? ( app-arch/bzip2 )
cdio? ( dev-libs/libcdio )
- celt? ( >=media-libs/celt-0.11.1 )
+ dirac? ( media-video/dirac )
encode? (
aac? ( media-libs/vo-aacenc )
- aacplus? ( media-libs/libaacplus )
amr? ( media-libs/vo-amrwbenc )
faac? ( media-libs/faac )
mp3? ( >=media-sound/lame-3.98.3 )
- theora? (
- >=media-libs/libtheora-1.1.1[encode]
- media-libs/libogg
- )
+ theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
vorbis? ( media-libs/libvorbis media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20111017 )
xvid? ( >=media-libs/xvid-1.1.0 )
)
- fontconfig? ( media-libs/fontconfig )
+ truetype? ( media-libs/freetype:2 )
frei0r? ( media-plugins/frei0r-plugins )
gsm? ( >=media-sound/gsm-1.0.12-r1 )
- ieee1394? (
- media-libs/libdc1394
- sys-libs/libraw1394
- )
+ ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
jack? ( media-sound/jack-audio-connection-kit )
jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
- libv4l? ( media-libs/libv4l )
- modplug? ( media-libs/libmodplug )
+ rtmp? ( >=media-video/rtmpdump-2.4 )
pulseaudio? ( media-sound/pulseaudio )
- rtmp? ( >=media-video/rtmpdump-2.2f )
- ssl? (
- openssl? ( dev-libs/openssl )
- !openssl? ( net-libs/gnutls )
- )
+ ssl? ( openssl? ( dev-libs/openssl )
+ !openssl? ( net-libs/gnutls ) )
sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
schroedinger? ( media-libs/schroedinger )
speex? ( >=media-libs/speex-1.2_beta3 )
- truetype? ( media-libs/freetype:2 )
vaapi? ( x11-libs/libva )
vdpau? ( x11-libs/libvdpau )
vpx? ( >=media-libs/libvpx-0.9.6 )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- )
+ X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}
>=sys-devel/make-3.81
+ dirac? ( virtual/pkgconfig )
doc? ( app-text/texi2html )
- fontconfig? ( virtual/pkgconfig )
- ieee1394? ( virtual/pkgconfig )
- libv4l? ( virtual/pkgconfig )
mmx? ( dev-lang/yasm )
rtmp? ( virtual/pkgconfig )
schroedinger? ( virtual/pkgconfig )
- ssl? ( virtual/pkgconfig )
- test? ( net-misc/wget )
truetype? ( virtual/pkgconfig )
v4l? ( sys-kernel/linux-headers )
"
@@ -120,11 +93,11 @@
# faac and aac are concurent implementations
# amr and aac require at least lgpl3
# x264 requires gpl2
-REQUIRED_USE="bindist? ( !aacplus !faac !openssl )
- rtmp? ( network )
- amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
- test? ( encode zlib )
-"
+REQUIRED_USE="bindist? ( !faac !openssl )
+ rtmp? ( network )
+ amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
+
+RESTRICT="test"
src_prepare() {
# if we have snapshot then we need to hardcode the version
@@ -133,6 +106,8 @@
fi
}
+TOOLS="aviocat graph2dot ismindex qt-faststart"
+
src_configure() {
local myconf="${EXTRA_LIBAV_CONF}"
local uses i
@@ -143,6 +118,8 @@
--enable-avfilter
"
+ use zlib && TOOLS+=" cws2fws"
+
# enabled by default
uses="debug doc network zlib"
for i in ${uses}; do
@@ -153,24 +130,27 @@
if use ssl; then
use openssl && myconf+=" --enable-openssl --enable-nonfree" \
- || myconf+=" --enable-gnutls"
+ || myconf+=" --enable-gnutls"
fi
use custom-cflags && myconf+=" --disable-optimizations"
use cpudetection && myconf+=" --enable-runtime-cpudetect"
+ #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+ # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+ # use vdpau || myconf="${myconf} --disable-decoder=${i}"
+ #done
use vdpau || myconf+=" --disable-vdpau"
use vaapi && myconf+=" --enable-vaapi"
# Encoders
if use encode; then
- use aacplus && myconf+=" --enable-nonfree"
- use faac && myconf+=" --enable-nonfree"
use mp3 && myconf+=" --enable-libmp3lame"
use amr && myconf+=" --enable-libvo-amrwbenc"
+ use faac && myconf+=" --enable-libfaac --enable-nonfree"
use aac && myconf+=" --enable-libvo-aacenc"
- uses="aacplus faac theora vorbis x264 xvid"
+ uses="theora vorbis x264 xvid"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"
done
@@ -182,7 +162,6 @@
use cdio && myconf+=" --enable-libcdio"
use ieee1394 && myconf+=" --enable-libdc1394"
use pulseaudio && myconf+=" --enable-libpulse"
-
# Indevs
# v4l1 is gone since linux-headers-2.6.38
myconf+=" --disable-indev=v4l"
@@ -191,24 +170,20 @@
use ${i} || myconf+=" --disable-indev=${i}"
done
use X && myconf+=" --enable-x11grab"
- use libv4l && myconf+=" --enable-libv4l2"
# Outdevs
for i in alsa oss ; do
use ${i} || myconf+=" --disable-outdev=${i}"
done
# libavfilter options
- use ass && myconf+=" --enable-libass"
+ use frei0r && myconf+=" --enable-frei0r"
use truetype && myconf+=" --enable-libfreetype"
- for i in frei0r fontconfig ; do
- use ${i} && myconf+=" --enable-${i}"
- done
# Threads; we only support pthread for now but ffmpeg supports more
use threads && myconf+=" --enable-pthreads"
# Decoders
use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
- uses="bluray celt gsm modplug rtmp schroedinger speex vpx"
+ uses="gsm dirac rtmp schroedinger speex vpx"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"
done
@@ -237,7 +212,8 @@
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
# will just ignore it.
for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [[ "${i}" == "native" ]] && i="host" # bug #273421
+ [ "${i}" = "native" ] && i="host" # bug #273421
+ [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
myconf+=" --cpu=${i}"
break
done
@@ -278,41 +254,41 @@
cd "${S}"
./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --shlibdir="${EPREFIX}"/usr/$(get_libdir) \
- --mandir="${EPREFIX}"/usr/share/man \
+ --prefix="$EPREFIX"/usr \
+ --libdir="$EPREFIX"/usr/$(get_libdir) \
+ --shlibdir="$EPREFIX"/usr/$(get_libdir) \
+ --mandir="$EPREFIX"/usr/share/man \
--enable-shared \
--cc="$(tc-getCC)" \
- --ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- --extra-cflags="${CFLAGS}" \
$(use_enable static-libs static) \
${myconf} || die
}
src_compile() {
- local i
-
emake
- for i in ${FFTOOLS} ; do
- use fftools_${i} && emake tools/${i}
- done
+ if use tools; then
+ tc-export CC
+ local i
+ for i in ${TOOLS}; do
+ emake tools/${i}
+ done
+ fi
}
src_install() {
local i
-
emake DESTDIR="${D}" install install-man
dodoc Changelog README INSTALL
dodoc doc/*.txt
use doc && dodoc doc/*.html
- for i in ${FFTOOLS} ; do
- use fftools_${i} && dobin tools/${i}
- done
+ if use tools; then
+ for i in ${TOOLS}; do
+ dobin tools/${i}
+ done
+ fi
for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
dosym ${i} /usr/bin/${i/av/ff}
@@ -327,6 +303,5 @@
}
src_test() {
- LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake V=1 -j1 fate
+ ewarn "Live ebuild needs the current fate repository. Skipping for now"
}
1.16 media-video/libav/libav-0.8.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild?r1=1.15&r2=1.16
Index: libav-0.8.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libav-0.8.9999.ebuild 14 May 2012 18:29:13 -0000 1.15
+++ libav-0.8.9999.ebuild 15 May 2012 06:10:50 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.15 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.16 2012/05/15 06:10:50 lu_zero Exp $
EAPI=4
@@ -22,21 +22,22 @@
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
-LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )"
+
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~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 aacplus alsa ass amr bindist +bzip2 cdio celt cpudetection
- custom-cflags dirac debug doc +encode faac frei0r +gpl gsm
- +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network
- openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
- static-libs test theora threads truetype v4l vaapi vdpau vorbis
- vpx X x264 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
+ custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+ +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
+ oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
+ static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
+ +zlib"
+
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
+neon ssse3 vis"
for i in ${CPU_FEATURES}; do
IUSE+=" ${i%:*}"
@@ -46,53 +47,36 @@
!media-video/ffmpeg
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
- ass? ( media-libs/libass )
bzip2? ( app-arch/bzip2 )
cdio? ( dev-libs/libcdio )
- celt? ( >=media-libs/celt-0.11.1 )
dirac? ( media-video/dirac )
encode? (
aac? ( media-libs/vo-aacenc )
- aacplus? ( media-libs/libaacplus )
amr? ( media-libs/vo-amrwbenc )
faac? ( media-libs/faac )
mp3? ( >=media-sound/lame-3.98.3 )
- theora? (
- >=media-libs/libtheora-1.1.1[encode]
- media-libs/libogg
- )
+ theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
vorbis? ( media-libs/libvorbis media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20111017 )
xvid? ( >=media-libs/xvid-1.1.0 )
)
+ truetype? ( media-libs/freetype:2 )
frei0r? ( media-plugins/frei0r-plugins )
gsm? ( >=media-sound/gsm-1.0.12-r1 )
- ieee1394? (
- media-libs/libdc1394
- sys-libs/libraw1394
- )
+ ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
jack? ( media-sound/jack-audio-connection-kit )
jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
- libv4l? ( media-libs/libv4l )
- modplug? ( media-libs/libmodplug )
pulseaudio? ( media-sound/pulseaudio )
rtmp? ( >=media-video/rtmpdump-2.2f )
- ssl? (
- openssl? ( dev-libs/openssl )
- !openssl? ( net-libs/gnutls )
- )
+ ssl? ( openssl? ( dev-libs/openssl )
+ !openssl? ( net-libs/gnutls ) )
sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
schroedinger? ( media-libs/schroedinger )
speex? ( >=media-libs/speex-1.2_beta3 )
- truetype? ( media-libs/freetype:2 )
vaapi? ( x11-libs/libva )
vdpau? ( x11-libs/libvdpau )
vpx? ( >=media-libs/libvpx-0.9.6 )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- )
+ X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
zlib? ( sys-libs/zlib )
"
@@ -100,14 +84,11 @@
>=sys-devel/make-3.81
dirac? ( virtual/pkgconfig )
doc? ( app-text/texi2html )
- ieee1394? ( virtual/pkgconfig )
- libv4l? ( virtual/pkgconfig )
mmx? ( dev-lang/yasm )
rtmp? ( virtual/pkgconfig )
schroedinger? ( virtual/pkgconfig )
- ssl? ( virtual/pkgconfig )
- test? ( net-misc/wget )
truetype? ( virtual/pkgconfig )
+ test? ( net-misc/wget )
v4l? ( sys-kernel/linux-headers )
"
@@ -116,11 +97,10 @@
# faac and aac are concurent implementations
# amr and aac require at least lgpl3
# x264 requires gpl2
-REQUIRED_USE="bindist? ( !aacplus !faac !openssl )
- rtmp? ( network )
- amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
- test? ( encode zlib )
-"
+REQUIRED_USE="bindist? ( !faac !openssl )
+ rtmp? ( network )
+ amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+ test? ( encode )"
src_prepare() {
# if we have snapshot then we need to hardcode the version
@@ -149,24 +129,27 @@
if use ssl; then
use openssl && myconf+=" --enable-openssl --enable-nonfree" \
- || myconf+=" --enable-gnutls"
+ || myconf+=" --enable-gnutls"
fi
use custom-cflags && myconf+=" --disable-optimizations"
use cpudetection && myconf+=" --enable-runtime-cpudetect"
+ #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+ # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+ # use vdpau || myconf="${myconf} --disable-decoder=${i}"
+ #done
use vdpau || myconf+=" --disable-vdpau"
use vaapi && myconf+=" --enable-vaapi"
# Encoders
if use encode; then
- use aacplus && myconf+=" --enable-nonfree"
- use faac && myconf+=" --enable-nonfree"
use mp3 && myconf+=" --enable-libmp3lame"
use amr && myconf+=" --enable-libvo-amrwbenc"
+ use faac && myconf+=" --enable-libfaac --enable-nonfree"
use aac && myconf+=" --enable-libvo-aacenc"
- uses="aacplus faac theora vorbis x264 xvid"
+ uses="theora vorbis x264 xvid"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"
done
@@ -178,7 +161,6 @@
use cdio && myconf+=" --enable-libcdio"
use ieee1394 && myconf+=" --enable-libdc1394"
use pulseaudio && myconf+=" --enable-libpulse"
-
# Indevs
# v4l1 is gone since linux-headers-2.6.38
myconf+=" --disable-indev=v4l"
@@ -187,13 +169,11 @@
use ${i} || myconf+=" --disable-indev=${i}"
done
use X && myconf+=" --enable-x11grab"
- use libv4l && myconf=" --enable-libv4l2"
# Outdevs
for i in alsa oss ; do
use ${i} || myconf+=" --disable-outdev=${i}"
done
# libavfilter options
- use ass && myconf+=" --enable-libass"
use frei0r && myconf+=" --enable-frei0r"
use truetype && myconf+=" --enable-libfreetype"
@@ -202,7 +182,7 @@
# Decoders
use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
- uses="celt gsm modplug rtmp schroedinger speex vpx"
+ uses="gsm dirac rtmp schroedinger speex vpx"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"
done
@@ -231,7 +211,8 @@
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
# will just ignore it.
for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [[ "${i}" == "native" ]] && i="host" # bug #273421
+ [ "${i}" = "native" ] && i="host" # bug #273421
+ [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
myconf+=" --cpu=${i}"
break
done
@@ -279,33 +260,29 @@
--enable-shared \
--cc="$(tc-getCC)" \
--ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- --extra-cflags="${CFLAGS}" \
$(use_enable static-libs static) \
${myconf} || die
}
src_compile() {
- local i
-
emake
- for i in ${FFTOOLS} ; do
- use fftools_${i} && emake tools/${i}
- done
+ if use qt-faststart; then
+ tc-export CC
+ emake tools/qt-faststart
+ fi
}
src_install() {
- local i
emake DESTDIR="${D}" install install-man
dodoc Changelog README INSTALL
dodoc doc/*.txt
use doc && dodoc doc/*.html
- for i in ${FFTOOLS} ; do
- use fftools_${i} && dobin tools/${i}
- done
+ if use qt-faststart; then
+ dobin tools/qt-faststart
+ fi
for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
dosym ${i} /usr/bin/${i/av/ff}
@@ -316,10 +293,11 @@
elog "Please note that the programs formerly known as ffplay, ffserver"
elog "and ffprobe are now called avplay, avserver and avprobe."
elog
- elog "ffmpeg had been replaced by the feature incompatible avconv"
+ elog "ffmpeg had been replaced by the feature incompatible avconv thus"
+ elog "the legacy ffmpeg is provided for compatibility with older scripts"
}
src_test() {
LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake V=1 -j1 fate
+ emake fate SAMPLES="${WORKDIR}/fate"
}
1.1 media-video/libav/libav-0.8.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8.2-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-0.8.2-r2.ebuild?rev=1.1&content-type=text/plain
Index: libav-0.8.2-r2.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2-r2.ebuild,v 1.1 2012/05/15 06:10:50 lu_zero Exp $
EAPI=4
if [[ ${PV} == *9999 ]] ; then
SCM="git-2"
EGIT_REPO_URI="git://git.libav.org/libav.git"
[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
fi
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
DESCRIPTION="Complete solution to record, convert and stream audio and video."
HOMEPAGE="http://libav.org/"
if [[ ${PV} == *9999 ]] ; then
SRC_URI=""
elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
else # Official release
SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
fi
SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
SLOT="0"
[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
+zlib"
CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
neon ssse3 vis"
for i in ${CPU_FEATURES}; do
IUSE+=" ${i%:*}"
done
RDEPEND="
!media-video/ffmpeg
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )
cdio? ( dev-libs/libcdio )
dirac? ( media-video/dirac )
encode? (
aac? ( media-libs/vo-aacenc )
amr? ( media-libs/vo-amrwbenc )
faac? ( media-libs/faac )
mp3? ( >=media-sound/lame-3.98.3 )
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
vorbis? ( media-libs/libvorbis media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20111017 )
xvid? ( >=media-libs/xvid-1.1.0 )
)
truetype? ( media-libs/freetype:2 )
frei0r? ( media-plugins/frei0r-plugins )
gsm? ( >=media-sound/gsm-1.0.12-r1 )
ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
jack? ( media-sound/jack-audio-connection-kit )
jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
pulseaudio? ( media-sound/pulseaudio )
rtmp? ( >=media-video/rtmpdump-2.2f )
ssl? ( openssl? ( dev-libs/openssl )
!openssl? ( net-libs/gnutls ) )
sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
schroedinger? ( media-libs/schroedinger )
speex? ( >=media-libs/speex-1.2_beta3 )
vaapi? ( x11-libs/libva )
vdpau? ( x11-libs/libvdpau )
vpx? ( >=media-libs/libvpx-0.9.6 )
X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}
>=sys-devel/make-3.81
dirac? ( virtual/pkgconfig )
doc? ( app-text/texi2html )
mmx? ( dev-lang/yasm )
rtmp? ( virtual/pkgconfig )
schroedinger? ( virtual/pkgconfig )
truetype? ( virtual/pkgconfig )
test? ( net-misc/wget )
v4l? ( sys-kernel/linux-headers )
"
# faac can't be binary distributed
# openssl support marked as nonfree
# faac and aac are concurent implementations
# amr and aac require at least lgpl3
# x264 requires gpl2
REQUIRED_USE="bindist? ( !faac !openssl )
rtmp? ( network )
amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
test? ( encode )"
src_prepare() {
# if we have snapshot then we need to hardcode the version
if [[ ${PV%_p*} != ${PV} ]]; then
sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
fi
}
src_configure() {
local myconf="${EXTRA_LIBAV_CONF}"
local uses i
myconf+="
$(use_enable gpl)
$(use_enable gpl version3)
--enable-avfilter
"
# enabled by default
uses="debug doc network zlib"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
use bzip2 || myconf+=" --disable-bzlib"
use sdl || myconf+=" --disable-avplay"
if use ssl; then
use openssl && myconf+=" --enable-openssl --enable-nonfree" \
|| myconf+=" --enable-gnutls"
fi
use custom-cflags && myconf+=" --disable-optimizations"
use cpudetection && myconf+=" --enable-runtime-cpudetect"
#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
# use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
# use vdpau || myconf="${myconf} --disable-decoder=${i}"
#done
use vdpau || myconf+=" --disable-vdpau"
use vaapi && myconf+=" --enable-vaapi"
# Encoders
if use encode; then
use mp3 && myconf+=" --enable-libmp3lame"
use amr && myconf+=" --enable-libvo-amrwbenc"
use faac && myconf+=" --enable-libfaac --enable-nonfree"
use aac && myconf+=" --enable-libvo-aacenc"
uses="theora vorbis x264 xvid"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"
done
else
myconf+=" --disable-encoders"
fi
# libavdevice options
use cdio && myconf+=" --enable-libcdio"
use ieee1394 && myconf+=" --enable-libdc1394"
use pulseaudio && myconf+=" --enable-libpulse"
# Indevs
# v4l1 is gone since linux-headers-2.6.38
myconf+=" --disable-indev=v4l"
use v4l || myconf+=" --disable-indev=v4l2"
for i in alsa oss jack; do
use ${i} || myconf+=" --disable-indev=${i}"
done
use X && myconf+=" --enable-x11grab"
# Outdevs
for i in alsa oss ; do
use ${i} || myconf+=" --disable-outdev=${i}"
done
# libavfilter options
use frei0r && myconf+=" --enable-frei0r"
use truetype && myconf+=" --enable-libfreetype"
# Threads; we only support pthread for now but ffmpeg supports more
use threads && myconf+=" --enable-pthreads"
# Decoders
use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
uses="gsm dirac rtmp schroedinger speex vpx"
for i in ${uses}; do
use ${i} && myconf+=" --enable-lib${i}"
done
use jpeg2k && myconf+=" --enable-libopenjpeg"
# CPU features
for i in ${CPU_FEATURES}; do
use ${i%:*} || myconf+=" --disable-${i#*:}"
done
# pass the right -mfpu as extra
use neon && myconf+=" --extra-cflags=-mfpu=neon"
# disable mmx accelerated code if PIC is required
# as the provided asm decidedly is not PIC for x86.
if use pic && use x86 ; then
myconf+=" --disable-mmx --disable-mmx2"
fi
# Option to force building pic
use pic && myconf+=" --enable-pic"
# Try to get cpu type based on CFLAGS.
# Bug #172723
# We need to do this so that features of that CPU will be better used
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
# will just ignore it.
for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
[ "${i}" = "native" ] && i="host" # bug #273421
[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
myconf+=" --cpu=${i}"
break
done
# cross compile support
if tc-is-cross-compiler ; then
myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
case ${CHOST} in
*freebsd*)
myconf+=" --target-os=freebsd"
;;
mingw32*)
myconf+=" --target-os=mingw32"
;;
*linux*)
myconf+=" --target-os=linux"
;;
esac
fi
# Misc stuff
use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
# Specific workarounds for too-few-registers arch...
if [[ $(tc-arch) == "x86" ]]; then
filter-flags -fforce-addr -momit-leaf-frame-pointer
append-flags -fomit-frame-pointer
is-flag -O? || append-flags -O2
if use debug; then
# no need to warn about debug if not using debug flag
ewarn ""
ewarn "Debug information will be almost useless as the frame pointer is omitted."
ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
ewarn "difficult to fix. Please have that in mind."
ewarn ""
fi
fi
cd "${S}"
./configure \
--prefix="${EPREFIX}"/usr \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
--mandir="${EPREFIX}"/usr/share/man \
--enable-shared \
--cc="$(tc-getCC)" \
--ar="$(tc-getAR)" \
$(use_enable static-libs static) \
${myconf} || die
}
src_compile() {
emake
if use qt-faststart; then
tc-export CC
emake tools/qt-faststart
fi
}
src_install() {
emake DESTDIR="${D}" install install-man
dodoc Changelog README INSTALL
dodoc doc/*.txt
use doc && dodoc doc/*.html
if use qt-faststart; then
dobin tools/qt-faststart
fi
for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
dosym ${i} /usr/bin/${i/av/ff}
done
}
pkg_postinst() {
elog "Please note that the programs formerly known as ffplay, ffserver"
elog "and ffprobe are now called avplay, avserver and avprobe."
elog
elog "ffmpeg had been replaced by the feature incompatible avconv thus"
elog "the legacy ffmpeg is provided for compatibility with older scripts"
}
src_test() {
LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
emake fate SAMPLES="${WORKDIR}/fate"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-15 6:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-15 6:10 [gentoo-commits] gentoo-x86 commit in media-video/libav: metadata.xml ChangeLog libav-0.8.2-r2.ebuild libav-9999.ebuild libav-0.8.9999.ebuild libav-0.8.2-r1.ebuild Luca Barbato (lu_zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox