From d56d144655e3785864da43c9acb6c228ef9360ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Jun 2019 11:30:24 +0100 Subject: gentoo resync : 22.06.2019 --- media-plugins/gst-plugins-cdio/Manifest | 3 - ...gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch | 183 --------------------- .../gst-plugins-cdio-0.10.19-r1.ebuild | 17 -- 3 files changed, 203 deletions(-) delete mode 100644 media-plugins/gst-plugins-cdio/files/gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch delete mode 100644 media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19-r1.ebuild (limited to 'media-plugins/gst-plugins-cdio') diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest index 6a3ccba58c3d..44a6cbed0334 100644 --- a/media-plugins/gst-plugins-cdio/Manifest +++ b/media-plugins/gst-plugins-cdio/Manifest @@ -1,6 +1,3 @@ -AUX gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch 6117 BLAKE2B 059a2f5901bfb94972c9546acfad5e96b2ac5f48694b0db9f9f380a536f75f7d5f520d371a2835f6f397c3aa1b38ceaa923192063931cb7f886fb2860a293e6d SHA512 a0fb5542df97f47f66ff600deec1d9ff687fdae8e6b1044d26735900ebf7d09512696b400885b33b5013f977dffdd04e14a485af1c978178d565250a7ba8ea36 -DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc -EBUILD gst-plugins-cdio-0.10.19-r1.ebuild 418 BLAKE2B 1c7a01775e4347b4db8474a8f7ba85c992f694878f53fe9e119b85fa17196f43a2edb0967b5791ac673f4a0a50636acea2cc6c08f8c276c7533833797ba27063 SHA512 9df5ba64af0b1bd1d99e46851f6184f889386898d056d2c82cd6c5c023ff183bf59a6818c401f8ccd6a62beadd6bdd77a2d447f250c0472c5f54b46013d6dbb6 EBUILD gst-plugins-cdio-1.14.3.ebuild 393 BLAKE2B 70dd3ed0a8f9d24c3331633638e4855906af8d980b8ca38c22c40d235933615e82a715725d7a71fb31a7a8546f10d41cedc0d9936993c7e4ee1104b7e601cf80 SHA512 0d6e32ad9ff68dd8dae23cb9ec0f0eac6e5c39ee4c5bf7793989ad2d6962fa491d85735a3ba8fbad4ab4b09fe764530af0443450eda2cf16f9fbf4d3e3d9ec25 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0 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 deleted file mode 100644 index 2b3a81953a6e..000000000000 --- a/media-plugins/gst-plugins-cdio/files/gst-plugins-cdio-0.10.19-cdio-cd-text-api.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 -From: Leon Merten Lohse -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 - #include - #include -+#include -+ -+#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-r1.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19-r1.ebuild deleted file mode 100644 index 379953151069..000000000000 --- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-0.10.19-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -GST_ORG_MODULE=gst-plugins-ugly -inherit eutils gstreamer - -KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-cdio-cd-text-api.patch #452434 -} -- cgit v1.2.3