Fix compability with dev-libs/libcdio >= 0.90 wrt #452434

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

4 files changed, 212 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-cdio/ChangeLog b/media-plugins/gst-plugins-cdio/ChangeLog
index 76c0244c1830..df443491ee55 100644
--- a/media-plugins/gst-plugins-cdio/ChangeLog
+++ b/media-plugins/gst-plugins-cdio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-cdio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdio/ChangeLog,v 1.62 2013/01/06 09:53:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdio/ChangeLog,v 1.63 2013/01/16 16:33:53 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  gst-plugins-cdio-0.10.19.ebuild,
+  +files/gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch:
+  Fix compability with dev-libs/libcdio >= 0.90 wrt #452434
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-cdio-0.10.19.ebuild, gst-plugins-cdio-1.0.3.ebuild:
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index 0807e1bf1578..fd1cb47400b6 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -1,8 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch 6117 SHA256 22824cbab3def9c5813df8e85105044f73e049dce2433f5631246c2d45b24bdd SHA512 a0fb5542df97f47f66ff600deec1d9ff687fdae8e6b1044d26735900ebf7d09512696b400885b33b5013f977dffdd04e14a485af1c978178d565250a7ba8ea36 WHIRLPOOL a8e912a0740fd92d0accd245e29c08afbfe8362e0a1a5549e56eaaf3927c9833d58575fef65972ac0b121ea6a3df48ecbb689b72ea4fcf0ca6ffd8a0ebe7861e
 DIST gst-plugins-ugly-0.10.18.tar.bz2 1070222 SHA256 f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14 SHA512 af4657e3d4c4b8a323078c7aeadaa7e5e8ea95660a20975770930f576f28cb9b85176b06066fd168f91ae17e68ff1525ed55b4546d041bc0d9a4bd83cf3fdb2e WHIRLPOOL 84b2b35a7ad40699aab20168321a38606ae1f1ded9c6dd7506abe343ef0d524f741096196dc404ed86e4af62a475cb47ab12674be133add187a9c085d3aa7740
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.0.3.tar.xz 825988 SHA256 b8f4cfef12201f19c53a4cde7bc4fef995740c566ea45921d4473f3714e4d8c0 SHA512 f8d134571ae0013f34f19f50339ab9c14ebd95cc8c21235d04c6a06e8ae616177f712f85726052710769d9221a25e61accc458b8f6c9bdc7f60f3663bcf82f0b WHIRLPOOL bd676c973b92d2e0093ccd7d3302be9b0666c022660bdc3fe8eacda444ef9a8f2c447d1c8cf70e054368e5bab4ee67306722c93edd7e674b55ee0b5b1f31d8ed
 EBUILD gst-plugins-cdio-0.10.18.ebuild 469 SHA256 a11835be1a0b1f58a6e7231f6c6239c16ab5414a9231beda56032e63a2aad449 SHA512 e001175697308d5cae8464bad1f794d217c582c7163d3864447ebeabca137735e6baa96d809fa23cc5a8a21921f6f9018226c9683a85141d571ad6bc94d1a49b WHIRLPOOL d3c08ebafbc2ccc268c93a24f415cc389a800e88723b7b106596de355c58e0bee1a8c6fdcb6f4053fbc2b5f3e24dbf24f6c2fe1c1171b7c14490853ed39c533a
