Date: Tuesday, March 3, 2015 @ 16:43:03
  Author: spupykin
Revision: 128641

clean up

Modified:
  xmms2/trunk/PKGBUILD
Deleted:
  xmms2/trunk/vorbis-albumart.patch
  xmms2/trunk/xmms2-helpers.patch
  xmms2/trunk/xmms2-ruby-1.9.patch

-----------------------+
 PKGBUILD              |    1 
 vorbis-albumart.patch |  200 ------------------------------------------------
 xmms2-helpers.patch   |   13 ---
 xmms2-ruby-1.9.patch  |   59 --------------
 4 files changed, 273 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-03-03 15:41:47 UTC (rev 128640)
+++ PKGBUILD    2015-03-03 15:43:03 UTC (rev 128641)
@@ -92,7 +92,6 @@
 
   # python2
   ./waf distclean
-#  rm -f src/clients/lib/python/{xmmsvalue,xmmsapi}.c
   PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr 
--with-optionals=python --without-xmms2d
   ./waf build
   ./waf --destdir=${pkgdir} install

Deleted: vorbis-albumart.patch
===================================================================
--- vorbis-albumart.patch       2015-03-03 15:41:47 UTC (rev 128640)
+++ vorbis-albumart.patch       2015-03-03 15:43:03 UTC (rev 128641)
@@ -1,200 +0,0 @@
-From f38882beb1c9b4f3e3c63ac7d65603ad5917cd9d Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <ano...@users.sourceforge.net>
-Date: Tue, 09 Mar 2010 15:41:33 +0000
-Subject: OTHER: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin
-
-Bug-Debian: http://bugs.debian.org/565479
----
-diff --git a/src/plugins/vorbis_common/common.c 
b/src/plugins/vorbis_common/common.c
-index c1f4ef9..fc4ff1b 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -243,6 +243,74 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
-       }
- }
- 
-+static void
-+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+{
-+      guint32 typ, mime_len, desc_len, img_len;
-+      guchar *pos, *end, *mime_data, *img_data;
-+      gchar hash[33];
-+
-+      pos = value;
-+      end = value + len;
-+
-+      if (pos + 4 > end) {
-+              XMMS_DBG ("Malformed picture comment");
-+              return;
-+      }
-+      typ = GUINT32_FROM_BE (*(guint32 *)pos);
-+      if (typ != 0 && typ != 3) {
-+              XMMS_DBG ("Picture type %d not handled", typ);
-+              return;
-+      }
-+      pos += 4;
-+
-+      if (pos + 4 > end) {
-+              XMMS_DBG ("Malformed picture comment");
-+              return;
-+      }
-+      mime_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+      pos += 4;
-+      mime_data = pos;
-+      pos += mime_len;
-+
-+      if (pos + 4 > end) {
-+              XMMS_DBG ("Malformed picture comment");
-+              return;
-+      }
-+      desc_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+      pos += 4;
-+      pos += desc_len;
-+
-+      pos += 4; /* width */
-+      pos += 4; /* height */
-+      pos += 4; /* depth */
-+      pos += 4; /* indexed palette length */
-+
-+      if (pos + 4 > end) {
-+              XMMS_DBG ("Malformed picture comment");
-+              return;
-+      }
-+      img_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+      pos += 4;
-+      img_data = pos;
-+
-+      if (img_data + img_len > end) {
-+              XMMS_DBG ("Malformed picture comment");
-+              return;
-+      }
-+
-+      if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+              const gchar *metakey;
-+
-+              metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-+              xmms_xform_metadata_set_str (xform, metakey, hash);
-+
-+              metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
-+              mime_data[mime_len] = '\0';
-+              xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+      }
-+}
-+
- /* note that "key" is NOT NUL-terminated here,
-  * but "value" is.
-  */
-@@ -253,6 +321,14 @@ handle_comment (xmms_xform_t *xform,
- {
-       gint i;
- 
-+      if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
-+              gsize dlen;
-+              gchar *dvalue = g_base64_decode (value, &dlen);
-+              handle_image_comment (xform, dvalue, dlen);
-+              g_free (dvalue);
-+              return;
-+      }
-+
-       for (i = 0; i < G_N_ELEMENTS (properties); i++) {
-               if (key_len != strlen (properties[i].vname))
-                       continue;
---
-cgit v0.8.3.4
-
-
-From d8273630bd92ecea581240ae93c6795cc538d076 Mon Sep 17 00:00:00 2001
-From: Erik Massop <e.mas...@hccnet.nl>
-Date: Tue, 09 Mar 2010 15:45:03 +0000
-Subject: OTHER: Add Brad Jorsch to AUTHORS, disable Vorbis albumart for glib < 
2.12
-
-(Name found using e-mail address at http://sourceforge.net/users/anomie )
----
-diff --git a/AUTHORS b/AUTHORS
-index f2ef9af..7331d4b 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -146,6 +146,10 @@ N: Johannes Jordan
- E: yp...@lanrules.de
- D: Visualization
- 
-+N: Brad Jorsch
-+E: ano...@users.sourceforge.net
-+D: Support for front picture from Vorbis.
-+
- N: Daniel KamiƄski
- E: maniel.ru...@gmail.com
- D: mlib remove command in cli, Ruby fixes.
-diff --git a/src/plugins/vorbis_common/common.c 
b/src/plugins/vorbis_common/common.c
-index fc4ff1b..ab1dc75 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -27,6 +27,7 @@
- #include "xmms/xmms_sample.h"
- #include "xmms/xmms_log.h"
- #include "xmms/xmms_medialib.h"
-+#include "xmms/xmms_bindata.h"
- 
- #include <glib.h>
- 
-@@ -244,12 +245,22 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- }
- 
- static void
--handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+handle_image_comment (xmms_xform_t *xform, const gchar *encoded_value)
- {
-+      gsize len;
-+      guchar *value;
-+
-       guint32 typ, mime_len, desc_len, img_len;
-       guchar *pos, *end, *mime_data, *img_data;
-       gchar hash[33];
- 
-+#if GLIB_CHECK_VERSION(2,12,0)
-+      value = g_base64_decode (encoded_value, &len);
-+#else
-+      /* TODO: Implement/backport base64 decoding */
-+      return;
-+#endif
-+
-       pos = value;
-       end = value + len;
- 
-@@ -299,7 +310,7 @@ handle_image_comment (xmms_xform_t *xform, const gchar 
*value, gsize len)
-               return;
-       }
- 
--      if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+      if (xmms_bindata_plugin_add (img_data, img_len, hash)) {
-               const gchar *metakey;
- 
-               metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-@@ -307,8 +318,10 @@ handle_image_comment (xmms_xform_t *xform, const gchar 
*value, gsize len)
- 
-               metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
-               mime_data[mime_len] = '\0';
--              xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+              xmms_xform_metadata_set_str (xform, metakey, (gchar 
*)mime_data);
-       }
-+
-+      g_free (value);
- }
- 
- /* note that "key" is NOT NUL-terminated here,
-@@ -322,10 +335,7 @@ handle_comment (xmms_xform_t *xform,
-       gint i;
- 
-       if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
--              gsize dlen;
--              gchar *dvalue = g_base64_decode (value, &dlen);
--              handle_image_comment (xform, dvalue, dlen);
--              g_free (dvalue);
-+              handle_image_comment (xform, value);
-               return;
-       }
- 
---
-cgit v0.8.3.4
-
-

Deleted: xmms2-helpers.patch
===================================================================
--- xmms2-helpers.patch 2015-03-03 15:41:47 UTC (rev 128640)
+++ xmms2-helpers.patch 2015-03-03 15:43:03 UTC (rev 128641)
@@ -1,13 +0,0 @@
-diff -wbBur xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h 
xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h    
2008-06-15 21:31:38.000000000 +0400
-+++ xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h 
2008-06-18 14:22:24.000000000 +0400
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
-

Deleted: xmms2-ruby-1.9.patch
===================================================================
--- xmms2-ruby-1.9.patch        2015-03-03 15:41:47 UTC (rev 128640)
+++ xmms2-ruby-1.9.patch        2015-03-03 15:43:03 UTC (rev 128641)
@@ -1,59 +0,0 @@
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c 
xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c    
2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c 
2009-09-14 09:13:19.000000000 +0000
-@@ -241,10 +241,10 @@
-       COLL_METHOD_HANDLER_HEADER
- 
-       rb_ary = RARRAY (ids);
--      ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1));
-+      ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1));
- 
--      for (i = 0; i < rb_ary->len; i++)
--              ary[i] = NUM2UINT (rb_ary->ptr[i]);
-+      for (i = 0; i < RARRAYLEN(rb_ary); i++)
-+              ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]);
- 
-       ary[i] = 0;
- 
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c 
xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c    
2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c 
2009-09-14 09:14:51.000000000 +0000
-@@ -1421,10 +1421,10 @@
-       if (!NIL_P (rb_check_array_type (value))) {
-               struct RArray *ary = RARRAY (value);
- 
--              ret = malloc (sizeof (char *) * (ary->len + 1));
-+              ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1));
- 
--              for (i = 0; i < ary->len; i++)
--                      ret[i] = StringValuePtr (ary->ptr[i]);
-+              for (i = 0; i < RARRAYLEN(ary); i++)
-+                      ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]);
- 
-               ret[i] = NULL;
-       } else {
-@@ -1451,10 +1451,10 @@
-               struct RArray *ary = RARRAY (value);
-               int i;
- 
--              for (i = 0; i < ary->len; i++) {
-+              for (i = 0; i < RARRAYLEN(ary); i++) {
-                       xmmsv_t *elem;
- 
--                      elem = xmmsv_new_string (StringValuePtr (ary->ptr[i]));
-+                      elem = xmmsv_new_string (StringValuePtr 
(RARRAY_PTR(ary)[i]));
-                       xmmsv_list_append (list, elem);
-                       xmmsv_unref (elem);
-               }
-diff -wbBur 
xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h 
xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h   
2009-04-21 17:51:11.000000000 +0000
-+++ 
xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h     
   2009-09-14 09:00:11.000000000 +0000
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 

Reply via email to