Fix compability with libcdio-paranoia wrt #452458

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 133 insertions, 15 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 8d357d0d7cce..c2313faae784 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.262 2013/01/06 20:54:46 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.263 2013/01/16 16:44:04 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  audacious-plugins-3.3.3.ebuild, +files/audacious-plugins-3.3.3-libcdio.patch:
+  Fix compability with libcdio-paranoia wrt #452458
 
   06 Jan 2013;  <jd@gentoo.org> audacious-plugins-2.4.4-r1.ebuild,
   audacious-plugins-2.5.4.ebuild, audacious-plugins-3.1.1.ebuild,
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 6d727e493f08..98bef601b714 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX audacious-plugins-2.x-fix-skins-build-glib-2.32.patch 373 SHA256 35511091a09198cc52c272748da35f3bce44b0cdafc2284843c41033e0f2bbde SHA512 920edae070912a9eee4bb4ae548647dbbb44cdb55e228b1b1b6104ef17fc3ac98bf1d4dff9042c9f2b70e264c553d4af6aefd99ee634fe04072551d836d2a794 WHIRLPOOL b70d3fb616eac8ae33bb57e6c48df688c621fc2105eaf7da8054f224c0d776075dd2acea5db9ce4fa4b5a4467404b4be8804d2a8c93aa376ba540ecff920d844
 AUX audacious-plugins-3.2.2-fix-build-gmodule.patch 1244 SHA256 c86428993218ea785d740cc0e051a4c2401aadc17f35940048dd39347f1acdd5 SHA512 6dbe6364f4c2199c4b71d6dce55af425c0221d0ba9660c943d07207a438199019c2a13260a65056a1bbb29ee609b0fb0f8a35ab9289558da41832633837a9cee WHIRLPOOL 113cbfd01e23fc8484cba16a3ab47746906c7d8f08e1b6072244043c59fbf88dc95f334a3fa79f1f0a5099e201ade9bd39e90300f9b3fe73d52b338c6e445934
 AUX audacious-plugins-3.2.2-fix-build-sdl.patch 622 SHA256 c6b13de9284cb918a749b8c1356685af233c26065a1aff41290c5fff94074eb3 SHA512 14939ee2e6638775d52d5d5e01c3b2282416b88076408d13432176c30437ef6fa426f1c1cb6e62606e24507a4747dff8031e89fd1bb2e1915245c5b4471e059e WHIRLPOOL 8068c167bc76b72bd66e329abc27565396c595df623cf6363b7093336843b5305556b4be595c8acb17489b95e01fe36e46662e704247c5be4c8a2e61188c0581
+AUX audacious-plugins-3.3.3-libcdio.patch 4390 SHA256 dd21ee082c5f622d42b4f224c346af11e911e6f9e95f8dcef4502eed1d1f35a3 SHA512 f7f913228619e2deb394d95fab9ae9678518f30abe7abb53c8f24e87b9be28ebe59fd038a408801aa11254ea54187e35b2eca45e6b730975a07b1ca8e4bec94a WHIRLPOOL 4a7de772c29bdc8ed398b67f98e4e8f33b50c4b146a3f3eae7a942f6d515bfc76d19c4d7c3870c667f0d0ae50984a52f1e084e25c8dbb0a5845886df89684c02
 AUX audacious-plugins_ldflags.patch 392 SHA256 1c22569d2a5c54656713f57b74412f61d09e002b87c6af2c291e771217d91a6a SHA512 216d2dd915a6d9a50ec239f9c28b616a5c6d41b9c1d187050ebb685ae4dad258206cc82333165661b09024ad4221ca986741d4f4b8bd9588ab6dce3a13385d77 WHIRLPOOL b0a1a87e2140d21cdf069959f4d7ef6ba549cb81dc2be2f58862213464fdaab36a6e85aac7e1b1e2a08939ce4617712d9e820c547c38bb41924a4966869dbd1e
 DIST audacious-plugins-2.4.4.tgz 3425914 SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4 SHA512 075af56ff2be5262b892cca40a0270a14e20c8b2627296ee5d546f1a3817657e8a46c3c6388ea920efede9a9a727391e31f09a7c781ff651726929b4e6f58ec6 WHIRLPOOL c357c222784b5a178cd8c5e83a8d1b90cbba453613507c11cc1bba34bbcf3aef7c3d6fd1540ffaa92c90699d20203a7acf3241cbbde83525fad011889addaa54
 DIST audacious-plugins-2.5.4.tar.gz 3500309 SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8 SHA512 43eedbb4d599cc0437f5870cf0501222e107667a76873aa26786086b0ca29a5fb074f7715e7aeff504560e033dd482b98d9d771964d981afcd3b29a46f410bcc WHIRLPOOL e131fb818e90eaa7e98b06b903d6192d4b0fcac4f6af771ea75ce4323033d56ced9fd1b05f7534e390162378c7de8dd384ac9946e0df3cb99cf8cd00d170252c
