fix wrong libdir paths in .pc files

Package-Manager: portage-2.1_pre6-r1

4 files changed, 57 insertions, 18 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index dc54474974a4..01b4fa681306 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.132 2006/03/21 15:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.133 2006/03/31 13:59:28 blubb Exp $
+
+  31 Mar 2006; Simon Stelling <blubb@gentoo.org> +files/ffmpeg-libdir.patch,
+  ffmpeg-0.4.9_p20060302.ebuild:
+  fix wrong libdir paths in .pc files
 
   21 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index da1a555a19f8..b0615c1f9ebf 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c0b7a14359520f253a1d9a2c7514edd8 ChangeLog 19907
-RMD160 0b5f134e358093e7c1b7aab124737b3948c00477 ChangeLog 19907
-SHA256 04d8550fa8c995cc853884db835b55b62fe52c368730b272af02b398bc467a90 ChangeLog 19907
+MD5 79d2b16ee96cb1720ea6a1c279ff41a6 ChangeLog 20052
+RMD160 dd3ab699895e9b0a335e5b1fe066e79a6b96dd4b ChangeLog 20052
+SHA256 5e20013ae05427acde87e05a3378c16b10310f4e2a6d044b3e8e07d9f49b7b39 ChangeLog 20052
 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
@@ -19,9 +16,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 f0bef671b4a1aa7e464bb16fd7be7b7f ffmpeg-0.4.9_p20060302.ebuild 7252
-RMD160 8ab0b303e6fbae97f43ad2dcae804dce127f9773 ffmpeg-0.4.9_p20060302.ebuild 7252
-SHA256 f615e1cfd6f8db5eb6add207531d91015362d3dfdad08c0bfcb477ea6dfb5a8e ffmpeg-0.4.9_p20060302.ebuild 7252
+MD5 cbdbcf022f0064b22fc668fb31ae7bc2 ffmpeg-0.4.9_p20060302.ebuild 7382
+RMD160 dbfb06e9a703c0f130482ea09a3741ae90259ed6 ffmpeg-0.4.9_p20060302.ebuild 7382
+SHA256 64a162d52680598155d3bbed4bf0df63a70d300cf362b163ae15a479a8a30517 ffmpeg-0.4.9_p20060302.ebuild 7382
 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
@@ -61,6 +58,9 @@ SHA256 577aab4740f0d3569f41666915190c64de8cbde1faf27260ddba67f99bce0d2d files/ff
 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
 RMD160 f66a87d1ea3662c7ab0b9010e0f19af49638161a files/ffmpeg-libdir-pic.patch 6027
 SHA256 30b404aaf936f3ed6fe0a1f94d7f03982fef3524c94e4ca2b98d97133347ecc8 files/ffmpeg-libdir-pic.patch 6027
+MD5 2084a12d9b8ab0307cd010a3bd3185df files/ffmpeg-libdir.patch 922
+RMD160 4317ede46b7807b89220f971bf25b226b1189a6a files/ffmpeg-libdir.patch 922
+SHA256 f660ea6abb0402cb21070d4adf42589c952e41e96654257be40683d4744b4365 files/ffmpeg-libdir.patch 922
 MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
 RMD160 c92d8269c9d60661c57185c2aa6a8544d3d56e40 files/ffmpeg-missing_links.patch 1199
 SHA256 99aefb6d85efae932c639e530fbfd5f634df780ef57f9a5bfdd734dc758762b8 files/ffmpeg-missing_links.patch 1199
@@ -85,10 +85,3 @@ 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)
-
-iD8DBQFEIBbyAiZjviIA2XgRAhcSAKCkE6FlWar1O1ORp3oiX6inyysnNQCg5Mns
-+/ZmoZF7mIKGL+pFDO5QYlM=
-=N21v
------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 9821a0ad9387..fe7bb442ed62 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.9 2006/03/21 15:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.10 2006/03/31 13:59:28 blubb Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -73,6 +73,10 @@ src_unpack() {
 
 	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
 	epatch "${FILESDIR}/${PN}-0.4.9_p20051216-asneeded-configure.patch"
+	
+	# .pc files contain wrong libdir path
+	epatch ${FILESDIR}/${PN}-libdir.patch
+	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
 
 	# ffmpeg doesn'g use libtool, so the condition for PIC code
 	# is __PIC__, not PIC.
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir.patch b/media-video/ffmpeg/files/ffmpeg-libdir.patch
new file mode 100644
index 000000000000..20455eb8d3fc
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-libdir.patch
@@ -0,0 +1,38 @@
+--- configure.old	2006-03-31 15:38:10.000000000 +0200
++++ configure	2006-03-31 15:41:35.000000000 +0200
+@@ -1810,7 +1810,7 @@
+ cat <<EOF >libavutil.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/GENTOOLIBDIR
+ includedir=\${prefix}/include
+ 
+ Name: libavutil
+@@ -1841,7 +1841,7 @@
+ cat <<EOF >libavcodec.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/GENTOOLIBDIR
+ includedir=\${prefix}/include
+ 
+ Name: libavcodec
+@@ -1872,7 +1872,7 @@
+ cat <<EOF >libavformat.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/GENTOOLIBDIR
+ includedir=\${prefix}/include
+ 
+ Name: libavformat
+@@ -1904,7 +1904,7 @@
+ cat <<EOF >libpostproc.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/GENTOOLIBDIR
+ includedir=\${prefix}/include
+ 
+ Name: libpostproc