On Tue, 06 Sep 2016, Timo Myyr?? wrote: > Hi, > > Here's new diff, changed the anonymous union to regular struct in mp3.h and > now > it compiles. > > Are the alloca patches required as stdlib.h has definition for it and > compilation gives warnings: > wavpack.c:42:1: warning: "alloca" redefined > In file included from wavpack.c:37: > /usr/include/stdlib.h:270:1: warning: this is the location of the previous > definition > > At least playback works but I can't see individual track names in gui for flac > file. > In any case, here's the updated diff.
Hi! Here's my version of this update (also attached): Removed some now useless patches (the ones causing '"alloca" redefined' warnings). Fixed a problem with the ddb_dumb.so plugin (undefined symbols while loading). Added some useful fixes from upstream git. I think this is ready to be committed. Anyone willing to test and ok it? Ciao, David Index: Makefile =================================================================== RCS file: /cvs/ports/audio/deadbeef/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile 30 Aug 2016 10:20:15 -0000 1.25 +++ Makefile 8 Sep 2016 08:31:02 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.25 2016/08/30 10:20:15 jasper Exp $ COMMENT = DeaDBeeF is an audio player -DISTNAME = deadbeef-0.6.2 -REVISION = 9 +DISTNAME = deadbeef-0.7.2 CATEGORIES = audio HOMEPAGE = http://deadbeef.sourceforge.net/ @@ -16,7 +15,7 @@ WANTLIB += atspi avcodec avformat avutil WANTLIB += cddb cdio crypto curl dbus-1 epoxy expat faad ffi fontconfig WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv -WANTLIB += idn intl m mad mms mp4ff mpcdec nghttp2 ogg pango-1.0 +WANTLIB += idn intl jansson m mad mms mp4ff mpcdec nghttp2 ogg pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread WANTLIB += pthread-stubs sndfile sndio ssl vorbis vorbisenc vorbisfile WANTLIB += wavpack xcb xcb-render xcb-shm z zip @@ -46,6 +45,7 @@ LIB_DEPENDS = archivers/libzip \ audio/libvorbis \ audio/musepack \ audio/wavpack \ + devel/jansson \ graphics/ffmpeg \ graphics/imlib2 \ multimedia/libmms \ Index: distinfo =================================================================== RCS file: /cvs/ports/audio/deadbeef/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 23 Sep 2014 13:44:03 -0000 1.5 +++ distinfo 8 Sep 2016 08:31:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (deadbeef-0.6.2.tar.bz2) = NDO5ZmgyhsA/+8x5siAc1Rf42/a0HahgB3jfqTzWTho= -SIZE (deadbeef-0.6.2.tar.bz2) = 3495920 +SHA256 (deadbeef-0.7.2.tar.bz2) = imOr3wDC83wz4BiuCznTkYc+A3Q0B0uEu0c4G/KDyIQ= +SIZE (deadbeef-0.7.2.tar.bz2) = 4736472 Index: files/Makefile.am =================================================================== RCS file: /cvs/ports/audio/deadbeef/files/Makefile.am,v retrieving revision 1.3 diff -u -p -r1.3 Makefile.am --- files/Makefile.am 23 Sep 2014 13:44:03 -0000 1.3 +++ files/Makefile.am 8 Sep 2016 08:31:02 -0000 @@ -1,6 +1,8 @@ +if HAVE_SNDIO sndiodir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = sndio.la sndio_la_SOURCES = sndio.c sndio_la_LDFLAGS = -module -avoid-version sndio_la_LIBADD = $(LDADD) $(SNDIO_LIBS) AM_CFLAGS = $(CFLAGS) -std=c99 +endif Index: patches/patch-Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-Makefile_am,v retrieving revision 1.4 diff -u -p -r1.4 patch-Makefile_am --- patches/patch-Makefile_am 23 Sep 2014 13:44:03 -0000 1.4 +++ patches/patch-Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_am,v 1.4 2014/09/23 13:44:03 dcoppa Exp $ ---- Makefile.am.orig Thu Jul 31 21:02:28 2014 -+++ Makefile.am Tue Sep 23 09:40:42 2014 -@@ -47,6 +47,9 @@ deadbeef_SOURCES =\ +--- Makefile.am.orig Sun Sep 4 08:48:52 2016 ++++ Makefile.am Sun Sep 4 08:49:05 2016 +@@ -51,6 +51,9 @@ deadbeef_SOURCES =\ sdkdir = $(pkgincludedir) sdk_HEADERS = deadbeef.h Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-configure_ac,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure_ac --- patches/patch-configure_ac 23 Sep 2014 13:44:03 -0000 1.5 +++ patches/patch-configure_ac 8 Sep 2016 08:31:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/09/23 13:44:03 dcoppa Exp $ ---- configure.ac.orig Tue Aug 5 20:01:05 2014 -+++ configure.ac Tue Sep 23 14:32:19 2014 -@@ -82,6 +82,7 @@ AC_ARG_ENABLE(alsa, [AS_HELP_STRING([--disable-als +--- configure.ac.orig Tue Mar 15 21:20:56 2016 ++++ configure.ac Mon Sep 5 08:53:07 2016 +@@ -83,6 +83,7 @@ AC_ARG_ENABLE(alsa, [AS_HELP_STRING([--disable-als AC_ARG_ENABLE(oss, [AS_HELP_STRING([--disable-oss ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes]) AC_ARG_ENABLE(pulse, [AS_HELP_STRING([--disable-pulse ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes]) AC_ARG_ENABLE(coreaudio,[AS_HELP_STRING([--disable-coreaudio], [disable CoreAudio output plugin (default: enabled)])], [enable_coreaudio=$enableval], [enable_coreaudio=yes]) @@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--disable-gtk3 ], [disable GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes]) AC_ARG_ENABLE(gtk2, [AS_HELP_STRING([--disable-gtk2 ], [disable GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes]) AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes]) -@@ -183,8 +184,8 @@ AS_IF([test "${enable_portable}" != "no" -a "${enable_ +@@ -188,8 +189,8 @@ AS_IF([test "${enable_portable}" != "no" -a "${enable_ PREFIXFLAGS=" -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\"" ]) @@ -20,13 +20,13 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ AS_IF([test "${enable_staticlink}" != "no"], [ HAVE_ZLIB=yes -@@ -270,6 +271,16 @@ AS_IF([test "${enable_coreaudio}" != "no" -a "${found_ +@@ -287,6 +288,17 @@ AS_IF([test "${enable_coreaudio}" != "no" -a "${found_ AC_SUBST(COREAUDIO_LIBS) +AC_CHECK_HEADER([sndio.h], [found_sndio_h=yes], [found_sndio_h=no]) -+ -+AS_IF([test "${enable_sndio}" != "no" -a "${found_sndio_h}" != "no"], [ ++AC_CHECK_LIB([sndio], [main], [found_sndio_lib=yes], [found_sndio_lib=no]) ++AS_IF([test "${enable_sndio}" != "no" -a "${found_sndio_h}" != "no" -a "${found_sndio_lib}" != "no"], [ + AC_DEFINE(HAVE_SNDIO, 1, [Build sndio support]) + HAVE_SNDIO=yes + SNDIO_LIBS="-lsndio" @@ -34,10 +34,11 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ + +AC_SUBST(SNDIO_LIBS) + ++ AS_IF([test "${enable_ffmpeg}" != "no"], [ AS_IF([test "${enable_staticlink}" != "no"], [ FFMPEG_DEPS_CFLAGS="-I../../$LIB/include" -@@ -358,11 +369,11 @@ AS_IF([test "${enable_vorbis}" != "no"], [ +@@ -394,11 +406,11 @@ AS_IF([test "${enable_vorbis}" != "no"], [ AC_SUBST(VORBIS_LIBS) AC_SUBST(VORBIS_CFLAGS) ], [ @@ -52,7 +53,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ AC_SUBST(VORBIS_LIBS) ]) ]) -@@ -395,10 +406,10 @@ AS_IF([test "${enable_flac}" != "no"], [ +@@ -430,10 +442,10 @@ AS_IF([test "${enable_flac}" != "no"], [ AC_SUBST(FLAC_CFLAGS) AC_SUBST(FLAC_LIBS) ], [ @@ -65,25 +66,25 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ AC_SUBST(FLAC_LIBS) ]) ]) -@@ -695,7 +706,7 @@ AS_IF([test "${enable_aac}" != "no"], [ +@@ -739,7 +751,7 @@ AS_IF([test "${enable_aac}" != "no"], [ ]) AS_IF([test "${enable_mms}" != "no"], [ - LIBMMS_LIBS="" -+ LIBMMS_LIBS="-lmms" ++ LIBMMS_LIBS="-lmms" AC_SUBST(LIBMMS_LIBS) HAVE_MMS=yes ]) -@@ -748,7 +759,7 @@ AS_IF([test "${enable_pltbrowser}" != "no"], [ - HAVE_PLTBROWSER=yes +@@ -796,7 +808,7 @@ AS_IF([test "${enable_sc68}" != "no"], [ + HAVE_SC68=yes ]) --PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio" -+PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sndio" +-PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68" ++PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/sndio" AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes") AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") -@@ -762,6 +773,7 @@ AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes") +@@ -811,6 +823,7 @@ AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes") AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes") AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_COREAUDIO, test "x$HAVE_COREAUDIO" = "xyes") @@ -91,15 +92,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes") -@@ -841,6 +853,7 @@ PRINT_PLUGIN_INFO([alsa],[ALSA output],[test "x$HAVE_A - PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"]) - PRINT_PLUGIN_INFO([pulse],[PulseAudio output plugin],[test "x$HAVE_PULSEPLUGIN" = "xyes"]) - PRINT_PLUGIN_INFO([coreaudio],[CoreAudio output plugin],[test "x$HAVE_COREAUDIO" = "xyes"]) -+PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"]) - PRINT_PLUGIN_INFO([sid],[SID player based on libsidplay2],[test "x$HAVE_SID" = "xyes"]) - PRINT_PLUGIN_INFO([ffap],[Monkey's audio (APE) decoder],[test "x$HAVE_FFAP" = "xyes"]) - PRINT_PLUGIN_INFO([lastfm],[last.fm scrobbler],[test "x$HAVE_LASTFM" = "xyes"]) -@@ -888,7 +901,6 @@ Makefile +@@ -870,7 +883,6 @@ Makefile pixmaps/Makefile icons/Makefile plugins/liboggedit/Makefile @@ -107,11 +100,19 @@ $OpenBSD: patch-configure_ac,v 1.5 2014/ plugins/libparser/Makefile plugins/gme/Makefile plugins/alsa/Makefile -@@ -933,6 +945,7 @@ plugins/alac/Makefile - plugins/wma/Makefile +@@ -916,6 +928,7 @@ plugins/wma/Makefile plugins/pltbrowser/Makefile + plugins/sc68/Makefile plugins/coreaudio/Makefile +plugins/sndio/Makefile intl/Makefile po/Makefile.in deadbeef.desktop +@@ -952,6 +965,7 @@ PRINT_PLUGIN_INFO([alsa],[ALSA output],[test "x$HAVE_A + PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"]) + PRINT_PLUGIN_INFO([pulse],[PulseAudio output plugin],[test "x$HAVE_PULSEPLUGIN" = "xyes"]) + PRINT_PLUGIN_INFO([coreaudio],[CoreAudio output plugin],[test "x$HAVE_COREAUDIO" = "xyes"]) ++PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"]) + PRINT_PLUGIN_INFO([sid],[SID player based on libsidplay2],[test "x$HAVE_SID" = "xyes"]) + PRINT_PLUGIN_INFO([ffap],[Monkey's audio (APE) decoder],[test "x$HAVE_FFAP" = "xyes"]) + PRINT_PLUGIN_INFO([lastfm],[last.fm scrobbler],[test "x$HAVE_LASTFM" = "xyes"]) Index: patches/patch-junklib_c =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-junklib_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-junklib_c --- patches/patch-junklib_c 23 Sep 2014 13:44:03 -0000 1.3 +++ patches/patch-junklib_c 8 Sep 2016 08:31:02 -0000 @@ -1,20 +1,20 @@ $OpenBSD: patch-junklib_c,v 1.3 2014/09/23 13:44:03 dcoppa Exp $ ---- junklib.c.orig Thu Jul 31 21:03:51 2014 -+++ junklib.c Tue Sep 23 14:54:07 2014 -@@ -32,7 +32,6 @@ - #include <stdlib.h> +--- junklib.c.orig Sun Sep 4 08:55:24 2016 ++++ junklib.c Sun Sep 4 08:56:11 2016 +@@ -33,7 +33,6 @@ #include <string.h> + #undef HAVE_ICI #if HAVE_ICONV - #define LIBICONV_PLUG #include <iconv.h> #elif HAVE_ICU #warning icu -@@ -475,7 +474,7 @@ junk_iconv (const char *in, int inlen, char *out, int +@@ -586,7 +585,7 @@ junk_iconv (const char *in, int inlen, char *out, int if (cd == (iconv_t)-1) { return -1; } -#ifdef __linux__ -+#if defined (__linux__) || defined (__OpenBSD__) ++#if defined(__linux__) || defined (__OpenBSD__) char *pin = (char*)in; #else const char *pin = in; Index: patches/patch-playlist_c =================================================================== RCS file: patches/patch-playlist_c diff -N patches/patch-playlist_c --- patches/patch-playlist_c 23 Sep 2014 13:44:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-playlist_c,v 1.3 2014/09/23 13:44:03 dcoppa Exp $ ---- playlist.c.orig Tue Aug 5 19:54:03 2014 -+++ playlist.c Tue Sep 23 09:40:42 2014 -@@ -67,6 +67,10 @@ - // disable custom title function, until we have new title formatting (0.7) - #define DISABLE_CUSTOM_TITLE - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #define DISABLE_LOCKING 0 - #define DEBUG_LOCKING 0 - #define DETECT_PL_LOCK_RC 0 Index: patches/patch-plugins_aac_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_aac_Makefile_am,v retrieving revision 1.4 diff -u -p -r1.4 patch-plugins_aac_Makefile_am --- patches/patch-plugins_aac_Makefile_am 23 Sep 2014 13:44:03 -0000 1.4 +++ patches/patch-plugins_aac_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,26 +1,27 @@ $OpenBSD: patch-plugins_aac_Makefile_am,v 1.4 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/aac/Makefile.am.orig Tue Sep 23 09:49:32 2014 -+++ plugins/aac/Makefile.am Tue Sep 23 09:52:22 2014 -@@ -2,10 +2,19 @@ if HAVE_AAC - aacpath=@top_srcdir@/plugins/aac - aacdir = $(libdir)/$(PACKAGE) +--- plugins/aac/Makefile.am.orig Sun Sep 4 08:58:27 2016 ++++ plugins/aac/Makefile.am Sun Sep 4 08:59:10 2016 +@@ -1,9 +1,20 @@ + if HAVE_AAC pkglib_LTLIBRARIES = aac.la -aac_la_SOURCES = aac.c aac_parser.c aac_parser.h +aac_la_SOURCES = aac.c aac_parser.c aac_parser.h\ -+ ../libmp4ff/mp4atom.c\ -+ ../libmp4ff/mp4ff.c\ -+ ../libmp4ff/mp4meta.c\ -+ ../libmp4ff/mp4sample.c\ -+ ../libmp4ff/mp4tagupdate.c\ -+ ../libmp4ff/mp4util.c\ -+ ../libmp4ff/mp4ff.h\ -+ ../libmp4ff/mp4ffint.h\ -+ ../libmp4ff/mp4ff_int_types.h ++ ../libmp4ff/mp4atom.c\ ++ ../libmp4ff/mp4ff.c\ ++ ../libmp4ff/mp4meta.c\ ++ ../libmp4ff/mp4sample.c\ ++ ../libmp4ff/mp4tagupdate.c\ ++ ../libmp4ff/mp4util.c\ ++ ../libmp4ff/mp4ff.h\ ++ ../libmp4ff/mp4ffint.h\ ++ ../libmp4ff/mp4ff_int_types.h ++ aac_la_LDFLAGS = -module -avoid-version -aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a -AM_CFLAGS = -I@top_srcdir@/plugins/libmp4ff $(CFLAGS) $(FAAD2_CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING +aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) +AM_CFLAGS = $(CFLAGS) $(FAAD2_CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING ++ endif Index: patches/patch-plugins_alac_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_alac_Makefile_am,v retrieving revision 1.3 diff -u -p -r1.3 patch-plugins_alac_Makefile_am --- patches/patch-plugins_alac_Makefile_am 23 Sep 2014 13:44:03 -0000 1.3 +++ patches/patch-plugins_alac_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-plugins_alac_Makefile_am,v 1.3 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/alac/Makefile.am.orig Tue Sep 23 09:53:00 2014 -+++ plugins/alac/Makefile.am Tue Sep 23 09:54:07 2014 -@@ -6,8 +6,8 @@ alac.c decomp.h demux.c demux.h stream.c stream.h +--- plugins/alac/Makefile.am.orig Sun Sep 4 09:00:25 2016 ++++ plugins/alac/Makefile.am Sun Sep 4 09:00:42 2016 +@@ -5,8 +5,8 @@ alac.c decomp.h demux.c demux.h stream.c stream.h alac_la_LDFLAGS = -module -avoid-version Index: patches/patch-plugins_ao_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_ao_Makefile_am,v retrieving revision 1.2 diff -u -p -r1.2 patch-plugins_ao_Makefile_am --- patches/patch-plugins_ao_Makefile_am 23 Sep 2014 13:44:03 -0000 1.2 +++ patches/patch-plugins_ao_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,17 +1,12 @@ $OpenBSD: patch-plugins_ao_Makefile_am,v 1.2 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/ao/Makefile.am.orig Tue Sep 23 11:40:35 2014 -+++ plugins/ao/Makefile.am Tue Sep 23 11:42:04 2014 -@@ -17,11 +17,11 @@ eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\ +--- plugins/ao/Makefile.am.orig Sun Sep 4 09:02:09 2016 ++++ plugins/ao/Makefile.am Sun Sep 4 09:03:10 2016 +@@ -18,7 +18,7 @@ eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\ eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\ eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h -ddb_ao_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS) +ddb_ao_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS) -lm - EXTRA_DIST=eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c - ddb_ao_la_LIBADD = $(LDADD) --AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC -+AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -fPIC - endif - + AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC Index: patches/patch-plugins_artwork_artwork_c =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_artwork_artwork_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-plugins_artwork_artwork_c --- patches/patch-plugins_artwork_artwork_c 23 Sep 2014 15:03:39 -0000 1.3 +++ patches/patch-plugins_artwork_artwork_c 8 Sep 2016 08:31:02 -0000 @@ -1,33 +1,62 @@ -$OpenBSD: patch-plugins_artwork_artwork_c,v 1.3 2014/09/23 15:03:39 dcoppa Exp $ +$OpenBSD$ -commit 4553baa0e78eb91d7de582b341831fac87e9842c -Author: Alexey Yakovenko <wa...@users.sourceforge.net> -Date: Mon Aug 18 22:32:07 2014 +0200 +commit 045d8a7d0ff3b8647ac42170672b574e42f9dc7e +Author: Alexey Yakovenko <waker...@gmail.com> +Date: Sun Jun 12 22:13:41 2016 +0200 -artwork: crash fix when file mask is empty (bug #1177) +artwork: fix dirname usage ---- plugins/artwork/artwork.c.orig Thu Jul 31 21:03:51 2014 -+++ plugins/artwork/artwork.c Tue Sep 23 16:28:20 2014 -@@ -50,8 +50,13 @@ - #include "lastfm.h" - #include "albumartorg.h" - #include "wos.h" -+#include "../../strdupa.h" - #endif - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #ifdef USE_IMLIB2 - #include <Imlib2.h> - static uintptr_t imlib_mutex; -@@ -970,7 +975,7 @@ fetcher_thread (void *none) - cover_query_t *param = queue; - char path [PATH_MAX]; - struct dirent **files; -- int files_count; -+ int files_count = 0; +--- plugins/artwork/artwork.c.orig Sun Jun 19 13:26:18 2016 ++++ plugins/artwork/artwork.c Wed Sep 7 16:40:41 2016 +@@ -1600,12 +1600,14 @@ path_more_recent (const char *fname, const time_t plac + } + + static int +-recheck_missing_artwork (char *fname, const time_t placeholder_mtime) ++recheck_missing_artwork (const char *input_fname, const time_t placeholder_mtime) + { ++ int res = 0; ++ char *fname = strdup (input_fname); + /* Check if local files could have new associated artwork */ + if (deadbeef->is_local_file (fname)) { + char *vfs_fname = vfs_path (fname); +- char *real_fname = vfs_fname ? vfs_fname : fname; ++ const char *real_fname = vfs_fname ? vfs_fname : fname; + + /* Recheck artwork if file (track or VFS container) was modified since the last check */ + if (path_more_recent (real_fname, placeholder_mtime)) { +@@ -1613,12 +1615,13 @@ recheck_missing_artwork (char *fname, const time_t pla + } + + /* Recheck local artwork if the directory contents have changed */ +- if (artwork_enable_local && path_more_recent (dirname (real_fname), placeholder_mtime)) { +- return 1; +- } ++ char *dname = strdup (dirname (fname)); ++ res = artwork_enable_local && path_more_recent (dname, placeholder_mtime); ++ free (dname); + } + +- return 0; ++ free (fname); ++ return res; + } + + static int +@@ -1635,13 +1638,9 @@ process_query (const cover_query_t *query) + /* Flood control, don't retry missing artwork for an hour unless something changes */ + struct stat placeholder_stat; + if (!stat (cache_path, &placeholder_stat) && placeholder_stat.st_mtime + 60*60 > time (NULL)) { +- char *fname_copy = strdup (query->fname); +- if (fname_copy) { +- int recheck = recheck_missing_artwork (fname_copy, placeholder_stat.st_mtime); +- free (fname_copy); +- if (!recheck) { +- return 0; +- } ++ int recheck = recheck_missing_artwork (query->fname, placeholder_stat.st_mtime); ++ if (!recheck) { ++ return 0; + } + } - make_cache_dir_path (path, sizeof (path), param->artist, -1); - trace ("cache folder: %s\n", path); Index: patches/patch-plugins_artwork_artwork_h =================================================================== RCS file: patches/patch-plugins_artwork_artwork_h diff -N patches/patch-plugins_artwork_artwork_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_artwork_artwork_h 8 Sep 2016 08:31:02 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +commit d08efb4688ce231edf74e507a051379cc307722e +Author: Alexey Yakovenko <waker...@gmail.com> +Date: Mon May 30 22:16:29 2016 +0200 + +artwork: don't include deadbeef.h from API header by relative path + +--- plugins/artwork/artwork.h.orig Sun Jun 19 13:26:18 2016 ++++ plugins/artwork/artwork.h Thu Sep 8 09:29:09 2016 +@@ -24,8 +24,6 @@ + #ifndef __ARTWORK_H + #define __ARTWORK_H + +-#include "../../deadbeef.h" +- + #define DDB_ARTWORK_VERSION 3 + + typedef void (*artwork_callback) (const char *fname, const char *artist, const char *album, void *user_data); Index: patches/patch-plugins_artwork_artwork_internal_c =================================================================== RCS file: patches/patch-plugins_artwork_artwork_internal_c diff -N patches/patch-plugins_artwork_artwork_internal_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_artwork_artwork_internal_c 8 Sep 2016 08:31:02 -0000 @@ -0,0 +1,76 @@ +$OpenBSD$ + +commit 045d8a7d0ff3b8647ac42170672b574e42f9dc7e +Author: Alexey Yakovenko <waker...@gmail.com> +Date: Sun Jun 12 22:13:41 2016 +0200 + +artwork: fix dirname usage + +--- plugins/artwork/artwork_internal.c.orig Sun Jun 19 13:26:18 2016 ++++ plugins/artwork/artwork_internal.c Wed Sep 7 16:40:41 2016 +@@ -109,28 +109,31 @@ check_dir (const char *path) + return 0; + } + +- char* dir = strdup (path); +- if (!dir) { +- return 0; +- } +- +- int good_dir = check_dir (dirname (dir)); ++ char *dir = strdup (path); ++ char *dname = strdup (dirname (dir)); ++ int good_dir = check_dir (dname); + free (dir); ++ free (dname); + return good_dir && !mkdir (path, 0755); + } + +-int ensure_dir (const char *path) +-{ +- char dir[PATH_MAX]; +- strcpy (dir, path); +- dirname (dir); +- trace ("artwork: ensure folder %s exists\n", dir); +- return check_dir (dir); ++// check if directory of a supplied file exists, ++// attempt to create one if it doesn't, ++// return 1 on success. ++int ++ensure_dir (const char *path) { ++ char *dir = strdup (path); ++ char *dname = strdup (dirname (dir)); ++ trace ("artwork: ensure folder %s exists\n", dname); ++ int res = check_dir (dname); ++ free (dir); ++ free (dname); ++ return res; + } + + #define BUFFER_SIZE 4096 +-int copy_file (const char *in, const char *out) +-{ ++int ++copy_file (const char *in, const char *out) { + trace ("copying %s to %s\n", in, out); + + if (!ensure_dir (out)) { +@@ -153,16 +156,12 @@ int copy_file (const char *in, const char *out) + } + + int err = 0; +- int bytes_read; ++ int64_t bytes_read; + size_t file_bytes = 0; + do { + char buffer[BUFFER_SIZE]; + bytes_read = deadbeef->fread (buffer, 1, BUFFER_SIZE, request); +- if (bytes_read < 0 || errno) { +- trace ("artwork: failed to read file %s: %s\n", tmp_out, strerror (errno)); +- err = -1; +- } +- else if (bytes_read > 0 && fwrite (buffer, bytes_read, 1, fout) != 1) { ++ if (bytes_read > 0 && fwrite (buffer, bytes_read, 1, fout) != 1) { + trace ("artwork: failed to write file %s: %s\n", tmp_out, strerror (errno)); + err = -1; + } Index: patches/patch-plugins_c =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_c,v retrieving revision 1.6 diff -u -p -r1.6 patch-plugins_c --- patches/patch-plugins_c 23 Sep 2014 15:03:39 -0000 1.6 +++ patches/patch-plugins_c 8 Sep 2016 08:31:02 -0000 @@ -1,7 +1,16 @@ $OpenBSD: patch-plugins_c,v 1.6 2014/09/23 15:03:39 dcoppa Exp $ ---- plugins.c.orig Tue Aug 5 19:54:03 2014 -+++ plugins.c Tue Sep 23 16:28:20 2014 -@@ -825,7 +825,6 @@ plug_load_all (void) { +--- plugins.c.orig Sun Jun 19 13:26:18 2016 ++++ plugins.c Thu Sep 8 08:25:07 2016 +@@ -750,7 +750,7 @@ load_gui_plugin (const char **plugdirs) { + #endif + + char conf_gui_plug[100]; +- conf_get_str ("gui_plugin", "GTK2", conf_gui_plug, sizeof (conf_gui_plug)); ++ conf_get_str ("gui_plugin", "GTK3", conf_gui_plug, sizeof (conf_gui_plug)); + char name[100]; + + // try to load selected plugin +@@ -917,7 +917,6 @@ plug_load_all (void) { #ifndef ANDROID char *xdg_local_home = getenv ("XDG_LOCAL_HOME"); char xdg_plugin_dir[1024]; @@ -9,7 +18,7 @@ $OpenBSD: patch-plugins_c,v 1.6 2014/09/ if (xdg_local_home) { strncpy (xdg_plugin_dir, xdg_local_home, sizeof (xdg_plugin_dir)); -@@ -846,16 +845,11 @@ plug_load_all (void) { +@@ -938,16 +937,11 @@ plug_load_all (void) { trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home); xdg_plugin_dir[0] = 0; } @@ -27,30 +36,27 @@ $OpenBSD: patch-plugins_c,v 1.6 2014/09/ // If xdg_plugin_dir and dirname is the same, we should avoid each plugin // to be load twice. -@@ -878,7 +872,7 @@ plug_load_all (void) { - } - load_plugin_dir (plugdir, 1); - } -- printf ("load gui plugin\n"); -+ trace ("load gui plugin\n"); - load_gui_plugin (plugins_dirs); - #endif - -@@ -1171,7 +1165,7 @@ plug_select_output (void) { +@@ -1288,8 +1282,10 @@ plug_select_output (void) { return 0; #else char outplugname[100]; -- conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname)); +-#ifdef HAVE_COCOAUI ++#if defined(HAVE_COCOAUI) + conf_get_str ("output_plugin", "CoreAudio", outplugname, sizeof (outplugname)); ++#elif defined(HAVE_SNDIO) + conf_get_str ("output_plugin", "sndio output plugin", outplugname, sizeof (outplugname)); - for (int i = 0; g_output_plugins[i]; i++) { - DB_output_t *p = g_output_plugins[i]; - if (!strcmp (p->plugin.name, outplugname)) { -@@ -1213,7 +1207,7 @@ plug_reinit_sound (void) { + #else + conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname)); + #endif +@@ -1334,8 +1330,10 @@ plug_reinit_sound (void) { if (plug_select_output () < 0) { char outplugname[100]; -- conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname)); +-#ifdef HAVE_COCOAUI ++#if defined(HAVE_COCOAUI) + conf_get_str ("output_plugin", "core audio output plugin", outplugname, sizeof (outplugname)); ++#elif defined(HAVE_SNDIO) + conf_get_str ("output_plugin", "sndio output plugin", outplugname, sizeof (outplugname)); - trace ("failed to select output plugin %s\nreverted to %s\n", outplugname, prev->plugin.name); - output_plugin = prev; - } + #else + conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname)); + #endif Index: patches/patch-plugins_cdda_cdda_c =================================================================== RCS file: patches/patch-plugins_cdda_cdda_c diff -N patches/patch-plugins_cdda_cdda_c --- patches/patch-plugins_cdda_cdda_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins_cdda_cdda_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- plugins/cdda/cdda.c.orig Thu May 31 03:16:28 2012 -+++ plugins/cdda/cdda.c Tue Jun 5 21:57:26 2012 -@@ -52,6 +52,10 @@ - #define SAMPLESIZE 4 //bytes - #define BUFSIZE (CDIO_CD_FRAMESIZE_RAW * 2) - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - static DB_decoder_t plugin; - static DB_functions_t *deadbeef; - Index: patches/patch-plugins_converter_converter_c =================================================================== RCS file: patches/patch-plugins_converter_converter_c diff -N patches/patch-plugins_converter_converter_c --- patches/patch-plugins_converter_converter_c 23 Sep 2014 13:44:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins_converter_converter_c,v 1.3 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/converter/converter.c.orig Thu Jul 31 21:16:23 2014 -+++ plugins/converter/converter.c Tue Sep 23 09:40:43 2014 -@@ -37,6 +37,10 @@ - #include "../../deadbeef.h" - #include "../../strdupa.h" - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #ifndef __linux__ - #define O_LARGEFILE 0 - #endif Index: patches/patch-plugins_dumb_Makefile_am =================================================================== RCS file: patches/patch-plugins_dumb_Makefile_am diff -N patches/patch-plugins_dumb_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_dumb_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -0,0 +1,31 @@ +$OpenBSD$ +--- plugins/dumb/Makefile.am.orig Sun Jun 19 13:26:18 2016 ++++ plugins/dumb/Makefile.am Thu Sep 8 08:09:20 2016 +@@ -4,15 +4,13 @@ EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/Change + if HAVE_DUMB + pkglib_LTLIBRARIES = ddb_dumb.la + +-ddb_dumb_la_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=gnu99 +-ddb_dumb_la_LDFLAGS = -module -avoid-version -lm + if HAVE_SSE2 +-noinst_LIBRARIES = libdumbsse2.a +-libdumbsse2_a_SOURCES = dumb-kode54/src/helpers/resampler_sse2.c +-libdumbsse2_a_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=gnu99 -msse2 -fPIC +-ddb_dumb_la_LIBADD = libdumbsse2.a ++ddb_dumb_la_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=gnu99 -msse2 ++else ++ddb_dumb_la_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=gnu99 + endif + ++ddb_dumb_la_LDFLAGS = -module -avoid-version -lm + + ddb_dumb_la_SOURCES =\ + dumb-kode54/src/it/loadmod2.c\ +@@ -115,4 +113,7 @@ dumb-kode54/src/helpers/resample.inc\ + dumb-kode54/src/helpers/resamp2.inc\ + dumb-kode54/src/helpers/resamp3.inc\ + cdumb.c ++if HAVE_SSE2 ++ddb_dumb_la_SOURCES += dumb-kode54/src/helpers/resampler_sse2.c ++endif + endif Index: patches/patch-plugins_ffmpeg_ffmpeg_c =================================================================== RCS file: patches/patch-plugins_ffmpeg_ffmpeg_c diff -N patches/patch-plugins_ffmpeg_ffmpeg_c --- patches/patch-plugins_ffmpeg_ffmpeg_c 29 Jan 2014 20:43:26 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins_ffmpeg_ffmpeg_c,v 1.3 2014/01/29 20:43:26 dcoppa Exp $ ---- plugins/ffmpeg/ffmpeg.c.orig Sun Nov 24 20:08:38 2013 -+++ plugins/ffmpeg/ffmpeg.c Thu Jan 16 07:57:26 2014 -@@ -60,6 +60,10 @@ - #define av_close_input_file(ctx) avformat_close_input(&(ctx)) - #endif - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - //#define trace(...) { fprintf(stderr, __VA_ARGS__); } - #define trace(fmt,...) - Index: patches/patch-plugins_flac_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_flac_Makefile_am,v retrieving revision 1.2 diff -u -p -r1.2 patch-plugins_flac_Makefile_am --- patches/patch-plugins_flac_Makefile_am 23 Sep 2014 13:44:03 -0000 1.2 +++ patches/patch-plugins_flac_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,20 +1,19 @@ $OpenBSD: patch-plugins_flac_Makefile_am,v 1.2 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/flac/Makefile.am.orig Tue Sep 23 11:15:05 2014 -+++ plugins/flac/Makefile.am Tue Sep 23 11:17:40 2014 -@@ -1,14 +1,22 @@ +--- plugins/flac/Makefile.am.orig Sun Sep 4 09:23:20 2016 ++++ plugins/flac/Makefile.am Sun Sep 4 09:24:00 2016 +@@ -1,13 +1,21 @@ if HAVE_FLAC - flacdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = flac.la -flac_la_SOURCES = flac.c +flac_la_SOURCES = flac.c\ -+ ../liboggedit/oggedit_art.c\ -+ ../liboggedit/oggedit_flac.c\ -+ ../liboggedit/oggedit_internal.c\ -+ ../liboggedit/oggedit_opus.c\ -+ ../liboggedit/oggedit_utils.c\ -+ ../liboggedit/oggedit_vorbis.c\ -+ ../liboggedit/oggedit.h\ -+ ../liboggedit/oggedit_internal.h ++ ../liboggedit/oggedit_art.c\ ++ ../liboggedit/oggedit_flac.c\ ++ ../liboggedit/oggedit_internal.c\ ++ ../liboggedit/oggedit_opus.c\ ++ ../liboggedit/oggedit_utils.c\ ++ ../liboggedit/oggedit_vorbis.c\ ++ ../liboggedit/oggedit.h\ ++ ../liboggedit/oggedit_internal.h + flac_la_LDFLAGS = -module -avoid-version -export-symbols-regex flac_load Index: patches/patch-plugins_flac_flac_c =================================================================== RCS file: patches/patch-plugins_flac_flac_c diff -N patches/patch-plugins_flac_flac_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_flac_flac_c 8 Sep 2016 08:31:02 -0000 @@ -0,0 +1,45 @@ +$OpenBSD$ + +commit aa34db82ba64cc5f8d29b5109ddefd2811ca23e5 +Author: Alexey Yakovenko <waker...@gmail.com> +Date: Mon Aug 8 18:59:29 2016 +0200 + +flac: change embedded cue load order, to reduce a chance of loading +bad-formed native flac cuesheets + +--- plugins/flac/flac.c.orig Sun Jun 19 13:26:18 2016 ++++ plugins/flac/flac.c Wed Sep 7 16:40:48 2016 +@@ -932,16 +932,6 @@ cflac_insert (ddb_playlist_t *plt, DB_playItem_t *afte + + // try embedded cue + deadbeef->pl_lock (); +- if (info.flac_cue_sheet) { +- DB_playItem_t *cue = cflac_insert_with_embedded_cue (plt, after, it, &info.flac_cue_sheet->data.cue_sheet, info.totalsamples, info.info.fmt.samplerate); +- if (cue) { +- cflac_free_temp (_info); +- deadbeef->pl_item_unref (it); +- deadbeef->pl_item_unref (cue); +- deadbeef->pl_unlock (); +- return cue; +- } +- } + const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet"); + if (cuesheet) { + DB_playItem_t *last = deadbeef->plt_insert_cue_from_buffer (plt, after, it, (const uint8_t *)cuesheet, strlen (cuesheet), info.totalsamples, info.info.fmt.samplerate); +@@ -951,6 +941,16 @@ cflac_insert (ddb_playlist_t *plt, DB_playItem_t *afte + deadbeef->pl_item_unref (last); + deadbeef->pl_unlock (); + return last; ++ } ++ } ++ if (info.flac_cue_sheet) { ++ DB_playItem_t *cue = cflac_insert_with_embedded_cue (plt, after, it, &info.flac_cue_sheet->data.cue_sheet, info.totalsamples, info.info.fmt.samplerate); ++ if (cue) { ++ cflac_free_temp (_info); ++ deadbeef->pl_item_unref (it); ++ deadbeef->pl_item_unref (cue); ++ deadbeef->pl_unlock (); ++ return cue; + } + } + deadbeef->pl_unlock (); Index: patches/patch-plugins_gtkui_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_gtkui_Makefile_am,v retrieving revision 1.5 diff -u -p -r1.5 patch-plugins_gtkui_Makefile_am --- patches/patch-plugins_gtkui_Makefile_am 23 Sep 2014 13:44:03 -0000 1.5 +++ patches/patch-plugins_gtkui_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,43 +1,38 @@ $OpenBSD: patch-plugins_gtkui_Makefile_am,v 1.5 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/gtkui/Makefile.am.orig Thu Jul 31 21:02:28 2014 -+++ plugins/gtkui/Makefile.am Tue Sep 23 11:07:10 2014 -@@ -13,6 +13,8 @@ gtkuidir = $(libdir)/$(PACKAGE) - #endif - #endif +--- plugins/gtkui/Makefile.am.orig Sun Sep 4 09:24:27 2016 ++++ plugins/gtkui/Makefile.am Sun Sep 4 09:29:12 2016 +@@ -1,5 +1,7 @@ + EXTRA_DIST = deadbeef.glade +PARSER_SOURCES = ../libparser/parser.c ../libparser/parser.h + if OS_OSX osx_sources = retina.m endif -@@ -151,12 +153,12 @@ GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES) - - #GTKGLEXT_CFLAGS_GTK2 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION - --ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2) -+ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2) $(PARSER_SOURCES) +@@ -72,9 +74,9 @@ GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES) + ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2) ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version --ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS) -+ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT2_LIBS) +-ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(JANSSON_LIBS) ++ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) $(PARSER_SOURCES) $(JANSSON_LIBS) --ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1 -+ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) +-ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) -DDDB_WARN_DEPRECATED=1 ++ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) endif -@@ -225,8 +227,8 @@ GTKGLEXT_CFLAGS_GTK3 = -I@top_srcdir@/plugins/gtkui/gt +@@ -83,8 +85,8 @@ GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES) $(osx_sources) ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version -ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3) --ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS) +-ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(JANSSON_LIBS) +ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3) $(PARSER_SOURCES) -+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT3_LIBS) - ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) - ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) ++ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(PARSER_SOURCES) $(JANSSON_LIBS) + ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) + ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) -@@ -236,10 +238,10 @@ endif +@@ -94,10 +96,10 @@ endif if STATICLINK GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr @@ -45,8 +40,8 @@ $OpenBSD: patch-plugins_gtkui_Makefile_a +ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2) $(PARSER_SOURCES) ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version --ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS) -+ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) $(GTKGLEXT2_LIBS) +-ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(JANSSON_LIBS) ++ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) $(PARSER_SOURCES) $(JANSSON_LIBS) - ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) + ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 $(SM_CFLAGS) $(JANSSON_CFLAGS) Index: patches/patch-plugins_gtkui_coverart_c =================================================================== RCS file: patches/patch-plugins_gtkui_coverart_c diff -N patches/patch-plugins_gtkui_coverart_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_gtkui_coverart_c 8 Sep 2016 08:31:02 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ + +commit d08efb4688ce231edf74e507a051379cc307722e +Author: Alexey Yakovenko <waker...@gmail.com> +Date: Mon May 30 22:16:29 2016 +0200 + +artwork: don't include deadbeef.h from API header by relative path + +--- plugins/gtkui/coverart.c.orig Sun Jun 19 13:26:18 2016 ++++ plugins/gtkui/coverart.c Thu Sep 8 09:29:09 2016 +@@ -30,6 +30,7 @@ + #ifdef __linux__ + #include <sys/prctl.h> + #endif ++#include "../../deadbeef.h" + #include "../artwork/artwork.h" + #include "gtkui.h" + Index: patches/patch-plugins_gtkui_ddblistview_c =================================================================== RCS file: patches/patch-plugins_gtkui_ddblistview_c diff -N patches/patch-plugins_gtkui_ddblistview_c --- patches/patch-plugins_gtkui_ddblistview_c 23 Sep 2014 15:03:39 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,47 +0,0 @@ -$OpenBSD: patch-plugins_gtkui_ddblistview_c,v 1.2 2014/09/23 15:03:39 dcoppa Exp $ - -commit 05f3d65bb98cb7f7756ea6ff2632f7fcda7c9fbb -Author: Alexey Yakovenko <wa...@users.sourceforge.net> -Date: Fri Sep 12 21:24:16 2014 +0200 - -gtkui: fix random crash after closing playlist using menu (bug #1193) - ---- plugins/gtkui/ddblistview.c.orig Thu Jul 31 21:16:23 2014 -+++ plugins/gtkui/ddblistview.c Tue Sep 23 16:28:20 2014 -@@ -33,6 +33,7 @@ - #include "gtkui.h" - #include "support.h" - #include "actionhandlers.h" -+#include "callbacks.h" - - #define min(x,y) ((x)<(y)?(x):(y)) - #define max(x,y) ((x)>(y)?(x):(y)) -@@ -329,6 +330,7 @@ ddb_listview_init(DdbListview *listview) - listview->columns = NULL; - listview->lock_columns = 1; - listview->groups = NULL; -+ listview->plt = NULL; - - listview->block_redraw_on_scroll = 0; - listview->calculated_grouptitle_height = DEFAULT_GROUP_TITLE_HEIGHT; -@@ -3206,6 +3208,10 @@ ddb_listview_free_groups (DdbListview *listview) { - free (listview->groups); - listview->groups = next; - } -+ if (listview->plt) { -+ deadbeef->plt_unref (listview->plt); -+ listview->plt = NULL; -+ } - } - - void -@@ -3214,6 +3220,9 @@ ddb_listview_build_groups (DdbListview *listview) { - int old_height = listview->fullheight; - listview->groups_build_idx = listview->binding->modification_idx (); - ddb_listview_free_groups (listview); -+ -+ listview->plt = deadbeef->plt_get_curr (); -+ - listview->fullheight = 0; - - DdbListviewGroup *grp = NULL; Index: patches/patch-plugins_gtkui_ddblistview_h =================================================================== RCS file: patches/patch-plugins_gtkui_ddblistview_h diff -N patches/patch-plugins_gtkui_ddblistview_h --- patches/patch-plugins_gtkui_ddblistview_h 23 Sep 2014 15:03:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-plugins_gtkui_ddblistview_h,v 1.1 2014/09/23 15:03:39 dcoppa Exp $ - -commit 05f3d65bb98cb7f7756ea6ff2632f7fcda7c9fbb -Author: Alexey Yakovenko <wa...@users.sourceforge.net> -Date: Fri Sep 12 21:24:16 2014 +0200 - -gtkui: fix random crash after closing playlist using menu (bug #1193) - ---- plugins/gtkui/ddblistview.h.orig Thu Jul 31 21:16:23 2014 -+++ plugins/gtkui/ddblistview.h Tue Sep 23 16:28:20 2014 -@@ -22,6 +22,7 @@ - #include <sys/time.h> - #include <stdint.h> - #include "drawing.h" -+#include "../../deadbeef.h" - - // drag and drop targets - enum { -@@ -164,6 +165,7 @@ struct _DdbListview { - struct _DdbListviewColumn *columns; - gboolean lock_columns; - -+ ddb_playlist_t *plt; // current playlist (refcounted), must be unreffed with the group - struct _DdbListviewGroup *groups; - int groups_build_idx; // must be the same as playlist modification idx - int fullheight; Index: patches/patch-plugins_gtkui_prefwin_c =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_gtkui_prefwin_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-plugins_gtkui_prefwin_c --- patches/patch-plugins_gtkui_prefwin_c 23 Sep 2014 13:44:03 -0000 1.5 +++ patches/patch-plugins_gtkui_prefwin_c 8 Sep 2016 08:31:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-plugins_gtkui_prefwin_c,v 1.5 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/gtkui/prefwin.c.orig Thu Jul 31 21:16:23 2014 -+++ plugins/gtkui/prefwin.c Tue Sep 23 09:40:43 2014 -@@ -145,7 +145,7 @@ gtkui_run_preferences_dlg (void) { +--- plugins/gtkui/prefwin.c.orig Sun Sep 4 09:31:09 2016 ++++ plugins/gtkui/prefwin.c Sun Sep 4 09:32:42 2016 +@@ -155,7 +155,7 @@ gtkui_run_preferences_dlg (void) { // output plugin selection combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_output_plugin")); @@ -10,7 +10,7 @@ $OpenBSD: patch-plugins_gtkui_prefwin_c, DB_output_t **out_plugs = deadbeef->plug_get_output_list (); for (int i = 0; out_plugs[i]; i++) { gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), out_plugs[i]->plugin.name); -@@ -392,7 +392,7 @@ on_pref_output_plugin_changed (GtkComboBox +@@ -420,7 +420,7 @@ on_pref_output_plugin_changed (GtkComboBox DB_output_t *new = NULL; deadbeef->conf_lock (); Index: patches/patch-plugins_lastfm_lastfm_c =================================================================== RCS file: patches/patch-plugins_lastfm_lastfm_c diff -N patches/patch-plugins_lastfm_lastfm_c --- patches/patch-plugins_lastfm_lastfm_c 23 Sep 2014 13:44:03 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins_lastfm_lastfm_c,v 1.2 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/lastfm/lastfm.c.orig Thu Jul 31 21:02:29 2014 -+++ plugins/lastfm/lastfm.c Tue Sep 23 09:40:43 2014 -@@ -24,6 +24,10 @@ - #include <math.h> - #include "../../deadbeef.h" - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - //#define trace(...) { fprintf(stderr, __VA_ARGS__); } - #define trace(fmt,...) - Index: patches/patch-plugins_mms_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_mms_Makefile_am,v retrieving revision 1.3 diff -u -p -r1.3 patch-plugins_mms_Makefile_am --- patches/patch-plugins_mms_Makefile_am 23 Sep 2014 13:44:03 -0000 1.3 +++ patches/patch-plugins_mms_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,9 +1,8 @@ $OpenBSD: patch-plugins_mms_Makefile_am,v 1.3 2014/09/23 13:44:03 dcoppa Exp $ ---- plugins/mms/Makefile.am.orig Sat Jul 12 22:30:07 2014 -+++ plugins/mms/Makefile.am Tue Sep 23 14:33:43 2014 -@@ -1,19 +1,7 @@ +--- plugins/mms/Makefile.am.orig Sun Sep 4 09:33:31 2016 ++++ plugins/mms/Makefile.am Sun Sep 4 09:34:06 2016 +@@ -1,18 +1,6 @@ if HAVE_MMS - mmsdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = mms.la -mms_la_SOURCES = mmsplug.c\ - libmms/mms.c\ Index: patches/patch-plugins_mp3_mp3_h =================================================================== RCS file: patches/patch-plugins_mp3_mp3_h diff -N patches/patch-plugins_mp3_mp3_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_mp3_mp3_h 8 Sep 2016 08:31:02 -0000 @@ -0,0 +1,33 @@ +$OpenBSD$ +--- plugins/mp3/mp3.h.orig Sun Jun 19 13:26:18 2016 ++++ plugins/mp3/mp3.h Wed Sep 7 12:56:15 2016 +@@ -110,23 +110,16 @@ typedef struct { + DB_fileinfo_t info; + // input buffer, for MPEG data + buffer_t buffer; +- union { + #ifdef USE_LIBMAD +- struct { +- struct mad_stream mad_stream; +- struct mad_frame mad_frame; +- struct mad_synth mad_synth; +- }; ++ struct mad_stream mad_stream; ++ struct mad_frame mad_frame; ++ struct mad_synth mad_synth; + #endif + #ifdef USE_LIBMPG123 +- struct { +- mpg123_handle *mpg123_handle; +- int mpg123_status; +- unsigned char *mpg123_audio; +- }; ++ mpg123_handle *mpg123_handle; ++ int mpg123_status; ++ unsigned char *mpg123_audio; + #endif +- }; +- + struct mp3_decoder_api_s *dec; + } mp3_info_t; + Index: patches/patch-plugins_vfs_zip_vfs_zip_c =================================================================== RCS file: patches/patch-plugins_vfs_zip_vfs_zip_c diff -N patches/patch-plugins_vfs_zip_vfs_zip_c --- patches/patch-plugins_vfs_zip_vfs_zip_c 12 Oct 2015 10:26:05 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,85 +0,0 @@ -$OpenBSD: patch-plugins_vfs_zip_vfs_zip_c,v 1.2 2015/10/12 10:26:05 dcoppa Exp $ - -commit abec71d101a39e1b58e85749f7beada1f201b4bc -Author: proudzhu <proudzhu....@gmail.com> -Date: Tue May 19 21:26:08 2015 +0800 - -rename zip_file_t to ddb_zip_file_t in vfs_zip.c to fix build with libzip > 1.0.0 - -libzip 1.0.0 introduces a new struct named zip_file_t, thus the origin -code cannot build against it. - ---- 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; -+} ddb_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)); -+ ddb_zip_file_t *f = malloc (sizeof (ddb_zip_file_t)); -+ memset (f, 0, sizeof (ddb_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; -+ ddb_zip_file_t *zf = (ddb_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; -+ ddb_zip_file_t *zf = (ddb_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; -+ ddb_zip_file_t *zf = (ddb_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; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - return zf->offset; - } - - void - vfs_zip_rewind (DB_FILE *f) { -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_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; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - return zf->size; - } - Index: patches/patch-plugins_vorbis_Makefile_am =================================================================== RCS file: /cvs/ports/audio/deadbeef/patches/patch-plugins_vorbis_Makefile_am,v retrieving revision 1.3 diff -u -p -r1.3 patch-plugins_vorbis_Makefile_am --- patches/patch-plugins_vorbis_Makefile_am 23 Sep 2014 13:44:04 -0000 1.3 +++ patches/patch-plugins_vorbis_Makefile_am 8 Sep 2016 08:31:02 -0000 @@ -1,20 +1,19 @@ $OpenBSD: patch-plugins_vorbis_Makefile_am,v 1.3 2014/09/23 13:44:04 dcoppa Exp $ ---- plugins/vorbis/Makefile.am.orig Sun Jul 13 11:45:50 2014 -+++ plugins/vorbis/Makefile.am Tue Sep 23 10:51:15 2014 -@@ -1,9 +1,18 @@ +--- plugins/vorbis/Makefile.am.orig Sun Sep 4 09:36:35 2016 ++++ plugins/vorbis/Makefile.am Sun Sep 4 09:37:03 2016 +@@ -1,8 +1,17 @@ if HAVE_VORBIS - vorbisdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = vorbis.la -vorbis_la_SOURCES = vorbis.c +vorbis_la_SOURCES = vorbis.c\ -+ ../liboggedit/oggedit_art.c\ -+ ../liboggedit/oggedit_flac.c\ -+ ../liboggedit/oggedit_internal.c\ -+ ../liboggedit/oggedit_opus.c\ -+ ../liboggedit/oggedit_utils.c\ -+ ../liboggedit/oggedit_vorbis.c\ -+ ../liboggedit/oggedit.h\ -+ ../liboggedit/oggedit_internal.h ++ ../liboggedit/oggedit_art.c\ ++ ../liboggedit/oggedit_flac.c\ ++ ../liboggedit/oggedit_internal.c\ ++ ../liboggedit/oggedit_opus.c\ ++ ../liboggedit/oggedit_utils.c\ ++ ../liboggedit/oggedit_vorbis.c\ ++ ../liboggedit/oggedit.h\ ++ ../liboggedit/oggedit_internal.h + vorbis_la_LDFLAGS = -module -avoid-version -lm -export-symbols-regex vorbis_load Index: patches/patch-plugins_wavpack_wavpack_c =================================================================== RCS file: patches/patch-plugins_wavpack_wavpack_c diff -N patches/patch-plugins_wavpack_wavpack_c --- patches/patch-plugins_wavpack_wavpack_c 23 Sep 2014 13:44:04 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins_wavpack_wavpack_c,v 1.2 2014/09/23 13:44:04 dcoppa Exp $ ---- plugins/wavpack/wavpack.c.orig Sun Jul 13 11:45:50 2014 -+++ plugins/wavpack/wavpack.c Tue Sep 23 09:40:43 2014 -@@ -38,6 +38,10 @@ - #include <math.h> - #include "../../deadbeef.h" - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #define min(x,y) ((x)<(y)?(x):(y)) - #define max(x,y) ((x)>(y)?(x):(y)) - Index: patches/patch-streamer_c =================================================================== RCS file: patches/patch-streamer_c diff -N patches/patch-streamer_c --- patches/patch-streamer_c 21 Jan 2015 09:22:51 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -$OpenBSD: patch-streamer_c,v 1.3 2015/01/21 09:22:51 dcoppa Exp $ - -commit 7ff29494a449a2c9039920c37f36550efaeb9024 -Author: Alexey Yakovenko <waker...@gmail.com> -Date: Fri Dec 12 22:15:33 2014 +0100 - -streamer: fix resuming network streams after losing network connection - ---- streamer.c.orig Tue Aug 5 12:54:03 2014 -+++ streamer.c Wed Jan 21 03:13:37 2015 -@@ -52,6 +52,10 @@ - #include "plugins/libparser/parser.h" - #include "strdupa.h" - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - //#define trace(...) { fprintf(stderr, __VA_ARGS__); } - #define trace(fmt,...) - -@@ -1014,6 +1018,14 @@ streamer_set_current (playItem_t *it) { - if (dec) { - strncpy (decoder_id, dec, sizeof (decoder_id)); - } -+ -+ if (!decoder_id[0]) { -+ // some decoders set filetype override, -+ // but the override is invalid when decoder is not set. -+ // reset to default here, so that tracks become playable after failures -+ pl_delete_meta(it, "!FILETYPE"); -+ } -+ - const char *ft = pl_find_meta (it, ":FILETYPE"); - if (ft) { - strncpy (filetype, ft, sizeof (filetype)); Index: patches/patch-utf8_c =================================================================== RCS file: patches/patch-utf8_c diff -N patches/patch-utf8_c --- patches/patch-utf8_c 3 Jan 2013 11:54:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-utf8_c,v 1.2 2013/01/03 11:54:49 shadchin Exp $ ---- utf8.c.orig Fri Oct 19 21:40:14 2012 -+++ utf8.c Tue Oct 23 22:32:16 2012 -@@ -45,6 +45,10 @@ - #include "utf8.h" - #include "u8_lc_map.h" - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - static const uint32_t offsetsFromUTF8[6] = { - 0x00000000UL, 0x00003080UL, 0x000E2080UL, - 0x03C82080UL, 0xFA082080UL, 0x82082080UL Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/deadbeef/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 22 Aug 2016 09:06:40 -0000 1.8 +++ pkg/PLIST 8 Sep 2016 08:31:02 -0000 @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST,v 1.8 2016/08/22 09:06:40 mpi Exp $ @bin bin/deadbeef include/deadbeef/ +include/deadbeef/artwork.h include/deadbeef/deadbeef.h include/deadbeef/gtkui_api.h lib/deadbeef/ @@ -23,6 +24,103 @@ lib/deadbeef/convpresets/Ogg_Vorbis_(-q_ lib/deadbeef/convpresets/Opus.txt lib/deadbeef/convpresets/TTA.txt lib/deadbeef/convpresets/WavPack.txt +lib/deadbeef/data68/ +lib/deadbeef/data68/Replay/ +lib/deadbeef/data68/Replay/aenigmatica.bin +lib/deadbeef/data68/Replay/alteredbeast.bin +lib/deadbeef/data68/Replay/armalyte.bin +lib/deadbeef/data68/Replay/asidifier.bin +lib/deadbeef/data68/Replay/azidifier.bin +lib/deadbeef/data68/Replay/bendaglish.deli.bin +lib/deadbeef/data68/Replay/big.bin +lib/deadbeef/data68/Replay/blipblop.bin +lib/deadbeef/data68/Replay/blipp079.bin +lib/deadbeef/data68/Replay/bs22.bin +lib/deadbeef/data68/Replay/cabal.bin +lib/deadbeef/data68/Replay/chipmon2.bin +lib/deadbeef/data68/Replay/cosotfmx.bin +lib/deadbeef/data68/Replay/crapman1.bin +lib/deadbeef/data68/Replay/crapman2.bin +lib/deadbeef/data68/Replay/deltamusic1.bin +lib/deadbeef/data68/Replay/deltamusic2.bin +lib/deadbeef/data68/Replay/digitfmx.bin +lib/deadbeef/data68/Replay/dmu.bin +lib/deadbeef/data68/Replay/dwaga.bin +lib/deadbeef/data68/Replay/dyter07.bin +lib/deadbeef/data68/Replay/elf.bin +lib/deadbeef/data68/Replay/fc13_14.bin +lib/deadbeef/data68/Replay/fireice.bin +lib/deadbeef/data68/Replay/fred.bin +lib/deadbeef/data68/Replay/gemx.bin +lib/deadbeef/data68/Replay/harlequin.bin +lib/deadbeef/data68/Replay/hippel-coso_note.deli.bin +lib/deadbeef/data68/Replay/hpn-jam.bin +lib/deadbeef/data68/Replay/huelsbeck.bin +lib/deadbeef/data68/Replay/huntforredoct.bin +lib/deadbeef/data68/Replay/ivanhoe.bin +lib/deadbeef/data68/Replay/jamcracker10.bin +lib/deadbeef/data68/Replay/jamcrackerpro.bin +lib/deadbeef/data68/Replay/lastninja3.bin +lib/deadbeef/data68/Replay/lastninjaiii.bin +lib/deadbeef/data68/Replay/lcd.bin +lib/deadbeef/data68/Replay/lx_mmme.bin +lib/deadbeef/data68/Replay/mcoder.bin +lib/deadbeef/data68/Replay/megatizer.bin +lib/deadbeef/data68/Replay/metrocross.bin +lib/deadbeef/data68/Replay/midi.bin +lib/deadbeef/data68/Replay/mmme.bin +lib/deadbeef/data68/Replay/mmmesid.bin +lib/deadbeef/data68/Replay/mon.bin +lib/deadbeef/data68/Replay/mon_old.deli.bin +lib/deadbeef/data68/Replay/musmon1.bin +lib/deadbeef/data68/Replay/musmon2.bin +lib/deadbeef/data68/Replay/ninjaremix.bin +lib/deadbeef/data68/Replay/ninjatfmx.bin +lib/deadbeef/data68/Replay/nobuddiesland.bin +lib/deadbeef/data68/Replay/none.bin +lib/deadbeef/data68/Replay/note.bin +lib/deadbeef/data68/Replay/note2.bin +lib/deadbeef/data68/Replay/page.bin +lib/deadbeef/data68/Replay/protracker.bin +lib/deadbeef/data68/Replay/psg1.bin +lib/deadbeef/data68/Replay/psgtrackerv2.bin +lib/deadbeef/data68/Replay/puma.bin +lib/deadbeef/data68/Replay/puma2.bin +lib/deadbeef/data68/Replay/quartet.bin +lib/deadbeef/data68/Replay/quartet_mindbomb.bin +lib/deadbeef/data68/Replay/realms.bin +lib/deadbeef/data68/Replay/robhubbard.deli.bin +lib/deadbeef/data68/Replay/rollingronny.bin +lib/deadbeef/data68/Replay/shadowdancer.bin +lib/deadbeef/data68/Replay/sidmon1.bin +lib/deadbeef/data68/Replay/sidmon2.bin +lib/deadbeef/data68/Replay/sidsound.bin +lib/deadbeef/data68/Replay/sndh_ice.bin +lib/deadbeef/data68/Replay/soundfx.bin +lib/deadbeef/data68/Replay/spacecrusade.bin +lib/deadbeef/data68/Replay/spacegun.bin +lib/deadbeef/data68/Replay/ssd1.bin +lib/deadbeef/data68/Replay/stos.bin +lib/deadbeef/data68/Replay/synthiv.bin +lib/deadbeef/data68/Replay/tao_digi.bin +lib/deadbeef/data68/Replay/tao_hubbard.bin +lib/deadbeef/data68/Replay/tao_ms211.bin +lib/deadbeef/data68/Replay/tao_ms25.bin +lib/deadbeef/data68/Replay/tao_ms27.bin +lib/deadbeef/data68/Replay/tao_tsd.bin +lib/deadbeef/data68/Replay/tcbtracker.bin +lib/deadbeef/data68/Replay/test.bin +lib/deadbeef/data68/Replay/tfmx.bin +lib/deadbeef/data68/Replay/tfmx_aga.bin +lib/deadbeef/data68/Replay/tfmx_old.bin +lib/deadbeef/data68/Replay/tfmx_st.bin +lib/deadbeef/data68/Replay/timerc.bin +lib/deadbeef/data68/Replay/toki.bin +lib/deadbeef/data68/Replay/tsd1.bin +lib/deadbeef/data68/Replay/utopia.bin +lib/deadbeef/data68/Replay/vikingchild.bin +lib/deadbeef/data68/Replay/xbiossound.bin +lib/deadbeef/data68/Replay/zonewarrior.bin lib/deadbeef/dca.so lib/deadbeef/ddb_ao.so lib/deadbeef/ddb_dumb.so @@ -32,10 +130,11 @@ lib/deadbeef/ffap.so lib/deadbeef/ffmpeg.so lib/deadbeef/flac.so lib/deadbeef/hotkeys.so +lib/deadbeef/in_sc68.so lib/deadbeef/lastfm.so lib/deadbeef/m3u.so lib/deadbeef/mms.so -lib/deadbeef/mpgmad.so +lib/deadbeef/mp3.so lib/deadbeef/musepack.so lib/deadbeef/notify.so lib/deadbeef/nullout.so @@ -106,6 +205,7 @@ share/locale/kk/LC_MESSAGES/deadbeef.mo share/locale/km/LC_MESSAGES/deadbeef.mo share/locale/lg/LC_MESSAGES/deadbeef.mo share/locale/lt/LC_MESSAGES/deadbeef.mo +share/locale/lv/LC_MESSAGES/deadbeef.mo share/locale/nl/LC_MESSAGES/deadbeef.mo share/locale/pl/LC_MESSAGES/deadbeef.mo share/locale/pt/LC_MESSAGES/deadbeef.mo
deadbeef-0.7.2_dcoppa.diff.gz
Description: application/gunzip
