Date: Wednesday, February 3, 2016 @ 22:26:02
Author: lfleischer
Revision: 160126
archrelease: copy trunk to community-i686, community-x86_64
Added:
deadbeef/repos/community-i686/PKGBUILD
(from rev 160125, deadbeef/trunk/PKGBUILD)
deadbeef/repos/community-i686/deadbeef.install
(from rev 160125, deadbeef/trunk/deadbeef.install)
deadbeef/repos/community-i686/plugins_vfs_zip_vfs_zip_c.patch
(from rev 160125, deadbeef/trunk/plugins_vfs_zip_vfs_zip_c.patch)
deadbeef/repos/community-x86_64/PKGBUILD
(from rev 160125, deadbeef/trunk/PKGBUILD)
deadbeef/repos/community-x86_64/deadbeef.install
(from rev 160125, deadbeef/trunk/deadbeef.install)
deadbeef/repos/community-x86_64/plugins_vfs_zip_vfs_zip_c.patch
(from rev 160125, deadbeef/trunk/plugins_vfs_zip_vfs_zip_c.patch)
Deleted:
deadbeef/repos/community-i686/PKGBUILD
deadbeef/repos/community-i686/deadbeef.install
deadbeef/repos/community-i686/plugins_vfs_zip_vfs_zip_c.patch
deadbeef/repos/community-x86_64/PKGBUILD
deadbeef/repos/community-x86_64/deadbeef.install
deadbeef/repos/community-x86_64/plugins_vfs_zip_vfs_zip_c.patch
--------------------------------------------------+
/PKGBUILD | 96 ++++++++++++
/deadbeef.install | 28 +++
/plugins_vfs_zip_vfs_zip_c.patch | 156 +++++++++++++++++++++
community-i686/PKGBUILD | 58 -------
community-i686/deadbeef.install | 14 -
community-i686/plugins_vfs_zip_vfs_zip_c.patch | 78 ----------
community-x86_64/PKGBUILD | 58 -------
community-x86_64/deadbeef.install | 14 -
community-x86_64/plugins_vfs_zip_vfs_zip_c.patch | 78 ----------
9 files changed, 280 insertions(+), 300 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-02-03 21:25:42 UTC (rev 160125)
+++ community-i686/PKGBUILD 2016-02-03 21:26:02 UTC (rev 160126)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
-# Contributor: Alexey Yakovenko <wa...@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.6.2
-pkgrel=5
-pkgdesc='A GTK+ audio player for GNU/Linux.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack'
'libsndfile' 'libcdio' 'libcddb'
- 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse'
'libzip' 'libsamplerate'
- 'yasm' 'ffmpeg' 'gtk2' 'gtk3')
-optdepends=('gtk2: for the GTK2 interface'
- 'gtk3: for the GTK3 interface'
- 'libsamplerate: for Resampler plugin'
- 'libvorbis: for Ogg Vorbis playback'
- 'libmad: for MP1/MP2/MP3 playback'
- 'flac: for FLAC playback'
- 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
- 'imlib2: for artwork plugin'
- 'wavpack: for WavPack playback'
- 'libsndfile: for Wave playback'
- 'libcdio: audio cd plugin'
- 'libcddb: audio cd plugin'
- 'faad2: for AAC/MP4 support'
- 'dbus: for OSD notifications support'
- 'pulseaudio: for PulseAudio output plugin'
- 'libx11: for global hotkeys plugin'
- 'zlib: for Audio Overload plugin'
- 'libzip: for vfs_zip plugin'
- 'ffmpeg: for ffmpeg plugin')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
- plugins_vfs_zip_vfs_zip_c.patch)
-md5sums=('786f3a01fc9e03e73191d1cce43250a3'
- '710ac295ba30cad843b9239a178b7ee7')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np0 -i ../plugins_vfs_zip_vfs_zip_c.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr
- make
-}
-
-package () {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make prefix="${pkgdir}/usr" install
-}
Copied: deadbeef/repos/community-i686/PKGBUILD (from rev 160125,
deadbeef/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-02-03 21:26:02 UTC (rev 160126)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
+# Contributor: Alexey Yakovenko <wa...@users.sourceforge.net>
+
+pkgname=deadbeef
+pkgver=0.7.0
+pkgrel=1
+pkgdesc='A GTK+ audio player for GNU/Linux.'
+arch=('i686' 'x86_64')
+url='http://deadbeef.sourceforge.net'
+license=('GPL2')
+depends=('alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'jansson')
+makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack'
'libsndfile' 'libcdio' 'libcddb'
+ 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse'
'libzip' 'libsamplerate'
+ 'yasm' 'ffmpeg' 'gtk2' 'gtk3')
+optdepends=('gtk2: for the GTK2 interface'
+ 'gtk3: for the GTK3 interface'
+ 'libsamplerate: for Resampler plugin'
+ 'libvorbis: for Ogg Vorbis playback'
+ 'libmad: for MP1/MP2/MP3 playback'
+ 'flac: for FLAC playback'
+ 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
+ 'imlib2: for artwork plugin'
+ 'wavpack: for WavPack playback'
+ 'libsndfile: for Wave playback'
+ 'libcdio: audio cd plugin'
+ 'libcddb: audio cd plugin'
+ 'faad2: for AAC/MP4 support'
+ 'dbus: for OSD notifications support'
+ 'pulseaudio: for PulseAudio output plugin'
+ 'libx11: for global hotkeys plugin'
+ 'zlib: for Audio Overload plugin'
+ 'libzip: for vfs_zip plugin'
+ 'ffmpeg: for ffmpeg plugin')
+install='deadbeef.install'
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('d5450785139757a016dcd4dfc66479c7')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package () {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make prefix="${pkgdir}/usr" install
+}
Deleted: community-i686/deadbeef.install
===================================================================
--- community-i686/deadbeef.install 2016-02-03 21:25:42 UTC (rev 160125)
+++ community-i686/deadbeef.install 2016-02-03 21:26:02 UTC (rev 160126)
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: deadbeef/repos/community-i686/deadbeef.install (from rev 160125,
deadbeef/trunk/deadbeef.install)
===================================================================
--- community-i686/deadbeef.install (rev 0)
+++ community-i686/deadbeef.install 2016-02-03 21:26:02 UTC (rev 160126)
@@ -0,0 +1,14 @@
+pkgname=deadbeef
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-i686/plugins_vfs_zip_vfs_zip_c.patch
===================================================================
--- community-i686/plugins_vfs_zip_vfs_zip_c.patch 2016-02-03 21:25:42 UTC
(rev 160125)
+++ community-i686/plugins_vfs_zip_vfs_zip_c.patch 2016-02-03 21:26:02 UTC
(rev 160126)
@@ -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;
- }
-
Copied: deadbeef/repos/community-i686/plugins_vfs_zip_vfs_zip_c.patch (from rev
160125, deadbeef/trunk/plugins_vfs_zip_vfs_zip_c.patch)
===================================================================
--- community-i686/plugins_vfs_zip_vfs_zip_c.patch
(rev 0)
+++ community-i686/plugins_vfs_zip_vfs_zip_c.patch 2016-02-03 21:26:02 UTC
(rev 160126)
@@ -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;
+ }
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-02-03 21:25:42 UTC (rev 160125)
+++ community-x86_64/PKGBUILD 2016-02-03 21:26:02 UTC (rev 160126)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
-# Contributor: Alexey Yakovenko <wa...@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.6.2
-pkgrel=5
-pkgdesc='A GTK+ audio player for GNU/Linux.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack'
'libsndfile' 'libcdio' 'libcddb'
- 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse'
'libzip' 'libsamplerate'
- 'yasm' 'ffmpeg' 'gtk2' 'gtk3')
-optdepends=('gtk2: for the GTK2 interface'
- 'gtk3: for the GTK3 interface'
- 'libsamplerate: for Resampler plugin'
- 'libvorbis: for Ogg Vorbis playback'
- 'libmad: for MP1/MP2/MP3 playback'
- 'flac: for FLAC playback'
- 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
- 'imlib2: for artwork plugin'
- 'wavpack: for WavPack playback'
- 'libsndfile: for Wave playback'
- 'libcdio: audio cd plugin'
- 'libcddb: audio cd plugin'
- 'faad2: for AAC/MP4 support'
- 'dbus: for OSD notifications support'
- 'pulseaudio: for PulseAudio output plugin'
- 'libx11: for global hotkeys plugin'
- 'zlib: for Audio Overload plugin'
- 'libzip: for vfs_zip plugin'
- 'ffmpeg: for ffmpeg plugin')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
- plugins_vfs_zip_vfs_zip_c.patch)
-md5sums=('786f3a01fc9e03e73191d1cce43250a3'
- '710ac295ba30cad843b9239a178b7ee7')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np0 -i ../plugins_vfs_zip_vfs_zip_c.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr
- make
-}
-
-package () {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make prefix="${pkgdir}/usr" install
-}
Copied: deadbeef/repos/community-x86_64/PKGBUILD (from rev 160125,
deadbeef/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-02-03 21:26:02 UTC (rev 160126)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
+# Contributor: Alexey Yakovenko <wa...@users.sourceforge.net>
+
+pkgname=deadbeef
+pkgver=0.7.0
+pkgrel=1
+pkgdesc='A GTK+ audio player for GNU/Linux.'
+arch=('i686' 'x86_64')
+url='http://deadbeef.sourceforge.net'
+license=('GPL2')
+depends=('alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'jansson')
+makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack'
'libsndfile' 'libcdio' 'libcddb'
+ 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse'
'libzip' 'libsamplerate'
+ 'yasm' 'ffmpeg' 'gtk2' 'gtk3')
+optdepends=('gtk2: for the GTK2 interface'
+ 'gtk3: for the GTK3 interface'
+ 'libsamplerate: for Resampler plugin'
+ 'libvorbis: for Ogg Vorbis playback'
+ 'libmad: for MP1/MP2/MP3 playback'
+ 'flac: for FLAC playback'
+ 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
+ 'imlib2: for artwork plugin'
+ 'wavpack: for WavPack playback'
+ 'libsndfile: for Wave playback'
+ 'libcdio: audio cd plugin'
+ 'libcddb: audio cd plugin'
+ 'faad2: for AAC/MP4 support'
+ 'dbus: for OSD notifications support'
+ 'pulseaudio: for PulseAudio output plugin'
+ 'libx11: for global hotkeys plugin'
+ 'zlib: for Audio Overload plugin'
+ 'libzip: for vfs_zip plugin'
+ 'ffmpeg: for ffmpeg plugin')
+install='deadbeef.install'
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('d5450785139757a016dcd4dfc66479c7')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package () {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make prefix="${pkgdir}/usr" install
+}
Deleted: community-x86_64/deadbeef.install
===================================================================
--- community-x86_64/deadbeef.install 2016-02-03 21:25:42 UTC (rev 160125)
+++ community-x86_64/deadbeef.install 2016-02-03 21:26:02 UTC (rev 160126)
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: deadbeef/repos/community-x86_64/deadbeef.install (from rev 160125,
deadbeef/trunk/deadbeef.install)
===================================================================
--- community-x86_64/deadbeef.install (rev 0)
+++ community-x86_64/deadbeef.install 2016-02-03 21:26:02 UTC (rev 160126)
@@ -0,0 +1,14 @@
+pkgname=deadbeef
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/plugins_vfs_zip_vfs_zip_c.patch
===================================================================
--- community-x86_64/plugins_vfs_zip_vfs_zip_c.patch 2016-02-03 21:25:42 UTC
(rev 160125)
+++ community-x86_64/plugins_vfs_zip_vfs_zip_c.patch 2016-02-03 21:26:02 UTC
(rev 160126)
@@ -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;
- }
-
Copied: deadbeef/repos/community-x86_64/plugins_vfs_zip_vfs_zip_c.patch (from
rev 160125, deadbeef/trunk/plugins_vfs_zip_vfs_zip_c.patch)
===================================================================
--- community-x86_64/plugins_vfs_zip_vfs_zip_c.patch
(rev 0)
+++ community-x86_64/plugins_vfs_zip_vfs_zip_c.patch 2016-02-03 21:26:02 UTC
(rev 160126)
@@ -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;
+ }
+