-EBUILD gst-plugins-cdio-0.10.19.ebuild 406 SHA256 3db1cf4080a1f04aa85cfb4f98bf03b402ae62e5d98574298fc3394806c87d78 SHA512 1308151cbc00f85e6d2fb56907aab4bc7ca78af941f211ed46d3ece5ca01e33bf67f2e2691eb7683c998e3862af5f8bbe9d56d1773d3473058316672f27f808e WHIRLPOOL 81cfa4e464db1dbceeeffb3c054b75a1772d6d9e5f66e55dd1e69f25e918c69fe946d261261a849455c8160c7663796b7e326359e1a38dd162a22cc7cfda2ab1
+EBUILD gst-plugins-cdio-0.10.19.ebuild 496 SHA256 3b2d239f663a9307c8a11a7920ea8b21f5382a65c97e1ee51e776a665c9eac3a SHA512 21d5769b92b08925a0c1ac99ffd2c9e233c09ef52897eb5f078cda45a55ee288f10d48d18d8df7d0162456ca5bb8068d8e409e73a9d43ae1c9fe5e3ffa9a5573 WHIRLPOOL e8598e8e8af1ed91de975195d0ca2c84864590164a91493b6735198c297bc199211583bc19884fb2ded27f67cb0fdb8e9637010667bb8ca1ed6d4486853fe0f2
 EBUILD gst-plugins-cdio-1.0.3.ebuild 404 SHA256 495f513cb8f1abec1732c1f80eb79d2f293fae65bb09f6231c285e214d9df815 SHA512 a763c3c639b61676692c28e8f6631bf455efc5e2fc9dcbd3c34ed1829f22136944055675f2ccdfc9f2a161fcf4083b7acb3beb747b16209dc2f27aed127418f9 WHIRLPOOL 92e923c159208a84c2aba267de4bfaee7fa5132dfcd9ab1c15d64478b2719ed90cf88b8d1b782faba9a83e9655eb7ff32ec09c47b4eff3b5e422869adee3fb56
-MISC ChangeLog 8535 SHA256 aa0e58779231b13ad3cc84546e5050cb21eb6d146a6222235a521670f4ef2137 SHA512 ebb941b31c1c22ed0c6aa121e05abb628723a9ce6ad617615c057c005668d2e5b50b18d12ceb6a8afe92d060403740ce4029be041a93cd51ca99b924e2e61fd3 WHIRLPOOL 9350fa9d70f1929da2009fe57cf67296c04af24ea215c8510b31e8fc82f4e69166690e96848fa5a2fdd4b85ff31f442f8ce060433fe0c060e27661d451063442
+MISC ChangeLog 8749 SHA256 a45a6fbbc8cdbd0bfb83f22db99240c6f695d5573384e94fb751a6f135972a10 SHA512 464f22052609d921c399666d90bb12fd4b4b176fe5ec5474f61574afaf6d17507282ad0cb386b1a048407cc3b7e6aa21da951b26d77cb60ffeb65a832f484e26 WHIRLPOOL f8eb280b0f63d278185abcb5d806b48eeefade87d514cf681639829746f7a2aa940469e3bc42020ce09ec73d6964b797a862c33dec0d896867f52ff107d84506
 MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ9tYnAAoJEEdUh39IaPFNR7AH/2bic1z/oqB1qCsP8be9wuYT
