While I'm at it, backport another patch to fix linking with ffmpeg trunk.

Package-Manager: portage-2.1.5.2

4 files changed, 39 insertions, 7 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index dbbe2b51c77e..56353e62b4a8 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.339 2008/05/31 08:42:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.340 2008/05/31 09:48:56 aballier Exp $
+
+  31 May 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch,
+  vlc-0.9.0_alpha20080524.ebuild:
+  While I'm at it, backport another patch to fix linking with ffmpeg trunk.
 
   31 May 2008; Alexis Ballier <aballier@gentoo.org>
   +files/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index bea9112b64d7..17b363ac9cf9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX 0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch 1014 RMD160 a7188dd01901e5bab87a80e45ff3a574837fceb3 SHA1 12b76264b0e9ccd75ac4c5a42768d79bdd3a508c SHA256 c0a783a36a8da72be65c3da249663046df4cee8d75b53a355ac0b0e411680a5d
+AUX 0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch 872 RMD160 4d10d035d37266d5d81dd97353fe078859131932 SHA1 08f9f9bc176c84ee565a0d8570752a8c5fbc4876 SHA256 1cdb557f88580e8614ea7fe78e94f6778c2b1f4df68db0f68b078bda9b650c63
 DIST vlc-0.8.6g.tar.bz2 11680440 RMD160 f4a7e7650a1d1d7be7c581a54a5771dece0bcb6b SHA1 6dab0e1593607d3a1ee585ba009b99627477f467 SHA256 3054e7278ac2dcb061f2268fcff8c2bc37b22be537cc01c19882e9a96eaeb18e
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-53.tar.bz2 9737 RMD160 dfbc11984c21c2bfe31bd77c813415fa04b10204 SHA1 1726c2bd17539c076fc4baa2d9611a4b39abab39 SHA256 dd2558049044701a60bdf2c30a6a716e009a6c4c180a54ea848a1de105e00ca5
 DIST vlc-patches-54.tar.bz2 6407 RMD160 6e3d667c178e38502ca87fb746c322b45fead777 SHA1 d5f684488e52848fc5ec426830d999f36164d782 SHA256 9cb7707090773712a99bc14734e0fb3b0ffe8d950b068505890133936e89299d
 DIST vlc-snapshot-20080524.tar.bz2 14995898 RMD160 2efab8de6b75f05deee9bfcc864bace2f513ef1d SHA1 7de7e8056971057871c458083b944b3226fd1148 SHA256 0219bf8e5e5f7bf2acf4c95c0a7f8af81858eece6ad14673fe7836245d67b86f
 EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
-EBUILD vlc-0.9.0_alpha20080524.ebuild 10317 RMD160 8e5f9888800a26d644d9075cfa2317597f129b20 SHA1 959fb5194479eda5be3f432ce45190dce3b9321e SHA256 c8554acd14186a5c4786afcc9345d4772727cf6fac680824a7e2ee296d72cf53
-MISC ChangeLog 56742 RMD160 3bbac1ae94125a1a2a1c3834fed4e3936b70d9c4 SHA1 23d72499b1a8cf079222863e89afc5fbdfd0c56b SHA256 1ce47adcbc4447474afcc4be45cb14ea76a6f111d007c49fdfc079dc7ea7b86a
+EBUILD vlc-0.9.0_alpha20080524.ebuild 10403 RMD160 3b0a5623ea9eab1ffa09cded8635709b5fadd0d6 SHA1 cd48afdffe74a85c0d8192ba23c687a3d7c71de1 SHA256 70360ce22d82ff852a8ee034c751dfcf40d7b83515397fad3f7b7470366684c1
+MISC ChangeLog 56979 RMD160 d00b6753933db915e63fd1e2b5ff1c7d89061565 SHA1 d541b2c16a1dab9b74667f831e816df797bf3363 SHA256 ba620279e450416ce8f224c031b9ecefae62796f6d0c70e43a2375689abb2ce1
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhBD44ACgkQvFcC4BYPU0pAmQCguKk3MJe+p36vPDeEzeJWnqyX
-qSkAn1nhhDsRjqNdf0vCUQE8WP9zRxcz
-=FNuU
+iEYEARECAAYFAkhBHzAACgkQvFcC4BYPU0pQIgCfRS7SLCek67VRRslOJjaKfeR2
+QpgAmweTKosR58MOpIA/ohKQpD1IpAVs
+=6fh6
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch b/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch
new file mode 100644
index 000000000000..c30d5732f8c1
--- /dev/null
+++ b/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch
@@ -0,0 +1,25 @@
+From b41bc1645bcb2f3942e57ff19e4791a1f892de7a Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Sat, 31 May 2008 11:17:56 +0200
+Subject: [PATCH] Explicitly check for and link to libavutil since av_free and friends are used in the ffmpeg plugin and after r13528 ffmpeg's .pc files do not tell anymore to link needlessly to its private library requirements.
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2aa5359..e03cac8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3000,7 +3000,7 @@ if test "${enable_ffmpeg}" != "no"
+ then
+ 
+ dnl Trying with pkg-config
+-   PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
++   PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libavutil],
+     [
+      VLC_SAVE_FLAGS
+      CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
+-- 
+1.5.5.3
+
diff --git a/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild
index f1fafd0ef10a..83a0fb809251 100644
--- a/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild,v 1.3 2008/05/31 08:42:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild,v 1.4 2008/05/31 09:48:56 aballier Exp $
 
 EAPI="1"
 
@@ -177,6 +177,7 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	epatch "${FILESDIR}/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch"
+	epatch "${FILESDIR}/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch"
 	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
 }