wok rev 21407

updated lynx (2.8.8 -> 2.8.9)
author Hans-G?nter Theisgen
date Tue Apr 23 15:37:46 2019 +0100 (2019-04-23)
parents 30d152f73f30 9bab80489afc
children 9d8df9f05e92
files
line diff
     1.1 --- a/gnustep-base/receipt	Tue Apr 23 15:36:59 2019 +0100
     1.2 +++ b/gnustep-base/receipt	Tue Apr 23 15:37:46 2019 +0100
     1.3 @@ -17,6 +17,8 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	sed -i 's|\(buf->buffer\)->content.*)|xmlBufContent(\1), xmlBufUse(\1))|' \
     1.8 +		Source/Additions/GSXML.m
     1.9  	sed -i 's/.*gnutls_transport_set_lowat.*/#if GNUTLS_VERSION_NUMBER < 0x020c00\n&\n#endif/' Source/GSSocketStream.m
    1.10  	./configure \
    1.11  		--prefix=/usr \
     2.1 --- a/gst-plugins-bad/receipt	Tue Apr 23 15:36:59 2019 +0100
     2.2 +++ b/gst-plugins-bad/receipt	Tue Apr 23 15:37:46 2019 +0100
     2.3 @@ -23,7 +23,8 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 -	cd $src
     2.8 +	sed -i 's|ndef VPX_|def |' ext/vp8/gstvp8utils.h
     2.9 +	sed -i 's|stdafx.h|libmodplug/&|' ext/modplug/gstmodplug.cc
    2.10  	./configure \
    2.11  		--prefix=/usr \
    2.12  		--sysconfdir=/etc \
     3.1 --- a/gst-plugins-ugly/receipt	Tue Apr 23 15:36:59 2019 +0100
     3.2 +++ b/gst-plugins-ugly/receipt	Tue Apr 23 15:37:46 2019 +0100
     3.3 @@ -21,7 +21,7 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 -	cd $src
     3.8 +	patch -p0 < $stuff/libcdio.u
     3.9  	./configure \
    3.10  		--prefix=/usr \
    3.11  		--sysconfdir=/etc \
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/gst-plugins-ugly/stuff/libcdio.u	Tue Apr 23 15:37:46 2019 +0100
     4.3 @@ -0,0 +1,96 @@
     4.4 +--- ext/cdio/gstcdio.h
     4.5 ++++ ext/cdio/gstcdio.h
     4.6 +@@ -28,11 +28,20 @@
     4.7 + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
     4.8 + #define GST_CAT_DEFAULT gst_cdio_debug
     4.9 + 
    4.10 ++#if LIBCDIO_VERSION_NUM >= 90
    4.11 + void     gst_cdio_add_cdtext_field (GstObject      * src,
    4.12 +                                     cdtext_t       * cdtext,
    4.13 +                                     cdtext_field_t   field,
    4.14 +                                     const gchar    * gst_tag,
    4.15 ++                                    GstTagList    ** p_tags,
    4.16 ++				    track_t	     track);
    4.17 ++#else
    4.18 ++void     gst_cdio_add_cdtext_field (GstObject      * src,
    4.19 ++                                    cdtext_t       * cdtext,
    4.20 ++                                    cdtext_field_t   field,
    4.21 ++                                    const gchar    * gst_tag,
    4.22 +                                     GstTagList    ** p_tags);
    4.23 ++#endif
    4.24 + 
    4.25 + GstTagList  * gst_cdio_get_cdtext  (GstObject      * src,
    4.26 +                                     CdIo           * cdio,
    4.27 +--- ext/cdio/gstcdio.c
    4.28 ++++ ext/cdio/gstcdio.c
    4.29 +@@ -30,12 +30,21 @@
    4.30 + GST_DEBUG_CATEGORY (gst_cdio_debug);
    4.31 + 
    4.32 + void
    4.33 ++#if LIBCDIO_VERSION_NUM >= 90
    4.34 + gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
    4.35 ++    cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags, track_t track)
    4.36 ++#else
    4.37 ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
    4.38 +     cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
    4.39 ++#endif
    4.40 + {
    4.41 +   const gchar *txt;
    4.42 + 
    4.43 ++#if LIBCDIO_VERSION_NUM >= 90
    4.44 ++  txt = cdtext_get_const (cdtext, field, track);
    4.45 ++#else
    4.46 +   txt = cdtext_get_const (field, cdtext);
    4.47 ++#endif
    4.48 +   if (txt == NULL || *txt == '\0') {
    4.49 +     GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
    4.50 +     return;
    4.51 +@@ -62,14 +71,23 @@
    4.52 +   GstTagList *tags = NULL;
    4.53 +   cdtext_t *t;
    4.54 + 
    4.55 ++#if LIBCDIO_VERSION_NUM >= 90
    4.56 ++  t = cdio_get_cdtext (cdio);
    4.57 ++#else
    4.58 +   t = cdio_get_cdtext (cdio, track);
    4.59 ++#endif
    4.60 +   if (t == NULL) {
    4.61 +     GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
    4.62 +     return NULL;
    4.63 +   }
    4.64 + 
    4.65 ++#if LIBCDIO_VERSION_NUM >= 90
    4.66 ++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_PERFORMER, GST_TAG_ARTIST, &tags, track);
    4.67 ++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, &tags, track);
    4.68 ++#else
    4.69 +   gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
    4.70 +   gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
    4.71 ++#endif
    4.72 + 
    4.73 +   return tags;
    4.74 + }
    4.75 +@@ -79,15 +97,24 @@
    4.76 + {
    4.77 +   cdtext_t *t;
    4.78 + 
    4.79 ++#if LIBCDIO_VERSION_NUM >= 90
    4.80 ++  t = cdio_get_cdtext (cdio);
    4.81 ++#else
    4.82 +   t = cdio_get_cdtext (cdio, 0);
    4.83 ++#endif
    4.84 +   if (t == NULL) {
    4.85 +     GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
    4.86 +     return;
    4.87 +   }
    4.88 + 
    4.89 +   /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
    4.90 ++#if LIBCDIO_VERSION_NUM >= 90
    4.91 ++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, &tags, 0);
    4.92 ++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, &tags, 0);
    4.93 ++#else
    4.94 +   gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
    4.95 +   gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
    4.96 ++#endif
    4.97 + 
    4.98 +   GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
    4.99 + }