# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1556030266 -3600
# Node ID b4401072e6d3251f24213e002f94a91787060e69
# Parent  30d152f73f309ad634844d1ebf50ae250b4318f5# Parent  9bab80489afc8812da1a661a8bb5e770f6c5da61
updated lynx (2.8.8 -> 2.8.9)

diff -r 30d152f73f30 -r b4401072e6d3 gnustep-base/receipt
--- a/gnustep-base/receipt	Tue Apr 23 15:36:59 2019 +0100
+++ b/gnustep-base/receipt	Tue Apr 23 15:37:46 2019 +0100
@@ -17,6 +17,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	sed -i 's|\(buf->buffer\)->content.*)|xmlBufContent(\1), xmlBufUse(\1))|' \
+		Source/Additions/GSXML.m
 	sed -i 's/.*gnutls_transport_set_lowat.*/#if GNUTLS_VERSION_NUMBER < 0x020c00\n&\n#endif/' Source/GSSocketStream.m
 	./configure \
 		--prefix=/usr \
diff -r 30d152f73f30 -r b4401072e6d3 gst-plugins-bad/receipt
--- a/gst-plugins-bad/receipt	Tue Apr 23 15:36:59 2019 +0100
+++ b/gst-plugins-bad/receipt	Tue Apr 23 15:37:46 2019 +0100
@@ -23,7 +23,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	sed -i 's|ndef VPX_|def |' ext/vp8/gstvp8utils.h
+	sed -i 's|stdafx.h|libmodplug/&|' ext/modplug/gstmodplug.cc
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff -r 30d152f73f30 -r b4401072e6d3 gst-plugins-ugly/receipt
--- a/gst-plugins-ugly/receipt	Tue Apr 23 15:36:59 2019 +0100
+++ b/gst-plugins-ugly/receipt	Tue Apr 23 15:37:46 2019 +0100
@@ -21,7 +21,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	patch -p0 < $stuff/libcdio.u
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff -r 30d152f73f30 -r b4401072e6d3 gst-plugins-ugly/stuff/libcdio.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gst-plugins-ugly/stuff/libcdio.u	Tue Apr 23 15:37:46 2019 +0100
@@ -0,0 +1,96 @@
+--- ext/cdio/gstcdio.h
++++ ext/cdio/gstcdio.h
+@@ -28,11 +28,20 @@
+ GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
+ #define GST_CAT_DEFAULT gst_cdio_debug
+ 
++#if LIBCDIO_VERSION_NUM >= 90
+ void     gst_cdio_add_cdtext_field (GstObject      * src,
+                                     cdtext_t       * cdtext,
+                                     cdtext_field_t   field,
+                                     const gchar    * gst_tag,
++                                    GstTagList    ** p_tags,
++				    track_t	     track);
++#else
++void     gst_cdio_add_cdtext_field (GstObject      * src,
++                                    cdtext_t       * cdtext,
++                                    cdtext_field_t   field,
++                                    const gchar    * gst_tag,
+                                     GstTagList    ** p_tags);
++#endif
+ 
+ GstTagList  * gst_cdio_get_cdtext  (GstObject      * src,
+                                     CdIo           * cdio,
+--- ext/cdio/gstcdio.c
++++ ext/cdio/gstcdio.c
+@@ -30,12 +30,21 @@
+ GST_DEBUG_CATEGORY (gst_cdio_debug);
+ 
+ void
++#if LIBCDIO_VERSION_NUM >= 90
+ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
++    cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags, track_t track)
++#else
++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
+     cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
++#endif
+ {
+   const gchar *txt;
+ 
++#if LIBCDIO_VERSION_NUM >= 90
++  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;
+@@ -62,14 +71,23 @@
+   GstTagList *tags = NULL;
+   cdtext_t *t;
+ 
++#if LIBCDIO_VERSION_NUM >= 90
++  t = cdio_get_cdtext (cdio);
++#else
+   t = cdio_get_cdtext (cdio, track);
++#endif
+   if (t == NULL) {
+     GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
+     return NULL;
+   }
+ 
++#if LIBCDIO_VERSION_NUM >= 90
++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_PERFORMER, GST_TAG_ARTIST, &tags, track);
++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, &tags, track);
++#else
+   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);
++#endif
+ 
+   return tags;
+ }
+@@ -79,15 +97,24 @@
+ {
+   cdtext_t *t;
+ 
++#if LIBCDIO_VERSION_NUM >= 90
++  t = cdio_get_cdtext (cdio);
++#else
+   t = cdio_get_cdtext (cdio, 0);
++#endif
+   if (t == NULL) {
+     GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
+     return;
+   }
+ 
+   /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
++#if LIBCDIO_VERSION_NUM >= 90
++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, &tags, 0);
++  gst_cdio_add_cdtext_field (src, t, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, &tags, 0);
++#else
+   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);
++#endif
+ 
+   GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
+ }