wok-next rev 20202
gst0-plugins-ugly: add cdio-cd-text-api patch
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri Nov 03 22:12:56 2017 +0100 (2017-11-03) |
| parents | 6ae55fd90407 |
| children | be019fcb7da8 |
| files | gst0-plugins-ugly-dev/receipt gst0-plugins-ugly/receipt gst0-plugins-ugly/stuff/patches/cdio-cd-text-api.patch gst0-plugins-ugly/stuff/patches/series |
line diff
1.1 --- a/gst0-plugins-ugly-dev/receipt Fri Nov 03 18:27:35 2017 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,21 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="gst0-plugins-ugly-dev" 1.7 -VERSION="0.10.19" 1.8 -SERIES="0.10" 1.9 -CATEGORY="development" 1.10 -SHORT_DESC="gst0-plugins-ugly devel files" 1.11 -MAINTAINER="jozee@slitaz.org" 1.12 -LICENSE="LGPL2.1" 1.13 -WANTED="gst0-plugins-ugly" 1.14 -WEB_SITE="http://gstreamer.freedesktop.org/" 1.15 - 1.16 -DEPENDS="gstreamer0-dev gst0-plugins-base-dev lame-dev libdvdread-dev 1.17 -libcdio-dev libmad-dev libmpeg2-dev x264-dev" 1.18 - 1.19 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.20 -genpkg_rules() 1.21 -{ 1.22 - mkdir -p $fs/usr/lib/gstreamer-$SERIES 1.23 - cp -a $install/usr/lib/gstreamer-$SERIES/*.*a $fs/usr/lib/gstreamer-$SERIES 1.24 -}
2.1 --- a/gst0-plugins-ugly/receipt Fri Nov 03 18:27:35 2017 +0100 2.2 +++ b/gst0-plugins-ugly/receipt Fri Nov 03 22:12:56 2017 +0100 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="gst0-plugins-ugly" 2.8 VERSION="0.10.19" 2.9 @@ -13,15 +13,13 @@ 2.10 WGET_URL="$WEB_SITE/src/gst-plugins-ugly/$TARBALL" 2.11 LOCALES="da de es fr id it pt_BR ru zh_CN" 2.12 2.13 -DEPENDS="gst0-plugins-base lame libdvdread 2.14 -libcdio libmad libmpeg2 opencore-amr" 2.15 BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev lame-dev libdvdread-dev 2.16 libcdio-dev libmad-dev libmpeg2-dev x264-dev" 2.17 +SPLIT="gst0-plugins-ugly gst0-plugins-ugly-dev" 2.18 2.19 # Rules to configure and make the package. 2.20 compile_rules() 2.21 { 2.22 - cd $src 2.23 ./configure \ 2.24 --prefix=/usr \ 2.25 --sysconfdir=/etc \ 2.26 @@ -38,10 +36,24 @@ 2.27 # Rules to gen a SliTaz package suitable for Tazpkg. 2.28 genpkg_rules() 2.29 { 2.30 - mkdir -p $fs/usr/lib/gstreamer-$SERIES $fs/usr/share/locale 2.31 - mv $install/usr/lib/gstreamer-$SERIES/*.so* $fs/usr/lib/gstreamer-$SERIES 2.32 - mv $install/usr/share/gstreamer-$SERIES $fs/usr/share 2.33 - for locale in $LOCALES; do 2.34 - mv $install/usr/share/locale/$locale $fs/usr/share/locale 2.35 - done 2.36 + case $PACKAGE in 2.37 + gst0-plugins-ugly) 2.38 + DEPENDS="gst0-plugins-base lame libdvdread libcdio libmad \ 2.39 + libmpeg2 opencore-amr" 2.40 + mkdir -p $fs/usr/lib/gstreamer-$SERIES $fs/usr/share/locale 2.41 + mv $install/usr/lib/gstreamer-$SERIES/*.so* $fs/usr/lib/gstreamer-$SERIES 2.42 + mv $install/usr/share/gstreamer-$SERIES $fs/usr/share 2.43 + for locale in $LOCALES; do 2.44 + mv $install/usr/share/locale/$locale $fs/usr/share/locale 2.45 + done 2.46 + ;; 2.47 + gst0-plugins-ugly-dev) 2.48 + CAT="development|gst0-plugins-ugly devel files" 2.49 + DEPENDS="gstreamer0-dev gst0-plugins-base-dev lame-dev \ 2.50 + libdvdread-dev libcdio-dev libmad-dev libmpeg2-dev \ 2.51 + x264-dev" 2.52 + mkdir -p $fs/usr/lib/gstreamer-$SERIES 2.53 + cp -a $install/usr/lib/gstreamer-$SERIES/*.*a $fs/usr/lib/gstreamer-$SERIES 2.54 + ;; 2.55 + esac 2.56 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/gst0-plugins-ugly/stuff/patches/cdio-cd-text-api.patch Fri Nov 03 22:12:56 2017 +0100 3.3 @@ -0,0 +1,183 @@ 3.4 +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 3.5 +From: Leon Merten Lohse <leon@green-side.de> 3.6 +Date: Thu, 03 May 2012 22:50:30 +0000 3.7 +Subject: cdio: compensate for libcdio's recent cd-text api changes 3.8 + 3.9 +https://bugzilla.gnome.org/show_bug.cgi?id=675112 3.10 + 3.11 +Conflicts: 3.12 + 3.13 + ext/cdio/gstcdiocddasrc.c 3.14 +--- 3.15 +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c 3.16 +index 2f58d18..483ebf5 100644 3.17 +--- a/ext/cdio/gstcdio.c 3.18 ++++ b/ext/cdio/gstcdio.c 3.19 +@@ -30,12 +30,16 @@ 3.20 + GST_DEBUG_CATEGORY (gst_cdio_debug); 3.21 + 3.22 + void 3.23 +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, 3.24 ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, 3.25 + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) 3.26 + { 3.27 + const gchar *txt; 3.28 + 3.29 ++#if LIBCDIO_VERSION_NUM > 83 3.30 ++ txt = cdtext_get_const (cdtext, field, track); 3.31 ++#else 3.32 + txt = cdtext_get_const (field, cdtext); 3.33 ++#endif 3.34 + if (txt == NULL || *txt == '\0') { 3.35 + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); 3.36 + return; 3.37 +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, 3.38 + } 3.39 + 3.40 + GstTagList * 3.41 ++#if LIBCDIO_VERSION_NUM > 83 3.42 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) 3.43 ++{ 3.44 ++ GstTagList *tags = NULL; 3.45 ++ 3.46 ++#else 3.47 + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) 3.48 + { 3.49 + GstTagList *tags = NULL; 3.50 +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) 3.51 + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); 3.52 + return NULL; 3.53 + } 3.54 ++#endif 3.55 + 3.56 +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); 3.57 +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); 3.58 ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, 3.59 ++ GST_TAG_ARTIST, &tags); 3.60 ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, 3.61 ++ &tags); 3.62 + 3.63 + return tags; 3.64 + } 3.65 + 3.66 + void 3.67 ++#if LIBCDIO_VERSION_NUM > 83 3.68 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, 3.69 ++ GstTagList * tags) 3.70 ++{ 3.71 ++#else 3.72 + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) 3.73 + { 3.74 + cdtext_t *t; 3.75 +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) 3.76 + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); 3.77 + return; 3.78 + } 3.79 ++#endif 3.80 + 3.81 +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ 3.82 +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); 3.83 +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); 3.84 +- 3.85 ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, 3.86 ++ GST_TAG_ALBUM_ARTIST, &tags); 3.87 ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, 3.88 ++ &tags); 3.89 ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, 3.90 ++ &tags); 3.91 + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); 3.92 + } 3.93 + 3.94 +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h 3.95 +index ef31ed0..c6da580 100644 3.96 +--- a/ext/cdio/gstcdio.h 3.97 ++++ b/ext/cdio/gstcdio.h 3.98 +@@ -24,22 +24,38 @@ 3.99 + #include <gst/gst.h> 3.100 + #include <cdio/cdio.h> 3.101 + #include <cdio/cdtext.h> 3.102 ++#include <cdio/version.h> 3.103 ++ 3.104 ++#if LIBCDIO_VERSION_NUM <= 83 3.105 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER 3.106 ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE 3.107 ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE 3.108 ++#endif 3.109 + 3.110 + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); 3.111 + #define GST_CAT_DEFAULT gst_cdio_debug 3.112 + 3.113 + void gst_cdio_add_cdtext_field (GstObject * src, 3.114 + cdtext_t * cdtext, 3.115 ++ track_t track, 3.116 + cdtext_field_t field, 3.117 + const gchar * gst_tag, 3.118 + GstTagList ** p_tags); 3.119 + 3.120 + GstTagList * gst_cdio_get_cdtext (GstObject * src, 3.121 ++#if LIBCDIO_VERSION_NUM > 83 3.122 ++ cdtext_t * t, 3.123 ++#else 3.124 + CdIo * cdio, 3.125 ++#endif 3.126 + track_t track); 3.127 + 3.128 + void gst_cdio_add_cdtext_album_tags (GstObject * src, 3.129 ++#if LIBCDIO_VERSION_NUM > 83 3.130 ++ cdtext_t * t, 3.131 ++#else 3.132 + CdIo * cdio, 3.133 ++#endif 3.134 + GstTagList * tags); 3.135 + 3.136 + #endif /* __GST_CDIO_H__ */ 3.137 +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c 3.138 +index 615a0c8..830839e 100644 3.139 +--- a/ext/cdio/gstcdiocddasrc.c 3.140 ++++ b/ext/cdio/gstcdiocddasrc.c 3.141 +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) 3.142 + GstCdioCddaSrc *src; 3.143 + discmode_t discmode; 3.144 + gint first_track, num_tracks, i; 3.145 ++#if LIBCDIO_VERSION_NUM > 83 3.146 ++ cdtext_t *cdtext; 3.147 ++#endif 3.148 + 3.149 + src = GST_CDIO_CDDA_SRC (audiocdsrc); 3.150 + 3.151 +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) 3.152 + if (src->read_speed != -1) 3.153 + cdio_set_speed (src->cdio, src->read_speed); 3.154 + 3.155 ++#if LIBCDIO_VERSION_NUM > 83 3.156 ++ cdtext = cdio_get_cdtext (src->cdio); 3.157 ++ 3.158 ++ if (NULL == cdtext) 3.159 ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); 3.160 ++ else 3.161 ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, 3.162 ++ cddabasesrc->tags); 3.163 ++#else 3.164 + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, 3.165 + cddabasesrc->tags); 3.166 ++#endif 3.167 + 3.168 + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); 3.169 + 3.170 +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) 3.171 + * the right thing here (for cddb id calculations etc. as well) */ 3.172 + track.start = cdio_get_track_lsn (src->cdio, i + first_track); 3.173 + track.end = track.start + len_sectors - 1; /* -1? */ 3.174 ++#if LIBCDIO_VERSION_NUM > 83 3.175 ++ if (NULL != cdtext) 3.176 ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, 3.177 ++ i + first_track); 3.178 ++#else 3.179 + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, 3.180 + i + first_track); 3.181 ++#endif 3.182 + 3.183 + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); 3.184 + } 3.185 +-- 3.186 +cgit v0.9.0.2-2-gbebe