Fix compability with libcdio-paranoia wrt #452458

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 122 insertions, 5 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/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