Support newer libcdio-paranoia

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

4 files changed, 58 insertions, 8 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 870b865041c3..1b28070b8096 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.133 2013/01/17 10:38:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.134 2013/01/17 10:55:55 lu_zero Exp $
+
+  17 Jan 2013; Luca Barbato <lu_zero@gentoo.org> libav-0.8.5.ebuild,
+  +files/libav-0.8.5-support-libcdio-paranoia.patch:
+  Support newer libcdio-paranoia
 
   17 Jan 2013; Luca Barbato <lu_zero@gentoo.org>
   +files/0001-libcdio-support-recent-cdio-paranoia.patch, libav-9.1.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 1ddee9c54e8b..3931e7e0e6b3 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -3,23 +3,24 @@ Hash: SHA256
 
 AUX 0001-libcdio-support-recent-cdio-paranoia.patch 1849 SHA256 865910718d00e2999b306451ceb91dc715c56e952cd4e45fe1311bb2bbd9c074 SHA512 cde030c952eccd9144e1b0eab0987aaf328ee217d0e8bb753ba85fba72eb4bf04d56ae2124c7b914dbc344d293d1d91f5034d009d112bd5ecc603b5f74ff004d WHIRLPOOL 8bee96c1a3898844d534429f74b9246c028fafb06a9e012f3f9875065dbb16cfb8fc21b0954cf7f49bd71eddaa5abf1937d7aaa3d73ce30ee8dca5fb91908c9a
 AUX 0001-svq3-replace-unsafe-pointer-casting-with-intreadwrit.patch 3882 SHA256 252077962952fe0d517c8e03d3dc5ef926257d8f8ce0a01665dac6a36b70c665 SHA512 5441be01fe9adb95749a79dec7539d8f1b8a6f986bdd24c7334053cd3fae8c22f9e9b6d6e7f6728e6e813ab6732172fe1d04705b7f735a70e4d8f3bfe1bbcdc6 WHIRLPOOL 1befc0aa7972b9c45f60dcf32915998119f1c070c49ee6cfda59d2aca1571780ed9bb69936e4e4a87a4fa2a49debeb1744a1a6e9144b36975304ec46d35944c4
+AUX libav-0.8.5-support-libcdio-paranoia.patch 1477 SHA256 2e3490bba021c512828f12dfc5e6be39a5f3c53e16b2ceb99e6f6c4e71139803 SHA512 2a9847a435a32fac0b9bd904b932d20f26a6c7b0d086cda42c45f9099d87dbd4e637c7a52e5c29ad0df69a95ffed91bad2673d773c3045f03baf736796ab8332 WHIRLPOOL 77152717b72d245e4bfd5ac0cc1ed4ac3a512086be248515bc7d0c73d4840cfae7ba3bb7a668ee354803b6fba6ad90b992f80f2c335b5173741498a968b3eca2
 DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-0.8.4.tar.xz 3797112 SHA256 a4a53410ed864848063628277eb94f1921a7edfef7cf2e8bc9ab69f4f659c754 SHA512 67f0a78c2cfa88c98a5d9b3a528a6190eb3b2e0c1885010fced6d46bcf1337bddc7473e2b078ebe656c32897603fd908cbb938e663cb1f2a4fa8d7b1db129bb8 WHIRLPOOL e4252c391454f8e70fed7aa5ba10a4ff8d92297d2966c9921f6360760e9749ded4f5f7fe71a9acbec47b557d1290314ca4aba7b62a75ac33a816132ba8043724
 DIST libav-0.8.5.tar.xz 3761376 SHA256 d82cfbbca9825d8cf6cff4d830a57d094d359d23da7179a2d2811300cdcac57f SHA512 88e28b27f4a1f5dd856210b32527bc6c631e3c8470eedcdf303368cb2ff848407d6eb4359279eb8bf6d21375c0e5ac6860db8e1e96c4030990a643f9a365061c WHIRLPOOL a4ba175d9b40c5c1969be74fdae31c1bc67abf308e38c2baf429aecd16f5f7cd34df33e4f18661b5214d4c768011b2b742dc646ef5ceed51278b4ee04736546e
 DIST libav-9.1.tar.xz 4062784 SHA256 549969acacd8b341644ef027a058c2499b2ef2f088f7bf23a49f21d747458741 SHA512 35672cbb338847a929674f3d3ff7a265f0b4ad2701ac42bb1c8d4792b930bd5471b494d535e498347c4cf135cfc20a7c252f68ca776a9127cdb884b78593c743 WHIRLPOOL cf64de1c600f723ff7b220936f3d5f087d30fb03267a2f865e26a3910061e251affdc1b8cad913ce4c02b82895d8333d9e6604a16be22c20354f736ce280a630
 EBUILD libav-0.8.4.ebuild 9093 SHA256 392473a04603b5f3f71a016fd142a92b4c773c83a70ba27462967d0e8abc962b SHA512 49f54eb912d315c761b3ddfe86528a9db89bfbe1e8b9e5088bf6b06f562ccb38e3ea3cecd122e1f867f690c2f551dbb48c14bbb2b70e123b543c5f5e3853bf12 WHIRLPOOL 17f3fa472cf1469de5c1b562b6d01184dbba68d07517884f3de8d94f69ec627260d0ea1f48356edc378c6d5b34a5c2c18a361c6560fa60b29db2b1ecd8f45891