+7LX6nqkME0DgrPG699DKaf+81WJZDy00V519yhEsvCyD4ncR8XPfbYQpKz8kBzpE
+5R8xO9AZmxfo+dJfzvAZm5gTwOaytcfBBH8V5kooLCuz3rf/tJhfQefMzOtPHZOA
+UjS2qp2wueC6wIWt9a9tb1Cm1JQHGEN1WiC628/NWURAZZUMjYfyF1eWwF6vlSM8
+DHTG3X0Q7VLkQMWKeDo088xIIcQdavVvDZPmSB8ehUf1EuvicfWsx3G5Q3a1uSC+
+R73bzV2Y1icnj9YPuhgPZstqll5EGM7ChzRPzLMbZZwrSM+hneGNsrCu/sYTM5c=
+=Oz8b
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-cdio/files/gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch b/media-plugins/gst-plugins-cdio/files/gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch
new file mode 100644
index 000000000000..2b3a81953a6e
--- /dev/null
+++ b/media-plugins/gst-plugins-cdio/files/gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch
@@ -0,0 +1,183 @@
+From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001
+From: Leon Merten Lohse <leon@green-side.de>
+Date: Thu, 03 May 2012 22:50:30 +0000
+Subject: cdio: compensate for libcdio's recent cd-text api changes
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675112
+
+Conflicts:
+
+	ext/cdio/gstcdiocddasrc.c
+---
+diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
+index 2f58d18..483ebf5 100644
+--- a/ext/cdio/gstcdio.c
++++ b/ext/cdio/gstcdio.c
+@@ -30,12 +30,16 @@
+ GST_DEBUG_CATEGORY (gst_cdio_debug);
+
+ void
+-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
+     cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
+ {
+   const gchar *txt;
+
++#if LIBCDIO_VERSION_NUM > 83
++  txt = cdtext_get_const (cdtext, field, track);
++#else
+   txt = cdtext_get_const (field, cdtext);
++#endif
+   if (txt == NULL || *txt == '\0') {
+     GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
+     return;
+@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
+ }
+
+ GstTagList *
++#if LIBCDIO_VERSION_NUM > 83
++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)
++{
++  GstTagList *tags = NULL;
++
++#else
+ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
+ {
+   GstTagList *tags = NULL;
+@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
+     GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
+     return NULL;
+   }
++#endif
+
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
++  gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,
++      GST_TAG_ARTIST, &tags);
++  gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,
++      &tags);
+
+   return tags;
+ }
+
+ void
++#if LIBCDIO_VERSION_NUM > 83
++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,
++    GstTagList * tags)
++{
++#else
+ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
+ {
+   cdtext_t *t;
+@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
+     GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
+     return;
+   }
++#endif
+
+-  /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
+-  gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
+-
++  gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,
++      GST_TAG_ALBUM_ARTIST, &tags);
++  gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,
++      &tags);
++  gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,
++      &tags);
+   GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
+ }
+
+diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h
+index ef31ed0..c6da580 100644
+--- a/ext/cdio/gstcdio.h
++++ b/ext/cdio/gstcdio.h
+@@ -24,22 +24,38 @@
+ #include <gst/gst.h>
+ #include <cdio/cdio.h>
+ #include <cdio/cdtext.h>
++#include <cdio/version.h>
++
++#if LIBCDIO_VERSION_NUM <= 83
++  #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER
++  #define CDTEXT_FIELD_GENRE     CDTEXT_GENRE
++  #define CDTEXT_FIELD_TITLE     CDTEXT_TITLE
++#endif
+
+ GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
+ #define GST_CAT_DEFAULT gst_cdio_debug
+
+ void     gst_cdio_add_cdtext_field (GstObject      * src,
+                                     cdtext_t       * cdtext,
++                                    track_t          track,
+                                     cdtext_field_t   field,
+                                     const gchar    * gst_tag,
+                                     GstTagList    ** p_tags);
+
+ GstTagList  * gst_cdio_get_cdtext  (GstObject      * src,
++#if LIBCDIO_VERSION_NUM > 83
++                                    cdtext_t       * t,
++#else
+                                     CdIo           * cdio,
++#endif
+                                     track_t          track);
+
+ void      gst_cdio_add_cdtext_album_tags (GstObject  * src,
++#if LIBCDIO_VERSION_NUM > 83
++                                          cdtext_t   * t,
++#else
+                                           CdIo       * cdio,
++#endif
+                                           GstTagList * tags);
+
+ #endif /* __GST_CDIO_H__ */
+diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
+index 615a0c8..830839e 100644
+--- a/ext/cdio/gstcdiocddasrc.c
++++ b/ext/cdio/gstcdiocddasrc.c
+@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
+   GstCdioCddaSrc *src;
+   discmode_t discmode;
+   gint first_track, num_tracks, i;
++#if LIBCDIO_VERSION_NUM > 83
++  cdtext_t *cdtext;
++#endif
+
+   src = GST_CDIO_CDDA_SRC (audiocdsrc);
+
+@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
+   if (src->read_speed != -1)
+     cdio_set_speed (src->cdio, src->read_speed);
+
++#if LIBCDIO_VERSION_NUM > 83
++  cdtext = cdio_get_cdtext (src->cdio);
++
++  if (NULL == cdtext)
++    GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");
++  else
++    gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,
++        cddabasesrc->tags);
++#else
+   gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
+       cddabasesrc->tags);
++#endif
+
+   GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
+
+@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
+      * the right thing here (for cddb id calculations etc. as well) */
+     track.start = cdio_get_track_lsn (src->cdio, i + first_track);
+     track.end = track.start + len_sectors - 1;  /* -1? */
++#if LIBCDIO_VERSION_NUM > 83
++    if (NULL != cdtext)
++      track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,
++          i + first_track);
++#else
+     track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
+         i + first_track);
++#endif
+
+     gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
+   }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19.ebuild
index 3afea96ad76d..cec47b47f1ae 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19.ebuild,v 1.5 2013/01/06 09:53:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19.ebuild,v 1.6 2013/01/16 16:33:53 ssuominen Exp $
 
 EAPI="5"
 
-inherit gst-plugins-ugly
+inherit eutils gst-plugins-ugly
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.80"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cdio-cd-text-api.patch #452434
+}