diff --git a/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild index 8e0694b8b6..9ed6680edf 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.6.2} +VERSION=${VERSION:-0.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,10 +70,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -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" \ ./configure \ @@ -81,6 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-shared \ + --disable-gtk2 \ --build=$ARCH-slackware-linux make @@ -90,8 +87,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING.* ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING.* ChangeLog INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/deadbeef/deadbeef.info b/audio/deadbeef/deadbeef.info index caf5ef6652..1150026bad 100644 --- a/audio/deadbeef/deadbeef.info +++ b/audio/deadbeef/deadbeef.info @@ -1,10 +1,10 @@ PRGNAM="deadbeef" -VERSION="0.6.2" +VERSION="0.7.2" HOMEPAGE="http://deadbeef.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/deadbeef/deadbeef-0.6.2.tar.bz2" -MD5SUM="786f3a01fc9e03e73191d1cce43250a3" +DOWNLOAD="http://downloads.sourceforge.net/deadbeef/deadbeef-0.7.2.tar.bz2" +MD5SUM="f8f5353e7c201fce316f8b082ab408bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="AlexGAV" -EMAIL="alexgav.home[AT]gmail.com" +REQUIRES="jansson" +MAINTAINER="Dugan Chen" +EMAIL="thedoogster [at] gmail [dot] com" diff --git a/audio/deadbeef/plugins_vfs_zip_vfs_zip_c.patch b/audio/deadbeef/plugins_vfs_zip_vfs_zip_c.patch deleted file mode 100644 index 20e53ae643..0000000000 --- a/audio/deadbeef/plugins_vfs_zip_vfs_zip_c.patch +++ /dev/null @@ -1,78 +0,0 @@ -$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; - } -