audio/deadbeef: Updated for version 0.6.2.

Patched to build with libzip-1.0.1 (-current).

Signed-off-by: David Spencer <baildon.research@googlemail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 87 insertions, 5 deletions

diff --git a/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild
index 7c1d702f48ea..8e0694b8b61b 100644
--- a/audio/deadbeef/deadbeef.SlackBuild
+++ b/audio/deadbeef/deadbeef.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=deadbeef
-VERSION=${VERSION:-0.5.6}
+VERSION=${VERSION:-0.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,11 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Thanks to Arch for the patch
+# https://projects.archlinux.org/svntogit/community.git/plain/trunk/plugins_vfs_zip_vfs_zip_c.patch?h=packages/deadbeef
+patch plugins/vfs_zip/vfs_zip.c < $CWD/plugins_vfs_zip_vfs_zip_c.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/audio/deadbeef/deadbeef.info b/audio/deadbeef/deadbeef.info
index 793383cd2436..caf5ef665223 100644
--- a/audio/deadbeef/deadbeef.info
+++ b/audio/deadbeef/deadbeef.info
@@ -1,8 +1,8 @@
 PRGNAM="deadbeef"
-VERSION="0.5.6"
+VERSION="0.6.2"
 HOMEPAGE="http://deadbeef.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/deadbeef/deadbeef-0.5.6.tar.bz2"
-MD5SUM="26b6036ca7e59c88267d3de4f42c4d01"
+DOWNLOAD="http://downloads.sourceforge.net/deadbeef/deadbeef-0.6.2.tar.bz2"
+MD5SUM="786f3a01fc9e03e73191d1cce43250a3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/deadbeef/plugins_vfs_zip_vfs_zip_c.patch b/audio/deadbeef/plugins_vfs_zip_vfs_zip_c.patch
new file mode 100644
index 000000000000..20e53ae643e3
--- /dev/null
+++ b/audio/deadbeef/plugins_vfs_zip_vfs_zip_c.patch
@@ -0,0 +1,78 @@
+$OpenBSD: patch-plugins_vfs_zip_vfs_zip_c,v 1.1 2015/05/11 21:22:02 jasper Exp $
+
+s/zip_file_t/db_zip_file_t/g to prevent conflict with new typedef in libzip 1.0.0
+
+--- plugins/vfs_zip/vfs_zip.c.orig	Mon May 11 22:38:19 2015
++++ plugins/vfs_zip/vfs_zip.c	Mon May 11 22:42:05 2015
+@@ -54,7 +54,7 @@ typedef struct {
+     int buffer_remaining;
+     int buffer_pos;
+ #endif
+-} zip_file_t;
++} db_zip_file_t;
+ 
+ static const char *scheme_names[] = { "zip://", NULL };
+ 
+@@ -108,8 +108,8 @@ vfs_zip_open (const char *fname) {
+         return NULL;
+     }
+ 
+-    zip_file_t *f = malloc (sizeof (zip_file_t));
+-    memset (f, 0, sizeof (zip_file_t));
++    db_zip_file_t *f = malloc (sizeof (db_zip_file_t));
++    memset (f, 0, sizeof (db_zip_file_t));
+     f->file.vfs = &plugin;
+     f->z = z;
+     f->zf = zf;
+@@ -122,7 +122,7 @@ vfs_zip_open (const char *fname) {
+ void
+ vfs_zip_close (DB_FILE *f) {
+     trace ("vfs_zip: close\n");
+-    zip_file_t *zf = (zip_file_t *)f;
++    db_zip_file_t *zf = (db_zip_file_t *)f;
+     if (zf->zf) {
+         zip_fclose (zf->zf);
+     }
+@@ -134,7 +134,7 @@ vfs_zip_close (DB_FILE *f) {
+ 
+ size_t
+ vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) {
+-    zip_file_t *zf = (zip_file_t *)f;
++    db_zip_file_t *zf = (db_zip_file_t *)f;
+ //    printf ("read: %d\n", size*nmemb);
+ 
+     size_t sz = size * nmemb;
+@@ -167,7 +167,7 @@ vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB
+ 
+ int
+ vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) {
+-    zip_file_t *zf = (zip_file_t *)f;
++    db_zip_file_t *zf = (db_zip_file_t *)f;
+ //    printf ("seek: %lld (%d)\n", offset, whence);
+ 
+     if (whence == SEEK_CUR) {
+@@ -242,13 +242,13 @@ vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) 
+ 
+ int64_t
+ vfs_zip_tell (DB_FILE *f) {
+-    zip_file_t *zf = (zip_file_t *)f;
++    db_zip_file_t *zf = (db_zip_file_t *)f;
+     return zf->offset;
+ }
+ 
+ void
+ vfs_zip_rewind (DB_FILE *f) {
+-    zip_file_t *zf = (zip_file_t *)f;
++    db_zip_file_t *zf = (db_zip_file_t *)f;
+     zip_fclose (zf->zf);
+     zf->zf = zip_fopen_index (zf->z, zf->index, 0);
+     assert (zf->zf); // FIXME: better error handling?
+@@ -260,7 +260,7 @@ vfs_zip_rewind (DB_FILE *f) {
+ 
+ int64_t
+ vfs_zip_getlength (DB_FILE *f) {
+-    zip_file_t *zf = (zip_file_t *)f;
++    db_zip_file_t *zf = (db_zip_file_t *)f;
+     return zf->size;
+ }
+