@@ -23,18 +24,18 @@ EBUILD audacious-plugins-3.2.2-r1.ebuild 3439 SHA256 9c85dce8f2fb2b94b2160b1d72f
 EBUILD audacious-plugins-3.2.3.ebuild 3125 SHA256 5f10e356901c0ba24cb881f347fd24d7b539d28aec81466b5325d836f8fceba6 SHA512 756a99683c0e640290097021fd33693e573d81b24612489bb58362bd7f88f074dada664ed8f7c7a7f4921006f3b5f45e84f633943030ecdac46b1c3ffb0b03ce WHIRLPOOL 6ab530c67a565e904ccba151878830ec1efbe991e3360a582d37f67b9f09d375e1cbbd5717e5b99adef7081b51a789faf0cfaef44e8cf3070aa796e644a0ce32
 EBUILD audacious-plugins-3.2.4.ebuild 3125 SHA256 c3dc669baea27a95ab86a4733ecf3a02d1ddcf53d3ec55e65aa41b12c5783a59 SHA512 4235fff35cafdf03f8de56a30e85f380b6acae790fc63d0186b7fed71b4445c38231f4c305f1524b73d49de5ac55f4bba389f2c36e6e9683d463311137d227ed WHIRLPOOL a6b6e8971d51a08c0db16cb7fc8434444713e326d60850efc40837aba3682a966b741967e35f2284c6d994c58918558fd8e9281f3a1fb7f23fb0a62b2b16d6d4
 EBUILD audacious-plugins-3.3.2.ebuild 3473 SHA256 82415598affbba44e62ebc37bca52c6e7230416426edb8ecdb96158653112227 SHA512 971d49e62cd446cdd3449e7a25051f6e87007002553577a58d9854adbcca3892f897ded3517623b0bc9039e8267789aafce920d3099c77a51284a37e5cd68c49 WHIRLPOOL af51239b061d7e1f4d720b313b45617e19233a34b335cbd7a0385ebbc197e8123c5afa1c00dd961f94163fa3cda7f64eb76b9b8fcfc7db898a0ea73bda003847
-EBUILD audacious-plugins-3.3.3.ebuild 3473 SHA256 b1f93d4160b376e37073cdbcd6dce45ac857a748cd952a83ec3b58fbbec98b12 SHA512 b7688c7a9a16c014f5fef7a7b7b5dd9b7b9e35033b662d67e959c07e56658b75ecc77016f46ad193194159975c4d48355aea0354f2a47007b87002e473e3b904 WHIRLPOOL e33bf3664f5a10ad48ed310091c16f141b59ef2080e6786739cb56e591b72baa4ef04aa5b46947dba523f62572c66ed9e2e29ceb8ed7ff1388cf0d07f5dea296
+EBUILD audacious-plugins-3.3.3.ebuild 3576 SHA256 6f8c1ee53343724315855770cffca55768e38be720fae8f82436302733cc908a SHA512 1f6285b724c0b09ba42c981f9841d37049ca0a31a0f8e56d19f41da5ea63a15f9654d6868fc44338c26bdf4a7b84b414ac17321a81622b82b37cb73089994531 WHIRLPOOL 991c00a41dcb8694baf6354ee20503183cf3e66fa35fb1995486981357cd274ba24d53a27d5414bf284bfd23df0a604d940d2fda1ab4a59bae46825c7061359c
 EBUILD audacious-plugins-3.3.ebuild 3469 SHA256 5cdffb592e528e530e64ac09a1e34fe63297a027e61aed28a93367b626015752 SHA512 081cd124ddd17ac2630a994ec27cc8611b0bc20ba8d820c566ae9a2f5066946d89eb48a4db44a7af5122f992454f50a40bf82f072684590fc5b20c6e7cb723e6 WHIRLPOOL 9a6fe3eebf570c4192ab66406806f8fb631edff8d17760ccd60d04ca68e9e401263b7c030a7bae97360e2099207cf2add9bc5e30a00e4a5bb92137e74743cc1c
