Fix compability with libcdio-paranoia wrt #452450

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

3 files changed, 63 insertions, 4 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 4562897cc254..4fead461ecaf 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.86 2013/01/01 08:26:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.87 2013/01/16 16:39:28 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer2-2.0_p20121128.ebuild,
+  +files/mplayer2-2.0_p20121128-cdio-api-fixes.patch:
+  Fix compability with libcdio-paranoia wrt #452450
 
   01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> mplayer2-2.0_p20120828.ebuild:
   Stable for arm, wrt bug #447932
diff --git a/media-video/mplayer2/files/mplayer2-2.0_p20121128-cdio-api-fixes.patch b/media-video/mplayer2/files/mplayer2-2.0_p20121128-cdio-api-fixes.patch
new file mode 100644
index 000000000000..a93110d736e9
--- /dev/null
+++ b/media-video/mplayer2/files/mplayer2-2.0_p20121128-cdio-api-fixes.patch
@@ -0,0 +1,50 @@
+diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c
+--- mplayer2-20121128.orig/stream/stream_cdda.c	2013-01-10 19:37:31.000000000 +0200
++++ mplayer2-20121128/stream/stream_cdda.c	2013-01-10 20:23:25.000000000 +0200
+@@ -17,8 +17,8 @@
+  */
+
+ #include "config.h"
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #include <cdio/cdio.h>
+
+ #include <stdio.h>
+@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
+ };
+
+ static const char *cdtext_name[] = {
+-    [CDTEXT_ARRANGER] = "Arranger",
+-    [CDTEXT_COMPOSER] = "Composer",
+-    [CDTEXT_MESSAGE]  =  "Message",
+-    [CDTEXT_ISRC] =  "ISRC",
+-    [CDTEXT_PERFORMER] = "Performer",
+-    [CDTEXT_SONGWRITER] =  "Songwriter",
+-    [CDTEXT_TITLE] =  "Title",
+-    [CDTEXT_UPC_EAN] = "UPC_EAN",
++    [CDTEXT_FIELD_ARRANGER] = "Arranger",
++    [CDTEXT_FIELD_COMPOSER] = "Composer",
++    [CDTEXT_FIELD_MESSAGE]  =  "Message",
++    [CDTEXT_FIELD_ISRC] =  "ISRC",
++    [CDTEXT_FIELD_PERFORMER] = "Performer",
++    [CDTEXT_FIELD_SONGWRITER] =  "Songwriter",
++    [CDTEXT_FIELD_TITLE] =  "Title",
++    [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN",
+ };
+
+ static bool print_cdtext(stream_t *s, int track)
+ {
+     cdda_priv* p = (cdda_priv*)s->priv;
+-    cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
++    cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
+     if (text) {
+         mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
+         for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
+             const char *name = cdtext_name[i];
+-            const char *value = cdtext_get_const(i, text);
++            const char *value = cdtext_get_const(text, i, track);
+             if (name && value)
+                 mp_msg(MSGT_SEEK, MSGL_INFO, "  %s: '%s'\n", name, value);
+         }
diff --git a/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild b/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild
index 38135131d4fc..3e3a8fe81265 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild,v 1.2 2012/12/26 08:51:52 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20121128.ebuild,v 1.3 2013/01/16 16:39:28 ssuominen Exp $
 
 EAPI=4
 
@@ -80,7 +80,10 @@ RDEPEND+="
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
+	cdio? (
+		>=dev-libs/libcdio-0.90
+		>=dev-libs/libcdio-paranoia-0.90
+	)
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
@@ -148,6 +151,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-py2compat.patch"
+	"${FILESDIR}/${P}-cdio-api-fixes.patch"
 )
 
 pkg_setup() {