5 files changed, 14 insertions, 103 deletions
diff --git a/multimedia/gst-plugins0.10-base/Makefile b/multimedia/gst-plugins0.10-base/Makefile
index bd3de671942..c59193b002c 100644
--- a/multimedia/gst-plugins0.10-base/Makefile
+++ b/multimedia/gst-plugins0.10-base/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/03/23 12:03:24 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/25 16:10:52 drochner Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=		1
-
 COMMENT+=		base plugins
 
 # some plugins were moved from bad to base
diff --git a/multimedia/gst-plugins0.10-base/Makefile.common b/multimedia/gst-plugins0.10-base/Makefile.common
index 67e4b7d8fa1..3eee1a6fe13 100644
--- a/multimedia/gst-plugins0.10-base/Makefile.common
+++ b/multimedia/gst-plugins0.10-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2009/01/26 10:39:01 drochner Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/05/25 16:10:52 drochner Exp $
 #
 # used by audio/gst-plugins0.10-alsa/Makefile
 # used by audio/gst-plugins0.10-cdparanoia/Makefile
@@ -12,7 +12,7 @@
 # used by x11/gst-plugins0.10-x11/Makefile
 
 GST_PLUGINS0.10_TYPE=	base
-GST_PLUGINS0.10_VER=	0.10.22
+GST_PLUGINS0.10_VER=	0.10.23
 BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.20.1
 
 # Disable all drivers and features by default.
diff --git a/multimedia/gst-plugins0.10-base/distinfo b/multimedia/gst-plugins0.10-base/distinfo
index e6b53b28831..88ec21af8d4 100644
--- a/multimedia/gst-plugins0.10-base/distinfo
+++ b/multimedia/gst-plugins0.10-base/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.21 2009/03/23 12:03:24 drochner Exp $
+$NetBSD: distinfo,v 1.22 2009/05/25 16:10:52 drochner Exp $
 
-SHA1 (gst-plugins-base-0.10.22.tar.bz2) = 8e6a894858f5412234ce1591bbb773102c150cb7
-RMD160 (gst-plugins-base-0.10.22.tar.bz2) = 013de77422d6e89b64cf55ff7299b0ff1e38ef8a
-Size (gst-plugins-base-0.10.22.tar.bz2) = 2118085 bytes
-SHA1 (patch-aa) = be36e5a0f1de11900df7c510e7a9a03dd19d6e85
+SHA1 (gst-plugins-base-0.10.23.tar.bz2) = f0b66ddca22187c8011b37a5d806c7dc7e68b7f1
+RMD160 (gst-plugins-base-0.10.23.tar.bz2) = 3b08bdeeb5237fb0e6e918ac5d6a97064fa8fe98
+Size (gst-plugins-base-0.10.23.tar.bz2) = 2126280 bytes
+SHA1 (patch-aa) = 544c3180f144339061583cebb979b6051671f977
 SHA1 (patch-ab) = 0a739fbee2c49d75e9164c2b083820fd9d27c34a
 SHA1 (patch-ac) = 3a8a102f2c0740f481e115d68bc44d9e2bf66aae
-SHA1 (patch-ad) = f10ef3184acacf800ca50839e95fbd358f892cc9
diff --git a/multimedia/gst-plugins0.10-base/patches/patch-aa b/multimedia/gst-plugins0.10-base/patches/patch-aa
index 40f5f85a1da..d026a50c9eb 100644
--- a/multimedia/gst-plugins0.10-base/patches/patch-aa
+++ b/multimedia/gst-plugins0.10-base/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2009/01/26 10:39:01 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2009/05/25 16:10:52 drochner Exp $
 
---- configure.orig	2009-01-19 22:24:28.000000000 +0100
+--- configure.orig	2009-05-10 23:50:52.000000000 +0200
 +++ configure
