Add patch to respect CFLAGS on FreeBSD, and don't use preplib that's no more needed anyway.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 41 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 01b4fa681306..34bf4b090b17 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.133 2006/03/31 13:59:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.134 2006/04/14 21:45:44 flameeyes Exp $
+
+  14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch,
+  ffmpeg-0.4.9_p20060302.ebuild:
+  Add patch to respect CFLAGS on FreeBSD, and don't use preplib that's no more
+  needed anyway.
 
   31 Mar 2006; Simon Stelling <blubb@gentoo.org> +files/ffmpeg-libdir.patch,
   ffmpeg-0.4.9_p20060302.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5d22e7309b67..c9409f6d9bae 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,9 @@
-MD5 79d2b16ee96cb1720ea6a1c279ff41a6 ChangeLog 20052
-RMD160 dd3ab699895e9b0a335e5b1fe066e79a6b96dd4b ChangeLog 20052
-SHA256 5e20013ae05427acde87e05a3378c16b10310f4e2a6d044b3e8e07d9f49b7b39 ChangeLog 20052
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 601a544555e23ab71134de356cae70b2 ChangeLog 20289
+RMD160 c68e60c78cf4fdb11a0e1faee0a81e373fb9e7bd ChangeLog 20289
+SHA256 f16947bc76a0872d7d061d74dfbcd9d96e9d551c8b300ebb1dad432943efce4d ChangeLog 20289
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
@@ -16,9 +19,9 @@ SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2 ffmpeg-0
 MD5 77bf2e5e661831311253e8558432768f ffmpeg-0.4.9_p20051216.ebuild 5792
 RMD160 a9c7ea9d50e9d86a76bc8024e808884db7ebf71f ffmpeg-0.4.9_p20051216.ebuild 5792
 SHA256 ac025d3a396f68a30490eb333c1c061bf4a6a315bb66e67011f5c1b71e809da6 ffmpeg-0.4.9_p20051216.ebuild 5792
-MD5 074e9e9959e36fcf987fbe45496bd716 ffmpeg-0.4.9_p20060302.ebuild 7385
-RMD160 b290a7bbecc33aaad8681c977d98cb062917ae0c ffmpeg-0.4.9_p20060302.ebuild 7385
-SHA256 07e7bdea7940ff675de8a27e3a362927b9701d36700df3aee1f6a1252886e834 ffmpeg-0.4.9_p20060302.ebuild 7385
+MD5 3d1adf3c0eeb7a8ce2337c3b6899b296 ffmpeg-0.4.9_p20060302.ebuild 7414
+RMD160 6472926540bc97b20c3809bede8b04531374114e ffmpeg-0.4.9_p20060302.ebuild 7414
+SHA256 c22668a31468b4188c8b316f163a63a7fb7c16e6f10574cd1874f2d61bb0c192 ffmpeg-0.4.9_p20060302.ebuild 7414
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -49,6 +52,9 @@ SHA256 e687fd7008c401c54e31552b15b56a5590b85d7ac8b2c39b906acca82a09b5c8 files/ff
 MD5 033883c60f131664912970ffb6042612 files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
 RMD160 b59933fab102460b62b092799c27a7811748f76a files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
 SHA256 b7c7fbbe39e8ceabccabc1935cb4fa91b7287bc72eca323b21b25f0e9e08f13f files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
+MD5 270ce6c29f270b7fc4e6129f45c35720 files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
+RMD160 ae6a9b23e3a5cc018563a9f023273be821bab44a files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
+SHA256 0af48d342f5001d856ba850b7c8ecc8e46ff809b765b28adbb1c0674b4c2c414 files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
 MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
 RMD160 193d2d855f2c613531f1b880a194c5be55ccab5c files/ffmpeg-a52.patch 1111
 SHA256 350bdb742f2cf65ca1fcde2b3252887962c951071fa41e6550f207e4534b4071 files/ffmpeg-a52.patch 1111
@@ -85,3 +91,10 @@ SHA256 65a9dcc2191708ec64a82616dad202d80465b30a696386ec30bd1b459d4a3d83 files/ge
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEQBgcAiZjviIA2XgRAv5xAJ9FS+75aC3hwLs4lZxkIWKdm3anXQCdEOvH
+LgtdBsYa7iDgC1cUfKJWy+0=
+=UV8K
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
index c9e136cb72be..74e0827cdb16 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.11 2006/04/02 16:16:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.12 2006/04/14 21:45:46 flameeyes Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -73,6 +73,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
 	epatch "${FILESDIR}/${PN}-0.4.9_p20051216-asneeded-configure.patch"
+	epatch "${FILESDIR}/${P}-fbsd-flags.patch"
 
 	# .pc files contain wrong libdir path
 	epatch ${FILESDIR}/${PN}-libdir.patch
@@ -213,8 +214,6 @@ src_install() {
 
 	# Some stuff like transcode can use this one.
 	dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
 }
 
 # Never die for now...
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch
new file mode 100644
index 000000000000..260449bb4b22
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch
@@ -0,0 +1,13 @@
+Index: ffmpeg-0.4.9-p20060302/configure
+===================================================================
+--- ffmpeg-0.4.9-p20060302.orig/configure
++++ ffmpeg-0.4.9-p20060302/configure
+@@ -336,7 +336,7 @@ bktr="yes"
+ audio_oss="yes"
+ dv1394="no"
+ make="gmake"
+-CFLAGS="-pthread"
++CFLAGS="$CFLAGS -pthread"
+ LDFLAGS="$LDFLAGS -export-dynamic -pthread"
+ ;;
+ BSD/OS)