-MISC ChangeLog 53915 SHA256 70ee76301f989a6ff5004fb5229f9aa00d4533acf105fe8d0860b5677169398e SHA512 8f6f674e1e875bf9ae7de1977fc40c6d3597d3a41bfc7e6994d299835d8d9fa04a74f411812723a10e63a3cb208899fdf2785cd3030fbac5a8d312b84f125eab WHIRLPOOL 3055bf64b0b8efc6a8deda49e9de511182947547b50db178129f14847f59a4a493c4e644c0050db3a8582cf883f496b93d77ba994df506fc8a0a95da809a1b4b
+MISC ChangeLog 54105 SHA256 56632e99d92e74d914e7b5e48cfaacd1158322e06b7aa5cbf55b7e3cbdcbd3e4 SHA512 5b0504f9fdf0427852aa29d3ae634dd14c7eae8d1312f3c49ff6a827695c40cddda18ca1a839e04862cc6d53835b8a1967b4ba4d771919154421afb119f0f19e WHIRLPOOL 3aa85fbdf145eecfc2c4bd2cc8c29cd3e140aa9121b0f668a9665dfc17465e3610725b2f292d7321a6b1b97cf0d9075d2cc7c39a69ee09f13babe491c3d264a6
 MISC metadata.xml 900 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750 SHA512 ce599585b5e9e9bdae0c9cb7601cb8646c294a5975a1333ca1510842167410114ac10beb135f0b784a660ac08144eb483211858ca31c3be73265fd28175d0e8b WHIRLPOOL 77125319e91b557e886b4decd1bf3deddb48136022739214b52a4e4839c1e501711a75903e59bbb00eb6629471f75bc4e215070ae00867feae7ff0cd3169ec69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQ6eSaAAoJEPUd7O0j6ekAx5EIAK0m5r528CyY4V7kizWABBTZ
-1fvkO1cqz4PULjYjPKeWl8y7B7UaL9R23kkXqr1ZaJ0EWCSPFGcvay2dsTuFeYw7
-IDr66YtEu/xcBiKc/0ADWCuz3RRnxfl8zPkF4o3wbQWlrFoXFPURSNAR9Gbq5wDX
-yqQpN9eRiarlUE2CY1bXCklclVWRqNjkK+9BnyzujSAaaCcbBjaX3teMe2z+yvfB
-CGI9jPW9XEmNgVedhpFXAFJVSMaSk1lwOdJR81UGcYYXB2TRN+Zd4GUqOY3jrk99
-1sC4jM0bOWjeuDLJYq4/xUsteEzPq9/V8s3cyQJdH7+AFWTZcKzzGIM+jjwXwRs=
-=OBgE
+iQEcBAEBCAAGBQJQ9tiKAAoJEEdUh39IaPFNTxQIAJw8E+WwXlH3e8WlsBwOTbny
+GIV5Fqegxd6dKbj4YfoRrV/ay0wxPSxi63QUFL3mannHrX/RvJutdxpQJHiThQK3
+RUeTQucVEJG+Gc2BzfV5XOTOqOYOaDoTGz743g62KGx1axUz+8Vfpq4NWQ/+i/Jq
+LcjhUbpVTvWranzQFnGoHWFUDnoaPLiym0oQ8OzVSPCMH224M21YyuKyAsQVcGN3
+dgOgvQj1r/3QLtlsHwMBBIBrtDBTcEeGP7c9eUc7PCe3Vbzt5iLcnIvurIyQbTxA
+rzLGoVazSEV25Ovrd5FeN+3BGV3CFkVGuzVNtbT0nh39K1asxMWFnF9753PJ/2M=
+=2nVN
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
index fe74502e4416..484be6a4a11f 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild,v 1.2 2013/01/06 20:54:46 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild,v 1.3 2013/01/16 16:44:04 ssuominen Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -29,7 +30,7 @@ RDEPEND="app-arch/unzip
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	bs2b? ( media-libs/libbs2b )
 	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
