* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-0.6_p25423.ebuild
@ 2010-10-09 13:44 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2010-10-09 13:44 UTC (permalink / raw
To: gentoo-commits
aballier 10/10/09 13:44:48
Modified: ChangeLog
Added: ffmpeg-0.6_p25423.ebuild
Log:
push a new snapshot, fixes 329921, 339036 and should help with 179872
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Revision Changes Path
1.376 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.376&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.376&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.375&r2=1.376
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- ChangeLog 8 Oct 2010 14:50:47 -0000 1.375
+++ ChangeLog 9 Oct 2010 13:44:10 -0000 1.376
@@ -1,6 +1,12 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.375 2010/10/08 14:50:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.376 2010/10/09 13:44:10 aballier Exp $
+
+*ffmpeg-0.6_p25423 (09 Oct 2010)
+
+ 09 Oct 2010; Alexis Ballier <aballier@gentoo.org>
+ +ffmpeg-0.6_p25423.ebuild:
+ push a new snapshot, fixes 329921, 339036 and should help with 179872
08 Oct 2010; Brent Baude <ranger@gentoo.org> ffmpeg-0.6.ebuild:
Marking ffmpeg-0.6 ppc for bug 332361
1.1 media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?rev=1.1&content-type=text/plain
Index: ffmpeg-0.6_p25423.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.1 2010/10/09 13:44:21 aballier Exp $
EAPI="2"
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
SCM="subversion"
ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
fi
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
HOMEPAGE="http://ffmpeg.org/"
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
SRC_URI="mirror://gentoo/${P}.tar.bz2"
else # Release
SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2"
fi
FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-3"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
VIDEO_CARDS="nvidia"
for x in ${VIDEO_CARDS}; do
IUSE="${IUSE} video_cards_${x}"
done
RDEPEND="
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )
dirac? ( media-video/dirac )
encode? (
faac? ( media-libs/faac )
mp3? ( media-sound/lame )
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
vorbis? ( media-libs/libvorbis media-libs/libogg )
x264? ( >=media-libs/x264-0.0.20100605 )
xvid? ( >=media-libs/xvid-1.1.0 )
)
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 )
rtmp? ( media-video/rtmpdump )
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 )
video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
vpx? ( media-libs/libvpx )
X? ( x11-libs/libX11 x11-libs/libXext )
zlib? ( sys-libs/zlib )
!media-video/qt-faststart
"
DEPEND="${RDEPEND}
>=sys-devel/make-3.81
dirac? ( dev-util/pkgconfig )
doc? ( app-text/texi2html )
mmx? ( dev-lang/yasm )
rtmp? ( dev-util/pkgconfig )
schroedinger? ( dev-util/pkgconfig )
test? ( net-misc/wget )
v4l? ( sys-kernel/linux-headers )
v4l2? ( sys-kernel/linux-headers )
"
src_prepare() {
if [ "${PV#9999}" != "${PV}" ] ; then
# Set SVN version manually
subversion_wc_info
sed -i -e "s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/" "${S}/version.sh" || die
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
sed -i -e "s/UNKNOWN/SVN-r${FFMPEG_REVISION}/" "${S}/version.sh" || die
fi
}
src_configure() {
local myconf="${EXTRA_FFMPEG_CONF}"
# enabled by default
for i in debug doc network vaapi zlib; do
use ${i} || myconf="${myconf} --disable-${i}"
done
use bzip2 || myconf="${myconf} --disable-bzlib"
use sdl || myconf="${myconf} --disable-ffplay"
use static-libs || myconf="${myconf} --disable-static"
use custom-cflags && myconf="${myconf} --disable-optimizations"
use cpudetection && myconf="${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 video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau"
# Encoders
if use encode
then
use mp3 && myconf="${myconf} --enable-libmp3lame"
for i in theora vorbis x264 xvid; do
use ${i} && myconf="${myconf} --enable-lib${i}"
done
if use bindist
then
use faac && ewarn "faac is nonfree and cannot be distributed;
disabling faac support."
else
use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
fi
else
myconf="${myconf} --disable-encoders"
fi
# libavdevice options
use ieee1394 && myconf="${myconf} --enable-libdc1394"
# Indevs
for i in v4l v4l2 alsa oss jack ; do
use ${i} || myconf="${myconf} --disable-indev=${i}"
done
use X && myconf="${myconf} --enable-x11grab"
# Outdevs
for i in alsa oss ; do
use ${i} || myconf="${myconf} --disable-outdev=${i}"
done
# libavfilter options
use frei0r && myconf="${myconf} --enable-frei0r"
# Threads; we only support pthread for now but ffmpeg supports more
use threads && myconf="${myconf} --enable-pthreads"
# Decoders
use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb"
for i in gsm dirac rtmp schroedinger speex vpx; do
use ${i} && myconf="${myconf} --enable-lib${i}"
done
use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
# CPU features
for i in mmx ssse3 altivec ; do
use ${i} || myconf="${myconf} --disable-${i}"
done
use mmxext || myconf="${myconf} --disable-mmx2"
use 3dnow || myconf="${myconf} --disable-amd3dnow"
use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
# 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="${myconf} --disable-mmx --disable-mmx2"
fi
# Option to force building pic
use pic && myconf="${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="${myconf} --cpu=${i}"
break
done
# Mandatory configuration
myconf="
--enable-gpl
--enable-version3
--enable-postproc
--enable-avfilter
--disable-stripping
${myconf}"
# cross compile support
if tc-is-cross-compiler ; then
myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
case ${CHOST} in
*freebsd*)
myconf="${myconf} --target-os=freebsd"
;;
mingw32*)
myconf="${myconf} --target-os=mingw32"
;;
*linux*)
myconf="${myconf} --target-os=linux"
;;
esac
fi
# Misc stuff
use hardcoded-tables && myconf="${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=/usr \
--libdir=/usr/$(get_libdir) \
--shlibdir=/usr/$(get_libdir) \
--mandir=/usr/share/man \
--enable-static --enable-shared \
--cc="$(tc-getCC)" \
${myconf} || die
}
src_compile() {
emake version.h || die #252269
emake || die
if use qt-faststart; then
tc-export CC
emake -C tools qt-faststart || die
fi
}
src_install() {
emake DESTDIR="${D}" install install-man || die
dodoc Changelog README INSTALL
dodoc doc/*
if use qt-faststart; then
dobin tools/qt-faststart || die
fi
}
src_test() {
if use encode ; then
for t in codectest lavftest seektest ; do
LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
emake ${t} || die "Some tests in ${t} failed"
done
else
ewarn "Tests fail without USE=encode, skipping"
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-0.6_p25423.ebuild
@ 2010-10-10 19:08 Raul Porcel (armin76)
0 siblings, 0 replies; 3+ messages in thread
From: Raul Porcel (armin76) @ 2010-10-10 19:08 UTC (permalink / raw
To: gentoo-commits
armin76 10/10/10 19:08:35
Modified: ChangeLog ffmpeg-0.6_p25423.ebuild
Log:
Re-add ~alpha/~ia64/~sparc wrt #340269
(Portage version: 2.1.8.3/cvs/Linux ia64)
Revision Changes Path
1.377 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.377&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.377&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.376&r2=1.377
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- ChangeLog 9 Oct 2010 13:44:10 -0000 1.376
+++ ChangeLog 10 Oct 2010 19:08:35 -0000 1.377
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.376 2010/10/09 13:44:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.377 2010/10/10 19:08:35 armin76 Exp $
+
+ 10 Oct 2010; Raúl Porcel <armin76@gentoo.org> ffmpeg-0.6_p25423.ebuild:
+ Re-add ~alpha/~ia64/~sparc wrt #340269
*ffmpeg-0.6_p25423 (09 Oct 2010)
1.2 media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-0.6_p25423.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-0.6_p25423.ebuild 9 Oct 2010 13:44:21 -0000 1.1
+++ ffmpeg-0.6_p25423.ebuild 10 Oct 2010 19:08:35 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.1 2010/10/09 13:44:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.2 2010/10/10 19:08:35 armin76 Exp $
EAPI="2"
@@ -26,7 +26,7 @@
LICENSE="GPL-3"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-0.6_p25423.ebuild
@ 2010-10-11 22:13 Markus Meier (maekke)
0 siblings, 0 replies; 3+ messages in thread
From: Markus Meier (maekke) @ 2010-10-11 22:13 UTC (permalink / raw
To: gentoo-commits
maekke 10/10/11 22:13:00
Modified: ChangeLog ffmpeg-0.6_p25423.ebuild
Log:
restore ~arm, bug #340269
(Portage version: 2.2_rc91/cvs/Linux i686)
Revision Changes Path
1.379 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.379&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.379&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.378&r2=1.379
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- ChangeLog 11 Oct 2010 18:52:45 -0000 1.378
+++ ChangeLog 11 Oct 2010 22:13:00 -0000 1.379
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.378 2010/10/11 18:52:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.379 2010/10/11 22:13:00 maekke Exp $
+
+ 11 Oct 2010; Markus Meier <maekke@gentoo.org> ffmpeg-0.6_p25423.ebuild:
+ restore ~arm, bug #340269
11 Oct 2010; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.6.ebuild:
Stable for HPPA (bug #332361).
1.3 media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild?r1=1.2&r2=1.3
Index: ffmpeg-0.6_p25423.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-0.6_p25423.ebuild 10 Oct 2010 19:08:35 -0000 1.2
+++ ffmpeg-0.6_p25423.ebuild 11 Oct 2010 22:13:00 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.2 2010/10/10 19:08:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.3 2010/10/11 22:13:00 maekke Exp $
EAPI="2"
@@ -26,7 +26,7 @@
LICENSE="GPL-3"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-11 22:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-09 13:44 [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-0.6_p25423.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2010-10-10 19:08 Raul Porcel (armin76)
2010-10-11 22:13 Markus Meier (maekke)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox