search for libraries in libswresample too for tests

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 134f70d218e9..0d3c0f40c802 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.514 2011/12/17 13:42:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.515 2011/12/17 14:08:12 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
+  ffmpeg-9999.ebuild:
+  search for libraries in libswresample too for tests
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
   ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 97a958b8dc7e..012691b848c0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,14 +9,14 @@ DIST ffmpeg-0.9.tar.bz2 4954965 RMD160 56e1e240363d4f1bc09390f5a3893a1b6b362908
 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f
 EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318
 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4
-EBUILD ffmpeg-0.9.ebuild 8191 RMD160 8004c7cbb9fcc53742eb3077178603c3e37e67ff SHA1 2d3f1879fd3f49dee947a8200751f8b273958720 SHA256 1a64a0653a74fda2533d361eece0e9531e752f7961c5b6fe21d902923f3ebe7a
-EBUILD ffmpeg-9999.ebuild 8292 RMD160 f5b1f87b3ae5fec708cc37dea778b28bd3b36872 SHA1 cb7116d596a1ed96a821b4d33590f170a41e2ed9 SHA256 63dc82c59d36849f074bb04b0a5ff3beb0c6d2745883a1709486f600106f72f5
-MISC ChangeLog 73771 RMD160 bdb4502790b311af39882c2ca3e92e29c274a4f0 SHA1 de97723a51923bfd65bebb51323341b637dc994f SHA256 6e93377cd1e1b0af244977671ac6c7fb8e4b8f0c9f2731ef78e43ddd4e51f4c5
+EBUILD ffmpeg-0.9.ebuild 8210 RMD160 f0937227d1e307474d859b0a37721875ea273cc9 SHA1 846ae7fd0cabc16a7ac3fcd1496d60734904c142 SHA256 62b4447f6523b7f7c124a782adfe1cbe41b44a94723ee249d9f7e761f66c0959
+EBUILD ffmpeg-9999.ebuild 8311 RMD160 12072c1d7303a90b23229e3e5bafa428c6e93b86 SHA1 093031a529e9f70943ea21435de6cfcc37bd84d7 SHA256 23fe00ad8d2d53a12251c345f82d349628d3519c3121eb815399df1f1e8a354e
+MISC ChangeLog 73919 RMD160 c64d44074374e18cd81c9925b416901c27460b00 SHA1 7154c321686b4045069b5655264d76a83b772533 SHA256 db461104cac638e409ec860c6496abd74b76e621483dfe01859586a27da4ca1e
 MISC metadata.xml 3263 RMD160 ed08dcb856aa893e6894af80e42a96c1d34c9480 SHA1 ac8765c4e770098d8b8fddcd1d5f5b16a780ed52 SHA256 d76cb7c21391eb41646c312c30a2ee34242ac6d00cb1d3656f2e44aa3f0f3013
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7snF0ACgkQvFcC4BYPU0qh9ACgw+HNAeDQFhCpKSVeFAEr+s/Z
-UycAoIdvN6hvCbum8OWi8dTx54HirFmM
-=CkgS
+iEYEARECAAYFAk7solIACgkQvFcC4BYPU0oCwgCbBcPXAIPq0YhGsaIdZ4KFl1C5
+orgAnijrkgubfGiix05MUqg25M1UUGxm
+=OusK
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.9.ebuild b/media-video/ffmpeg/ffmpeg-0.9.ebuild
index 767f83b56cf3..f369400ac6fd 100644
--- a/media-video/ffmpeg/ffmpeg-0.9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.3 2011/12/17 13:42:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.4 2011/12/17 14:08:12 aballier Exp $
 
 EAPI="4"
 
@@ -265,6 +265,6 @@ src_install() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
 		emake fate
 }
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 503c6137652b..ac282f13ce36 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.76 2011/12/17 13:42:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.77 2011/12/17 14:08:12 aballier Exp $
 
 EAPI="4"
 
@@ -267,6 +267,6 @@ src_install() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
 		emake fate
 }