+		|| ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	cue? ( media-libs/libcue )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? ( >=media-libs/libvorbis-1.0
@@ -66,13 +67,14 @@ mp3_warning() {
 
 src_prepare() {
 	has_version "<dev-libs/glib-2.32" && \
-		cd ${S}/src/mpris2 && \
+		cd "${S}"/src/mpris2 && \
 		gdbus-codegen --interface-prefix org.mpris. \
 			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
 		gdbus-codegen --interface-prefix org.mpris. \
 			--c-namespace Mpris \
 			--generate-c-code object-player mpris2-player.xml && \
-		cd ${S}
+		cd "${S}"
+		epatch "${FILESDIR}"/${P}-libcdio.patch
 }
 
 src_configure() {
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.3.3-libcdio.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.3.3-libcdio.patch
new file mode 100644
index 000000000000..e0943e6471f3
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.3.3-libcdio.patch
@@ -0,0 +1,111 @@
+diff --git a/src/cdaudio-ng/cdaudio-ng.c b/src/cdaudio-ng/cdaudio-ng.c
+index 925b847..e986839 100644
+--- a/src/cdaudio-ng/cdaudio-ng.c
++++ b/src/cdaudio-ng/cdaudio-ng.c
+@@ -26,11 +26,16 @@
+ #include <cdio/cdio.h>
+ #include <cdio/cdtext.h>
+ #include <cdio/track.h>
+-#include <cdio/cdda.h>
+ #include <cdio/audio.h>
+ #include <cdio/sector.h>
+ #include <cdio/cd_types.h>
+
++#if LIBCDIO_VERSION_NUM >= 90
++#include <cdio/paranoia/cdda.h>
++#else
++#include <cdio/cdda.h>
++#endif
++
+ /* libcdio's header files #define these */
+ #undef PACKAGE
+ #undef PACKAGE_BUGREPORT
+@@ -269,9 +274,9 @@ static void cdaudio_set_strinfo (trackinfo_t * t,
+                                  const char * performer, const char * name,
+                                  const char * genre)
+ {
+-    g_strlcpy (t->performer, performer, DEF_STRING_LEN);
+-    g_strlcpy (t->name, name, DEF_STRING_LEN);
+-    g_strlcpy (t->genre, genre, DEF_STRING_LEN);
++    g_strlcpy (t->performer, performer ? performer : "", DEF_STRING_LEN);
++    g_strlcpy (t->name, name ? name : "", DEF_STRING_LEN);
++    g_strlcpy (t->genre, genre ? genre : "", DEF_STRING_LEN);
+ }
+
+ /* thread safe (mutex may be locked) */
+@@ -622,23 +627,32 @@ static void scan_cd (void)
+     }
+
+     /* get trackinfo[0] cdtext information (the disc) */
++    cdtext_t *pcdtext = NULL;
+     if (aud_get_bool ("CDDA", "use_cdtext"))
+     {
+         AUDDBG ("getting cd-text information for disc\n");
+-        cdtext_t *pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
++#if LIBCDIO_VERSION_NUM >= 90
++        pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
++        if (pcdtext == NULL)
++#else
++        pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
+         if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL)
++#endif
+         {
+             AUDDBG ("no cd-text available for disc\n");
+         }
+         else
+         {
+             cdaudio_set_strinfo (&trackinfo[0],
+-                                 pcdtext->field[CDTEXT_PERFORMER] ? pcdtext->
+-                                 field[CDTEXT_PERFORMER] : "",
+-                                 pcdtext->field[CDTEXT_TITLE] ? pcdtext->
+-                                 field[CDTEXT_TITLE] : "",
+-                                 pcdtext->field[CDTEXT_GENRE] ? pcdtext->
+-                                 field[CDTEXT_GENRE] : "");
++#if LIBCDIO_VERSION_NUM >= 90
++                                 cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0),
++                                 cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0),
++                                 cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0));
++#else
++                                 pcdtext->field[CDTEXT_PERFORMER],
++                                 pcdtext->field[CDTEXT_TITLE],
++                                 pcdtext->field[CDTEXT_GENRE]);
++#endif
+         }
+     }
+
+@@ -646,7 +660,7 @@ static void scan_cd (void)
+     bool_t cdtext_was_available = FALSE;
+     for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+     {
+-        cdtext_t *pcdtext = NULL;
++#if LIBCDIO_VERSION_NUM < 90
+         if (aud_get_bool ("CDDA", "use_cdtext"))
+         {
+             AUDDBG ("getting cd-text information for track %d\n", trackno);
+@@ -657,16 +671,20 @@ static void scan_cd (void)
+                 pcdtext = NULL;
+             }
+         }
++#endif
+
+         if (pcdtext != NULL)
+         {
+             cdaudio_set_strinfo (&trackinfo[trackno],
+-                                 pcdtext->field[CDTEXT_PERFORMER] ? pcdtext->
+-                                 field[CDTEXT_PERFORMER] : "",
+-                                 pcdtext->field[CDTEXT_TITLE] ? pcdtext->
+-                                 field[CDTEXT_TITLE] : "",
+-                                 pcdtext->field[CDTEXT_GENRE] ? pcdtext->
+-                                 field[CDTEXT_GENRE] : "");
++#if LIBCDIO_VERSION_NUM >= 90
++                                 cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, trackno),
++                                 cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno),
++                                 cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno));
++#else
++                                 pcdtext->field[CDTEXT_PERFORMER],
++                                 pcdtext->field[CDTEXT_TITLE],
++                                 pcdtext->field[CDTEXT_GENRE]);
++#endif
+             cdtext_was_available = TRUE;
+         }
+         else