summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild10
3 files changed, 18 insertions, 7 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1b73862cb669..a0561e9f147e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -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,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f809bcead420..5ed9957a2833 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,13 +5,13 @@ DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dce
DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
EBUILD ffmpeg-0.4.9_p20090201.ebuild 6278 RMD160 8c239d62af63bc5f04d3535d4773027335c10c4c SHA1 07abf1371986258b9557d3a4f3739ba57f0490b7 SHA256 58ee0192b3395c13ae25ffe8c5396ad4314c4dfc2199cc53fb083513992e1a99
EBUILD ffmpeg-0.5-r1.ebuild 6549 RMD160 7d3dc6f710b1944022c6a607737ea8be4e0b7385 SHA1 23b88211d4e61f9b49c7b8a3a1f85ed1616cf1b8 SHA256 83d0453256174cd98f8d7fbc0c8fca48f1b0ddd681e5345a796af1c0350668d9
-EBUILD ffmpeg-9999-r1.ebuild 6841 RMD160 858963f401e9586ab64b0897b6f3ef197cdceb1e SHA1 95d3bac16293f3b179d30f5303a457ef25b075f1 SHA256 47371bcf00a8e99dbfdfa9b1cfe32bfbf44db01a4ffdf9b6209a2b1c31d7b982
-MISC ChangeLog 46180 RMD160 fd7bc46ad3feb7ea14d35fe03e113aed43494b6a SHA1 984159c89d690021c5cb542fcbbe1102bce96ca7 SHA256 dacfc25c38fb18635e577c441710ba4b5a1367112bd35a42b918b68a828329c4
+EBUILD ffmpeg-9999-r1.ebuild 7008 RMD160 ba868258c4c048eca172d561520faf7fe28768a7 SHA1 b354755713b25c1793ad3982199f6f16bcb94881 SHA256 1be59a99fe1d1c6dbe271fc35670d448f2da5c51cbd2eb323e5056b85419f537
+MISC ChangeLog 46275 RMD160 1b966522102cd384437066f6ed04c2e55b037976 SHA1 e3e82e6d4b1b4b83a0e1146058a70185e4d9a0da SHA256 55f25917f3e3c91c12df6869590974574fcb4cb30ad2477418e098bdf0a0326d
MISC metadata.xml 1917 RMD160 7e8a17dac9e2f84b7d6f1847a143cbaabd356f03 SHA1 558ae5ec3ef20f719746528d14c3d5c69e0c2260 SHA256 12f3ca404045c542c113ba34169c104f45a75d68800382b8c677a498ddd45e9f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkpq4lkACgkQvFcC4BYPU0qJoQCgo4LLgWcD5FJ0UAFVWirYoPJr
-ehUAoJunAI+d1/1nXLA/oVGzEbAkaQ0S
-=8iN4
+iEYEARECAAYFAkptSKkACgkQvFcC4BYPU0riQACgylinEtZ1eXC12n1I9csazppN
+O+EAn28OUy2sOr2ScpLa3u9UqcrBqcu5
+=deYu
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 810c5e5e269e..10bd1c30f20f 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -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 @@ DEPEND="${RDEPEND}
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}"