-@@ -23004,7 +23004,7 @@ rm -f core conftest.err conftest.$ac_obj
- echo "${ECHO_T}$flag_ok" >&6; }
+@@ -24238,7 +24238,7 @@ rm -f core conftest.err conftest.$ac_obj
+ $as_echo "$flag_ok" >&6; }
  
  
 -        if test "x$ERROR_CFLAGS" == "x"
 +        if test "x$ERROR_CFLAGS" = "x"
      then
  
-   { echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5
-@@ -28179,11 +28179,11 @@ echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5
+@@ -29572,11 +29572,11 @@ $as_echo "yes" >&6; }
  fi
  
  
diff --git a/multimedia/gst-plugins0.10-base/patches/patch-ad b/multimedia/gst-plugins0.10-base/patches/patch-ad
deleted file mode 100644
index b7da3332822..00000000000
--- a/multimedia/gst-plugins0.10-base/patches/patch-ad
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/03/23 12:03:24 drochner Exp $
-
---- gst-libs/gst/tag/gstvorbistag.c.orig	2008-10-11 01:22:50.000000000 +0200
-+++ gst-libs/gst/tag/gstvorbistag.c
-@@ -305,30 +305,32 @@ gst_vorbis_tag_add (GstTagList * list, c
- }
- 
- static void
--gst_vorbis_tag_add_coverart (GstTagList * tags, const gchar * img_data_base64,
-+gst_vorbis_tag_add_coverart (GstTagList * tags, gchar * img_data_base64,
-     gint base64_len)
- {
-   GstBuffer *img;
--  guchar *img_data;
-   gsize img_len;
-+  guchar *out;
-   guint save = 0;
-   gint state = 0;
- 
-   if (base64_len < 2)
-     goto not_enough_data;
- 
--  img_data = g_try_malloc0 (base64_len * 3 / 4);
--
--  if (img_data == NULL)
--    goto alloc_failed;
--
--  img_len = g_base64_decode_step (img_data_base64, base64_len, img_data,
--      &state, &save);
-+  /* img_data_base64 points to a temporary copy of the base64 encoded data, so
-+   * it's safe to do inpace decoding here
-+   * TODO: glib 2.20 and later provides g_base64_decode_inplace, so change this
-+   * to use glib's API instead once it's in wider use:
-+   *  http://bugzilla.gnome.org/show_bug.cgi?id=564728
-+   *  http://svn.gnome.org/viewvc/glib?view=revision&revision=7807 */
-+  out = (guchar *) img_data_base64;
-+  img_len = g_base64_decode_step (img_data_base64, base64_len,
-+      out, &state, &save);
- 
-   if (img_len == 0)
-     goto decode_failed;
- 
--  img = gst_tag_image_data_to_image_buffer (img_data, img_len,
-+  img = gst_tag_image_data_to_image_buffer (out, img_len,
-       GST_TAG_IMAGE_TYPE_NONE);
- 
-   if (img == NULL)
-@@ -338,7 +340,6 @@ gst_vorbis_tag_add_coverart (GstTagList 
-       GST_TAG_PREVIEW_IMAGE, img, NULL);
- 
-   gst_buffer_unref (img);
--  g_free (img_data);
-   return;
- 
- /* ERRORS */
-@@ -347,21 +348,14 @@ not_enough_data:
-     GST_WARNING ("COVERART tag with too little base64-encoded data");
-     return;
-   }
--alloc_failed:
--  {
--    GST_WARNING ("Couldn't allocate enough memory to decode COVERART tag");
--    return;
--  }
- decode_failed:
-   {
--    GST_WARNING ("Couldn't decode bas64 image data from COVERART tag");
--    g_free (img_data);
-+    GST_WARNING ("Couldn't decode base64 image data from COVERART tag");
-     return;
-   }
- convert_failed:
-   {
-     GST_WARNING ("Couldn't extract image or image type from COVERART tag");
--    g_free (img_data);
-     return;
-   }
- }
-@@ -457,6 +451,7 @@ error:
-   return NULL;
- #undef ADVANCE
- }
-+
- typedef struct
- {
-   guint count;