-EBUILD libav-0.8.5.ebuild 9038 SHA256 b02473be13d22854a0667fe456b03f506599aa4bcf8ee0a1a975b1a025f54be0 SHA512 c95220935f4675cc871c54228d9115bb20bd9926654d7cc4911c719ebbae59bf38209d905ddcdb74952bdfcac6041a35af5e4535d7023750050a117e80959005 WHIRLPOOL ba5fc2124c293e4f40cbd8d0612ff7d1f07e6d3e292aaf1fc8f1f44b1a3e33e015754142e2743e1271e8cea8cadda13ef3a4d1f0a19a134d314739ec295422aa
+EBUILD libav-0.8.5.ebuild 9151 SHA256 769ae9eae033a8bf515653d72aba03a07389eac83ff202fa952745a723aff7e1 SHA512 ca1d83c46abf9f5a1b6b7e315c66564e59293d3ba873f0feaa47b0d57761819eb91493d62e6162488a84d7bdd29f06d565bd64c051ab202dbb63faeb061947ae WHIRLPOOL de5c991aa4a79578b85dcb8f217506ec3380b8232791f167b38f5db343eb233c73b641a4d78189a4ce7c92ffa7d4733319c2ef555d262a28517c36d92d70aadb
 EBUILD libav-0.8.9999.ebuild 9050 SHA256 25f2c5478177b560910ac33e35853ee61b45dd9afdf07e47cdd767ae9dfcffdb SHA512 c8f3d250d2ab1ad38508b040f1fb95261080ce6e8d43831eb5497fdac4b4d725228b26e715564bf93d844df72f8950ee2446d84373f96244615d64cba4e95389 WHIRLPOOL f404574155ea601d119cf04fae0a756a7ae3766580504027954cb71925436f033576d1a18dd66acadce880936aed46207149dcb22dd17e41e09b4da04bfc3a86
 EBUILD libav-9.1.ebuild 9279 SHA256 50cc016f9fdf254beac8fb08fccc75d1cb71d77d165afda610c4c8bdc922c016 SHA512 d8a4cc561c5944613d3ef081970a59e855ed731e36a5fd8b27d6f25a112040e7a4cf1f7dfbd960f5e77b670f767e7ee416518477a6ba8f716e07bd2d7ec22a9e WHIRLPOOL 4c2bd72a85ef868b744316074440b3ee896558050f0316be7e147ea6c1b2c2c5d8c8f6efa80158b890be009bf36f9baaae2c98c2a326d9e8cdd07d8a45e01514
 EBUILD libav-9.9999.ebuild 9161 SHA256 09ffef2b051372fd87c7435572bcb1cb2c3f1301dc6d106ae169ba93d2781ef8 SHA512 c36222d3d580c19b489bf244d5d380d69c50d907839e06ac0f404840f34cbd53741bbea27a542cac924830a7095eb1d1b6c65368e3b557b004b0f48379e8cf4c WHIRLPOOL 94c2cc28a37066752ddf28e8ce31ce15a002ff486289d1f7fcd99100b7ed4e1205df558d6faee71b007ac6bf8fa8226f57950c0ec462c28b3abb31405293193e
 EBUILD libav-9999.ebuild 9038 SHA256 61854e48db2835dcb2d0f13943b7f28a591259988defd8c7ebcb0a4774ebfe69 SHA512 de4672db9285c64f929840923f8ffc1d49a23654fe1695ee115cb20706f0ce4b387b7eb9632e5bb01f1190fed36e9f0996c5134689521f22402d51e3aa5b56dc WHIRLPOOL 93525fa877baf66a9d7f46d1829b8f76be65bbcfa5a57d92cb00fa053f13b0716dba052c10bc0bff46f87ba57dc0e5866981250d13d37a723418d488f1f1187d
