[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/06/10 09:04:18

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  make tests work when upgrading, they should pass so make them also fatal
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.292                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.292&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.292&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.291&r2=1.292

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- ChangeLog	10 Jun 2009 08:51:35 -0000	1.291
+++ ChangeLog	10 Jun 2009 09:04:18 -0000	1.292
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.291 2009/06/10 08:51:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.292 2009/06/10 09:04:18 aballier Exp $
+
+  10 Jun 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  make tests work when upgrading, they should pass so make them also fatal
 
   10 Jun 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.5-r1.ebuild,
   ffmpeg-9999-r1.ebuild:



1.3                  media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.2&r2=1.3

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-9999-r1.ebuild	10 Jun 2009 08:51:35 -0000	1.2
+++ ffmpeg-9999-r1.ebuild	10 Jun 2009 09:04:18 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.2 2009/06/10 08:51:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.3 2009/06/10 09:04:18 aballier Exp $
 
 EAPI=2
 
@@ -189,10 +189,10 @@
 	dodoc doc/*
 }
 
-# Never die for now...
 src_test() {
-	for t in codectest libavtest seektest ; do
-		emake ${t} || ewarn "Some tests in ${t} failed"
+	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
 }
 

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/06/10 09:08:34

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  remove useless warning, it must not be the user's duty to figure out abi breaks
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.293                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.293&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.293&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.292&r2=1.293

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- ChangeLog	10 Jun 2009 09:04:18 -0000	1.292
+++ ChangeLog	10 Jun 2009 09:08:34 -0000	1.293
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.292 2009/06/10 09:04:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.293 2009/06/10 09:08:34 aballier Exp $
+
+  10 Jun 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  remove useless warning, it must not be the user's duty to figure out abi
+  breaks
 
   10 Jun 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   make tests work when upgrading, they should pass so make them also fatal



1.4                  media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.3&r2=1.4

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ffmpeg-9999-r1.ebuild	10 Jun 2009 09:04:18 -0000	1.3
+++ ffmpeg-9999-r1.ebuild	10 Jun 2009 09:08:34 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.3 2009/06/10 09:04:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.4 2009/06/10 09:08:34 aballier Exp $
 
 EAPI=2
 
@@ -195,9 +195,3 @@
 			emake ${t} || die "Some tests in ${t} failed"
 	done
 }
-
-pkg_postinst() {
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-}

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/07/03 19:36:26

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  force a non free license only when needed, ie, when faac or amr is requested
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.297                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.297&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.297&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.296&r2=1.297

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- ChangeLog	3 Jul 2009 19:31:42 -0000	1.296
+++ ChangeLog	3 Jul 2009 19:36:26 -0000	1.297
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.296 2009/07/03 19:31:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.297 2009/07/03 19:36:26 aballier Exp $
+
+  03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  force a non free license only when needed, ie, when faac or amr is
+  requested
 
   03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild,
   metadata.xml:



1.6                  media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.5&r2=1.6

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ffmpeg-9999-r1.ebuild	3 Jul 2009 19:31:42 -0000	1.5
+++ ffmpeg-9999-r1.ebuild	3 Jul 2009 19:36:26 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.5 2009/07/03 19:31:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.6 2009/07/03 19:36:26 aballier Exp $
 
 EAPI=2
 
@@ -116,7 +116,7 @@
 		use amr && myconf="${myconf} --enable-libamr-nb \
 									 --enable-libamr-wb"
 		use faac && myconf="${myconf} --enable-libfaac"
-		myconf="${myconf} --enable-nonfree"
+		{ use faac || use amr ; } && myconf="${myconf} --enable-nonfree"
 	fi
 
 	# CPU features

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/07/04 08:20:56

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Reflect upstream changes for the way of disabling libavdevice in/outdevs
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.298                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.298&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.298&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.297&r2=1.298

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- ChangeLog	3 Jul 2009 19:36:26 -0000	1.297
+++ ChangeLog	4 Jul 2009 08:20:56 -0000	1.298
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.297 2009/07/03 19:36:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.298 2009/07/04 08:20:56 aballier Exp $
+
+  04 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Reflect upstream changes for the way of disabling libavdevice in/outdevs
 
   03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   force a non free license only when needed, ie, when faac or amr is



1.7                  media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.6&r2=1.7

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ffmpeg-9999-r1.ebuild	3 Jul 2009 19:36:26 -0000	1.6
+++ ffmpeg-9999-r1.ebuild	4 Jul 2009 08:20:56 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.6 2009/07/03 19:36:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.7 2009/07/04 08:20:56 aballier Exp $
 
 EAPI=2
 
@@ -84,13 +84,13 @@
 
 	# libavdevice options
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	# Demuxers
+	# Indevs
 	for i in v4l v4l2 alsa oss jack ; do
-		use $i || myconf="${myconf} --disable-demuxer=$i"
+		use $i || myconf="${myconf} --disable-indev=$i"
 	done
-	# Muxers
+	# Outdevs
 	for i in alsa oss ; do
-		use $i || myconf="${myconf} --disable-muxer=$i"
+		use $i || myconf="${myconf} --disable-outdev=$i"
 	done
 	use X && myconf="${myconf} --enable-x11grab"
 

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/07/07 08:13:30

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Drop libamr support, its been removed upstream
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.299                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.299&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.299&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.298&r2=1.299

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- ChangeLog	4 Jul 2009 08:20:56 -0000	1.298
+++ ChangeLog	7 Jul 2009 08:13:30 -0000	1.299
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.298 2009/07/04 08:20:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.299 2009/07/07 08:13:30 aballier Exp $
+
+  07 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Drop libamr support, its been removed upstream
 
   04 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   Reflect upstream changes for the way of disabling libavdevice in/outdevs



1.8                  media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.7&r2=1.8

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ffmpeg-9999-r1.ebuild	4 Jul 2009 08:20:56 -0000	1.7
+++ ffmpeg-9999-r1.ebuild	7 Jul 2009 08:13:30 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.7 2009/07/04 08:20:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.8 2009/07/07 08:13:30 aballier Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+3dnow +3dnowext alsa altivec amr cpudetection custom-cflags debug dirac
+IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
 	  doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test
 	  theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb
 	  opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2
@@ -42,8 +42,7 @@
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	amr? ( media-libs/amrnb media-libs/amrwb )"
+	X? ( x11-libs/libX11 x11-libs/libXext )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
@@ -109,14 +108,11 @@
 	fi
 	if use bindist
 	then
-		use amr && ewarn "libamr is nonfree and cannot be distributed; disabling amr support."
 		use faac && ewarn "faac is nonfree and cannot be distributed; disabling
 		faac support."
 	else
-		use amr && myconf="${myconf} --enable-libamr-nb \
-									 --enable-libamr-wb"
 		use faac && myconf="${myconf} --enable-libfaac"
-		{ use faac || use amr ; } && myconf="${myconf} --enable-nonfree"
+		{ use faac ; } && myconf="${myconf} --enable-nonfree"
 	fi
 
 	# CPU features

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/07/22 16:33:18

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Set cross-prefix when cross compiling so that CHOST-prefixed tools are used
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.302                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.302&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.302&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.301&r2=1.302

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog	9 Jul 2009 13:43:14 -0000	1.301
+++ ChangeLog	22 Jul 2009 16:33:18 -0000	1.302
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.301 2009/07/09 13:43:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.302 2009/07/22 16:33:18 aballier Exp $
+
+  22 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Set cross-prefix when cross compiling so that CHOST-prefixed tools are
+  used
 
   09 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild,
   ffmpeg-9999-r1.ebuild:



1.13                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.12&r2=1.13

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ffmpeg-9999-r1.ebuild	9 Jul 2009 14:41:18 -0000	1.12
+++ ffmpeg-9999-r1.ebuild	22 Jul 2009 16:33:18 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.12 2009/07/09 14:41:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.13 2009/07/22 16:33:18 aballier Exp $
 
 EAPI=2
 
@@ -160,7 +160,7 @@
 			--disable-stripping"
 
 	# cross compile support
-	tc-is-cross-compiler && myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+	tc-is-cross-compiler && myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
 
 	# Misc stuff
 	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/07/25 10:44:12

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  set target os when crosscompiling for a different os, support for linux, freebsd and mingw32 so far
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.303                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.303&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.303&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.302&r2=1.303

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- ChangeLog	22 Jul 2009 16:33:18 -0000	1.302
+++ ChangeLog	25 Jul 2009 10:44:12 -0000	1.303
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.302 2009/07/22 16:33:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.303 2009/07/25 10:44:12 aballier Exp $
+
+  25 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  set target os when crosscompiling for a different os, support for linux,
+  freebsd and mingw32 so far
 
   22 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   Set cross-prefix when cross compiling so that CHOST-prefixed tools are



1.14                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.13&r2=1.14

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ffmpeg-9999-r1.ebuild	22 Jul 2009 16:33:18 -0000	1.13
+++ ffmpeg-9999-r1.ebuild	25 Jul 2009 10:44:12 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.13 2009/07/22 16:33:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.14 2009/07/25 10:44:12 aballier Exp $
 
 EAPI=2
 
@@ -160,7 +160,20 @@
 			--disable-stripping"
 
 	# cross compile support
-	tc-is-cross-compiler && myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+	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"

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/07/27 06:24:43

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Set svn revision
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.304                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.304&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.304&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.303&r2=1.304

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- ChangeLog	25 Jul 2009 10:44:12 -0000	1.303
+++ ChangeLog	27 Jul 2009 06:24:43 -0000	1.304
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.303 2009/07/25 10:44:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.304 2009/07/27 06:24:43 aballier Exp $
+
+  27 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Set svn revision
 
   25 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   set target os when crosscompiling for a different os, support for linux,



1.15                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.14&r2=1.15

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ffmpeg-9999-r1.ebuild	25 Jul 2009 10:44:12 -0000	1.14
+++ ffmpeg-9999-r1.ebuild	27 Jul 2009 06:24:43 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.14 2009/07/25 10:44:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.15 2009/07/27 06:24:43 aballier Exp $
 
 EAPI=2
 
@@ -61,6 +61,14 @@
 	v4l? ( sys-kernel/linux-headers )
 	v4l2? ( sys-kernel/linux-headers )"
 
+src_prepare() {
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		sed -i s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/ "${S}/version.sh"
+	fi
+}
+
 src_configure() {
 	local myconf="${EXTRA_FFMPEG_CONF}"
 

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/09/06 09:33:37

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Correctly detect cpu by upstream checks when march=native is used, bug #273421
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.306                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.306&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.306&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.305&r2=1.306

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- ChangeLog	4 Aug 2009 09:18:52 -0000	1.305
+++ ChangeLog	6 Sep 2009 09:33:37 -0000	1.306
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.305 2009/08/04 09:18:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.306 2009/09/06 09:33:37 aballier Exp $
+
+  06 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Correctly detect cpu by upstream checks when march=native is used, bug
+  #273421
 
   04 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-9999-r1.ebuild,
   metadata.xml:



1.17                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.16&r2=1.17

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ffmpeg-9999-r1.ebuild	4 Aug 2009 09:18:52 -0000	1.16
+++ ffmpeg-9999-r1.ebuild	6 Sep 2009 09:33:37 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.16 2009/08/04 09:18:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.17 2009/09/06 09:33:37 aballier Exp $
 
 EAPI=2
 
@@ -159,6 +159,7 @@
 	# 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
 		myconf="${myconf} --cpu=$i"
 		break
 	done

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/09/06 10:10:29

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Use ffmpeg.org svn repo and add PV conditionals so that we can make snapshots by simply copying -9999
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.307                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.307&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.307&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.306&r2=1.307

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- ChangeLog	6 Sep 2009 09:33:37 -0000	1.306
+++ ChangeLog	6 Sep 2009 10:10:29 -0000	1.307
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.306 2009/09/06 09:33:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.307 2009/09/06 10:10:29 aballier Exp $
+
+  06 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Use ffmpeg.org svn repo and add PV conditionals so that we can make
+  snapshots by simply copying -9999
 
   06 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   Correctly detect cpu by upstream checks when march=native is used, bug



1.18                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.17&r2=1.18

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ffmpeg-9999-r1.ebuild	6 Sep 2009 09:33:37 -0000	1.17
+++ ffmpeg-9999-r1.ebuild	6 Sep 2009 10:10:29 -0000	1.18
@@ -1,16 +1,26 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.17 2009/09/06 09:33:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.18 2009/09/06 10:10:29 aballier Exp $
 
 EAPI=2
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=subversion
+	ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
+fi
 
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
 
-inherit eutils flag-o-matic multilib toolchain-funcs subversion
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video.
-Includes libavcodec. live svn"
+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"
@@ -65,6 +75,8 @@
 		# Set SVN version manually
 		subversion_wc_info
 		sed -i s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/ "${S}/version.sh"
+	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		sed -i s/UNKNOWN/SVN-r${FFMPEG_REVISION}/ "${S}/version.sh"
 	fi
 }
 

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/09/23 21:34:38

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  bump x264 requirements
  (Portage version: 2.2_rc41/cvs/Linux x86_64)

Revision  Changes    Path
1.315                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.315&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.315&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.314&r2=1.315

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- ChangeLog	20 Sep 2009 21:56:27 -0000	1.314
+++ ChangeLog	23 Sep 2009 21:34:38 -0000	1.315
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.314 2009/09/20 21:56:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.315 2009/09/23 21:34:38 aballier Exp $
+
+  23 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  bump x264 requirements
 
   20 Sep 2009; Markus Meier <maekke@gentoo.org> ffmpeg-0.5_p19928.ebuild:
   add ~arm



1.20                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.19&r2=1.20

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ffmpeg-9999-r1.ebuild	7 Sep 2009 08:52:08 -0000	1.19
+++ ffmpeg-9999-r1.ebuild	23 Sep 2009 21:34:38 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.19 2009/09/07 08:52:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.20 2009/09/23 21:34:38 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -44,7 +44,7 @@
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		theora? ( media-libs/libtheora[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20081006 )
+		x264? ( >=media-libs/x264-0.0.20090923 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
 	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/10/22 15:04:21

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  bump deps on x264
  (Portage version: 2.2_rc46/cvs/Linux x86_64)

Revision  Changes    Path
1.321                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.321&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.321&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.320&r2=1.321

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- ChangeLog	22 Oct 2009 09:39:49 -0000	1.320
+++ ChangeLog	22 Oct 2009 15:04:20 -0000	1.321
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.320 2009/10/22 09:39:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.321 2009/10/22 15:04:20 aballier Exp $
+
+  22 Oct 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  bump deps on x264
 
   22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild:
   Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes'



1.22                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.21&r2=1.22

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ffmpeg-9999-r1.ebuild	28 Sep 2009 22:49:59 -0000	1.21
+++ ffmpeg-9999-r1.ebuild	22 Oct 2009 15:04:20 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.21 2009/09/28 22:49:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.22 2009/10/22 15:04:20 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -44,7 +44,7 @@
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		theora? ( media-libs/libtheora[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20090923 )
+		x264? ( >=media-libs/x264-0.0.20091021 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
 	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    09/11/06 12:46:27

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Force disabling doc with use=-doc
  (Portage version: 2.2_rc48/cvs/Linux x86_64)

Revision  Changes    Path
1.324                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.324&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.324&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.323&r2=1.324

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- ChangeLog	26 Oct 2009 23:36:36 -0000	1.323
+++ ChangeLog	6 Nov 2009 12:46:26 -0000	1.324
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.323 2009/10/26 23:36:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.324 2009/11/06 12:46:26 aballier Exp $
+
+  06 Nov 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Force disabling doc with use=-doc
 
 *ffmpeg-0.5_p20373 (26 Oct 2009)
 



1.23                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.22&r2=1.23

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ffmpeg-9999-r1.ebuild	22 Oct 2009 15:04:20 -0000	1.22
+++ ffmpeg-9999-r1.ebuild	6 Nov 2009 12:46:26 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.22 2009/10/22 15:04:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.23 2009/11/06 12:46:26 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -202,6 +202,7 @@
 
 	# Misc stuff
 	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+	use doc || myconf="${myconf} --disable-doc"
 
 	# Specific workarounds for too-few-registers arch...
 	if [[ $(tc-arch) == "x86" ]]; then

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Steve Dibb (beandog)]

beandog     09/11/24 19:16:50

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Update vdpau deps
  (Portage version: 2.2_rc42/cvs/Linux x86_64)

Revision  Changes    Path
1.328                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.328&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.328&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.327&r2=1.328

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- ChangeLog	24 Nov 2009 17:09:38 -0000	1.327
+++ ChangeLog	24 Nov 2009 19:16:50 -0000	1.328
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.327 2009/11/24 17:09:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.328 2009/11/24 19:16:50 beandog Exp $
+
+  24 Nov 2009; Steve Dibb <beandog@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Update vdpau deps
 
 *ffmpeg-0.5_p20601 (24 Nov 2009)
 



1.24                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.23&r2=1.24

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ffmpeg-9999-r1.ebuild	6 Nov 2009 12:46:26 -0000	1.23
+++ ffmpeg-9999-r1.ebuild	24 Nov 2009 19:16:50 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.23 2009/11/06 12:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.24 2009/11/24 19:16:50 beandog Exp $
 
 EAPI=2
 SCM=""
@@ -59,7 +59,7 @@
 	jack? ( media-sound/jack-audio-connection-kit )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	video_cards_nvidia? (
-		vdpau? ( >=x11-drivers/nvidia-drivers-180.29 )
+		vdpau? ( x11-libs/libvdpau )
 	)"
 
 DEPEND="${RDEPEND}

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/01/19 11:41:08

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Adjust x264 deps
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.337                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.337&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.337&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.336&r2=1.337

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- ChangeLog	9 Jan 2010 15:32:38 -0000	1.336
+++ ChangeLog	19 Jan 2010 11:41:08 -0000	1.337
@@ -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.336 2010/01/09 15:32:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.337 2010/01/19 11:41:08 aballier Exp $
+
+  19 Jan 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Adjust x264 deps
 
   09 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   ffmpeg-0.5_p20373.ebuild:



1.26                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.25&r2=1.26

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ffmpeg-9999-r1.ebuild	25 Nov 2009 06:06:20 -0000	1.25
+++ ffmpeg-9999-r1.ebuild	19 Jan 2010 11:41:08 -0000	1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-9999-r1.ebuild,v 1.25 2009/11/25 06:06:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.26 2010/01/19 11:41:08 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -44,7 +44,7 @@
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20091021 )
+		x264? ( >=media-libs/x264-0.0.20100118 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
 	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/03/10 11:24:36

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  simplify libgsm code as upstream now uses a more standard way for #including it
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.344                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.344&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.344&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.343&r2=1.344

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- ChangeLog	4 Feb 2010 19:54:28 -0000	1.343
+++ ChangeLog	10 Mar 2010 11:24:36 -0000	1.344
@@ -1,6 +1,10 @@
 # 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.343 2010/02/04 19:54:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.344 2010/03/10 11:24:36 aballier Exp $
+
+  10 Mar 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  simplify libgsm code as upstream now uses a more standard way for
+  #including it
 
   04 Feb 2010; Alexis Ballier <aballier@gentoo.org>
   ffmpeg-0.5_p21602.ebuild, ffmpeg-9999-r1.ebuild:



1.30                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.29&r2=1.30

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ffmpeg-9999-r1.ebuild	4 Feb 2010 19:54:28 -0000	1.29
+++ ffmpeg-9999-r1.ebuild	10 Mar 2010 11:24:36 -0000	1.30
@@ -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-9999-r1.ebuild,v 1.29 2010/02/04 19:54:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.30 2010/03/10 11:24:36 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -129,15 +129,10 @@
 	# Decoders
 	use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb
 		--enable-libopencore-amrnb"
-	for i in faad dirac schroedinger speex; do
+	for i in gsm faad dirac schroedinger speex; do
 		use $i && myconf="${myconf} --enable-lib$i"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-	if use gsm; then
-		myconf="${myconf} --enable-libgsm"
-		# Crappy detection or our installation is weird, pick one (FIXME)
-		append-flags -I/usr/include/gsm
-	fi
 
 	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/04/23 12:49:28

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  rename opencore-amr useflag to amr, we should get rid of the old non free one
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.347                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.347&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.347&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.346&r2=1.347

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- ChangeLog	12 Apr 2010 09:42:02 -0000	1.346
+++ ChangeLog	23 Apr 2010 12:49:27 -0000	1.347
@@ -1,6 +1,10 @@
 # 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.346 2010/04/12 09:42:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.347 2010/04/23 12:49:27 aballier Exp $
+
+  23 Apr 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  rename opencore-amr useflag to amr, we should get rid of the old non free
+  one
 
 *ffmpeg-0.5_p22846 (12 Apr 2010)
 



1.32                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.31&r2=1.32

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ffmpeg-9999-r1.ebuild	13 Mar 2010 14:33:52 -0000	1.31
+++ ffmpeg-9999-r1.ebuild	23 Apr 2010 12:49:27 -0000	1.32
@@ -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-9999-r1.ebuild,v 1.31 2010/03/13 14:33:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.32 2010/04/23 12:49:27 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -27,7 +27,7 @@
 KEYWORDS=""
 IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
 	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
-	  theora threads x264 xvid network zlib sdl X mp3 opencore-amr
+	  theora threads x264 xvid network zlib sdl X mp3 amr
 	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
 	  speex +ssse3 jpeg2k vdpau"
 
@@ -53,7 +53,7 @@
 	dirac? ( media-video/dirac )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	opencore-amr? ( media-libs/opencore-amr )
+	amr? ( media-libs/opencore-amr )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -129,7 +129,7 @@
 	use threads && myconf="${myconf} --enable-pthreads"
 
 	# Decoders
-	use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb
+	use amr && myconf="${myconf} --enable-libopencore-amrwb
 		--enable-libopencore-amrnb"
 	for i in gsm faad dirac schroedinger speex; do
 		use $i && myconf="${myconf} --enable-lib$i"

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/06/06 10:39:40

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  bump x264 requirements
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.352                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.352&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.352&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.351&r2=1.352

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- ChangeLog	11 May 2010 10:18:21 -0000	1.351
+++ ChangeLog	6 Jun 2010 10:39:40 -0000	1.352
@@ -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.351 2010/05/11 10:18:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.352 2010/06/06 10:39:40 aballier Exp $
+
+  06 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  bump x264 requirements
 
   11 May 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild,
   metadata.xml:



1.34                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.33&r2=1.34

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ffmpeg-9999-r1.ebuild	11 May 2010 10:18:21 -0000	1.33
+++ ffmpeg-9999-r1.ebuild	6 Jun 2010 10:39:40 -0000	1.34
@@ -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-9999-r1.ebuild,v 1.33 2010/05/11 10:18:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.34 2010/06/06 10:39:40 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -44,7 +44,7 @@
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20100118 )
+		x264? ( >=media-libs/x264-0.0.20100605 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
 	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Dror Levin (spatz)]

spatz       10/06/12 21:54:14

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Make KEYWORDS depend on PV to make it easier to bump.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.355                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.355&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.355&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.354&r2=1.355

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- ChangeLog	11 Jun 2010 11:34:50 -0000	1.354
+++ ChangeLog	12 Jun 2010 21:54:13 -0000	1.355
@@ -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.354 2010/06/11 11:34:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.355 2010/06/12 21:54:13 spatz Exp $
+
+  12 Jun 2010; Dror Levin <spatz@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Make KEYWORDS depend on PV to make it easier to bump.
 
   11 Jun 2010; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
   ffmpeg-9999-r1.ebuild:



1.37                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.36&r2=1.37

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ffmpeg-9999-r1.ebuild	11 Jun 2010 11:34:50 -0000	1.36
+++ ffmpeg-9999-r1.ebuild	12 Jun 2010 21:54:13 -0000	1.37
@@ -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-9999-r1.ebuild,v 1.36 2010/06/11 11:34:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.37 2010/06/12 21:54:13 spatz Exp $
 
 EAPI=2
 SCM=""
@@ -24,7 +24,11 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+if [[ ${PV} == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
 IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
 	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
 	  theora threads x264 xvid network zlib sdl X mp3 amr

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/06/18 06:47:21

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Sort IUSE and make zlib enabled by default, by Nikoli <nikoli@lavabit.com>, bug #324453
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.357                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.357&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.357&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.356&r2=1.357

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- ChangeLog	16 Jun 2010 10:10:54 -0000	1.356
+++ ChangeLog	18 Jun 2010 06:47:20 -0000	1.357
@@ -1,6 +1,10 @@
 # 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.356 2010/06/16 10:10:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.357 2010/06/18 06:47:20 aballier Exp $
+
+  18 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Sort IUSE and make zlib enabled by default, by Nikoli
+  <nikoli@lavabit.com>, bug #324453
 
 *ffmpeg-0.6 (16 Jun 2010)
 



1.40                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.39&r2=1.40

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ffmpeg-9999-r1.ebuild	18 Jun 2010 06:41:22 -0000	1.39
+++ ffmpeg-9999-r1.ebuild	18 Jun 2010 06:47:20 -0000	1.40
@@ -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-9999-r1.ebuild,v 1.39 2010/06/18 06:41:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.40 2010/06/18 06:47:20 aballier Exp $
 
 EAPI="2"
 
@@ -30,11 +30,10 @@
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
-	  theora threads x264 xvid network zlib sdl X mp3 amr
-	  oss pic rtmp schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vaapi vdpau vpx"
+IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags
+debug dirac doc +encode faac faad gsm +hardcoded-tables ieee1394 jack jpeg2k
++mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora
+threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/06/22 07:28:55

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  faad support has been removed
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.358                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.358&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.358&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.357&r2=1.358

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- ChangeLog	18 Jun 2010 06:47:20 -0000	1.357
+++ ChangeLog	22 Jun 2010 07:28:55 -0000	1.358
@@ -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.357 2010/06/18 06:47:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.358 2010/06/22 07:28:55 aballier Exp $
+
+  22 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  faad support has been removed
 
   18 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   Sort IUSE and make zlib enabled by default, by Nikoli



1.44                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.43&r2=1.44

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ffmpeg-9999-r1.ebuild	18 Jun 2010 14:19:16 -0000	1.43
+++ ffmpeg-9999-r1.ebuild	22 Jun 2010 07:28:55 -0000	1.44
@@ -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-9999-r1.ebuild,v 1.43 2010/06/18 14:19:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.44 2010/06/22 07:28:55 aballier Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags
-debug dirac doc +encode faac faad gsm +hardcoded-tables ieee1394 jack jpeg2k
+debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k
 +mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora
 threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
@@ -50,7 +50,6 @@
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20100605 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )
 	ieee1394? ( media-libs/libdc1394
 				sys-libs/libraw1394 )
@@ -144,7 +143,7 @@
 
 	# Decoders
 	use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	for i in gsm faad dirac rtmp schroedinger speex vpx; do
+	for i in gsm dirac rtmp schroedinger speex vpx; do
 		use ${i} && myconf="${myconf} --enable-lib${i}"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/07/22 20:31:30

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  sort rdepend, use same detection of live ebuild everywhere, cosmetics, by    Nikoli <nikoli@lavabit.com> in bug #324453
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.362                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.362&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.362&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.361&r2=1.362

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- ChangeLog	11 Jul 2010 15:15:15 -0000	1.361
+++ ChangeLog	22 Jul 2010 20:31:30 -0000	1.362
@@ -1,6 +1,10 @@
 # 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.361 2010/07/11 15:15:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.362 2010/07/22 20:31:30 aballier Exp $
+
+  22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  sort rdepend, use same detection of live ebuild everywhere, cosmetics, by
+  Nikoli <nikoli@lavabit.com> in bug #324453
 
   11 Jul 2010; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.6.ebuild:
   Marked ~hppa (bug #324941).



1.45                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.44&r2=1.45

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ffmpeg-9999-r1.ebuild	22 Jun 2010 07:28:55 -0000	1.44
+++ ffmpeg-9999-r1.ebuild	22 Jul 2010 20:31:30 -0000	1.45
@@ -1,12 +1,12 @@
 # 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-9999-r1.ebuild,v 1.44 2010/06/22 07:28:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.45 2010/07/22 20:31:30 aballier Exp $
 
 EAPI="2"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=subversion
+	SCM="subversion"
 	ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
 fi
 
@@ -25,7 +25,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} == *9999* ]]; then
+if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -41,32 +41,33 @@
 	IUSE="${IUSE} video_cards_${x}"
 done
 
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
+RDEPEND="
 	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	dirac? ( media-video/dirac )
 	encode? (
 		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
-		vorbis? ( media-libs/libvorbis 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.20100605 )
-		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	zlib? ( sys-libs/zlib )
-	ieee1394? ( media-libs/libdc1394
-				sys-libs/libraw1394 )
-	dirac? ( media-video/dirac )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	faad? ( >=media-libs/faad2-2.6.1 )
 	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 )
-	amr? ( media-libs/opencore-amr )
 	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 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( x11-libs/libX11 x11-libs/libXext )
 	vaapi? ( x11-libs/libva )
+	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
 	vpx? ( media-libs/libvpx )
-	video_cards_nvidia? (
-		vdpau? ( x11-libs/libvdpau )
-	)"
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	zlib? ( sys-libs/zlib )
+"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
@@ -81,7 +82,7 @@
 "
 
 src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
+	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

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild

[Alexis Ballier (aballier)]

aballier    10/07/22 20:44:05

  Modified:             ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  Add bzip2 and static-libs useflag, by Nikoli <nikoli@lavabit.com> in bug #324453 and fix my previous mistake by reintroducing the faad dep.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.363                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.363&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.363&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.362&r2=1.363

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- ChangeLog	22 Jul 2010 20:31:30 -0000	1.362
+++ ChangeLog	22 Jul 2010 20:44:05 -0000	1.363
@@ -1,6 +1,10 @@
 # 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.362 2010/07/22 20:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.363 2010/07/22 20:44:05 aballier Exp $
+
+  22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Add bzip2 and static-libs useflag, by Nikoli <nikoli@lavabit.com> in bug
+  #324453 and fix my previous mistake by reintroducing the faad dep.
 
   22 Jul 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   sort rdepend, use same detection of live ebuild everywhere, cosmetics, by



1.46                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.45&r2=1.46

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ffmpeg-9999-r1.ebuild	22 Jul 2010 20:31:30 -0000	1.45
+++ ffmpeg-9999-r1.ebuild	22 Jul 2010 20:44:05 -0000	1.46
@@ -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-9999-r1.ebuild,v 1.45 2010/07/22 20:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.46 2010/07/22 20:44:05 aballier Exp $
 
 EAPI="2"
 
@@ -30,9 +30,9 @@
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags
 debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k
-+mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora
++mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 static-libs test theora
 threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
@@ -44,6 +44,7 @@
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
 	dirac? ( media-video/dirac )
 	encode? (
 		faac? ( media-libs/faac )
@@ -53,7 +54,6 @@
 		x264? ( >=media-libs/x264-0.0.20100605 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	faad? ( >=media-libs/faad2-2.6.1 )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -98,7 +98,9 @@
 	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"