-MISC ChangeLog 19694 SHA256 a491929ed9961826506c3f1d08409c31e0176d043719c4e969b5a9a89347df5c SHA512 fcdde6be93f5985a0ff1685746b86cdbba51ce1f958af0226dbbac02a5a35baf1b93b1ed721675bc6fdea1b33ce2cb9da8d9e45348b1c0279ae3b5ce877d2e1a WHIRLPOOL 59c84732a2f654fe2a99a6443222277c2baee48d78649e607988722953f02eec807b009beb02a25faffd1af13df6a668ffcd0d2aa568587ac9a70b2f84492e73
+MISC ChangeLog 19850 SHA256 c690594f2a0ec57c59abe31c9343b36036e4beeeef7fce904025218810f603fb SHA512 e0c2ba339d7b98ae53ce60b41655846a2aa041969ec33ffbbf670880525fdf0fd43bb0bed84c02f8bac52d79d570f487ccf690a3aed7eadc31f3c2021708182a WHIRLPOOL a5186f0f4917108e2988e8838c2df87aeea7f79085b8ea10bb67191dde5fb82b27929499729a8ae5a4cccfeb714ddc2e71313535d949413ebb9aaee713f530b6
 MISC metadata.xml 3023 SHA256 26380d1657785b484265cc5ce3112dfef63231857cd64f81300b30b806a2f8e8 SHA512 7eb1ea995315cf8caed89296b5fe1cdb9ebaceb8e0cb8e2e1bef22f59f0a518ce128d4e43d18550bdc711df9237790cdf91c775d28e016ea752a3abfa6faa533 WHIRLPOOL 45f87adcebdea041818809051ad67dbb3b880f46971dbab594b4b7dfe4d31a84d97dc5b6e45bb0c51b50b21142074490bd8d268d9b73bfb5ee839ee78e428b0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAlD31L4ACgkQcXOrnRGRc44EgAEAgploj42xj9AhH1FyqDzvyXyn
-WEj/ZWgQZMRRH6O7LGEA/2xg3R0Jf0fr0WOTgRUKGdNsANAl/Ze4lXIv3Q6h3GCj
-=K7wI
+iF4EAREIAAYFAlD32NgACgkQcXOrnRGRc45g5gD9H85g8wb62W7uNb48Eh03v4GZ
+daLyuKQWqNYgZdunDB8BAIWDRZN+koudLz+rH2VrtrcZuhQoM5E8/Af8O5/xRvun
+=wDoK
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch b/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch
new file mode 100644
index 000000000000..a2930a11e75a
--- /dev/null
+++ b/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch
@@ -0,0 +1,43 @@
+diff -urN libav-0.8.5.orig//configure libav-0.8.5/configure
+--- libav-0.8.5.orig//configure	2013-01-12 18:00:42.000000000 +0100
++++ libav-0.8.5/configure	2013-01-17 11:43:39.798920861 +0100
+@@ -1062,6 +1062,8 @@
+     asm_mod_y
+     attribute_may_alias
+     attribute_packed
++    cdio_paranoia_h
++    cdio_paranoia_paranoia_h
+     closesocket
+     cmov
+     dcbzl
+@@ -3020,8 +3022,9 @@
+ 
+ enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
+ 
+-enabled libcdio &&
+-    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
++if enabled libcdio; then
++    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
++fi
+ 
+ enabled x11grab                         &&
+ check_header X11/Xlib.h                 &&
+diff -urN libav-0.8.5.orig//libavdevice/libcdio.c libav-0.8.5/libavdevice/libcdio.c
+--- libav-0.8.5.orig//libavdevice/libcdio.c	2013-01-12 18:00:42.000000000 +0100
++++ libav-0.8.5/libavdevice/libcdio.c	2013-01-17 11:44:28.314919094 +0100
+@@ -23,8 +23,15 @@
+  * libcdio CD grabbing
+  */
+ 
++#include "config.h"
++
++#if HAVE_CDIO_PARANOIA_H
+ #include <cdio/cdda.h>
+ #include <cdio/paranoia.h>
++#elif HAVE_CDIO_PARANOIA_PARANOIA_H
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
++#endif
+ 
+ #include "libavutil/log.h"
+ #include "libavutil/mem.h"
diff --git a/media-video/libav/libav-0.8.5.ebuild b/media-video/libav/libav-0.8.5.ebuild
index 5d1a3fc1750a..c810bda20024 100644
--- a/media-video/libav/libav-0.8.5.ebuild
+++ b/media-video/libav/libav-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.5.ebuild,v 1.6 2013/01/16 20:05:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.5.ebuild,v 1.7 2013/01/17 10:55:55 lu_zero Exp $
 
 EAPI=5
 
@@ -47,7 +47,8 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
+	cdio? ( || ( dev-libs/libcdio-paranoia
+				<dev-libs/libcdio-0.90[-minimal] ) )
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
@@ -106,6 +107,7 @@ src_prepare() {
 	if [[ ${PV%_p*} != ${PV} ]]; then
 		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
+	epatch "${FILESDIR}"/$P-support-libcdio-paranoia.patch
 }
 
 src_configure() {