On Wed, Dec 05, 2012 at 12:15:11AM +0600, Alexandr Shadchin wrote: > On Mon, Dec 03, 2012 at 09:16:48PM -0500, Brad Smith wrote: > > On Fri, Nov 30, 2012 at 11:28:12AM +0000, Stuart Henderson wrote: > > > On 2012/11/30 05:47, Brad Smith wrote: > > > > ----- Original message ----- > > > > > On 2012/11/28 23:14, Brad Smith wrote: > > > > > > On Thu, Nov 29, 2012 at 12:14:33AM +0600, Alexandr Shadchin wrote: > > > > > > > On Mon, Nov 19, 2012 at 11:33:09PM +0600, Alexandr Shadchin wrote: > > > > > > > > Hi, > > > > > > > > > > > > > > > > This update package deadbeef to the latest release 0.5.6. > > > > > > > > Tested on amd64. > > > > > > > > > > > > > > > > Split package on -main, -gtk2 and -gtk3. > > > > > > > > Please make review this change. > > > > > > > > > > > > > > > > Comments ? OK ? > > > > > > > > > > > > > > > > > > > > > > Fix BUILD_DEPENDS. > > > > > > > > > > > > The gtk2 sub-package should have a @pkgpath marker so upgrading > > > > > > from the older package to the new main + gtk2 package set will > > > > > > have the expected result. > > > > > > > > > > good luck getting that to work ;) > > > > > > > > Am I crazy for expecting that to actually work? I was fairly > > > > certain it would but maybe it is another thing with the pkg tools > > > > that doesn't work. > > > > > > The gtk2 package is named deadbeef-gtk2-0.5.6, so it isn't considered > > > as a replacement for deadbeef-0.5.5, so pkg_add -u doesn't consult the > > > deadbeef-gtk2 package at all to even see the @pkgpath line. > > > > > > One thing that could be done would be to name the -main package > > > something like deadbeef-core-0.5.6, name the -gtk2 package deadbeef-0.5.6, > > > remove @pkgpath in PLIST-main, add @pkgpath in PLIST-gtk2, and add > > > @conflicts > > > as necessary. > > > > Ewww. That's pretty awful. > > > > > More than this would need Quirks.pm to be able to do version comparisons > > > rather than the fast hash lookups, but doing those checks for every > > > updated package will slow down pkg_add -u .. > > > > Or better yet get rid of the nonsense of splitting up the port and > > not having to worry about this stuff at all. > > > > I agree, splitting brings more problems. Update diff.
Although the build infrastructure allows for building both the Gtk+2 and Gtk+3 support the resulting package does not actually work properly trying to use both toolkits. So do what actually makes sense and just build with one of them. I have also improved the way plugins are handled. Index: Makefile =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 10 Aug 2012 17:25:01 -0000 1.2 +++ Makefile 4 Dec 2012 22:45:37 -0000 @@ -3,8 +3,7 @@ SHARED_ONLY = Yes COMMENT = DeaDBeeF is an audio player -DISTNAME = deadbeef-0.5.5 -REVISION = 0 +DISTNAME = deadbeef-0.5.6 CATEGORIES = audio HOMEPAGE = http://deadbeef.sourceforge.net/ @@ -16,16 +15,15 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB += FLAC GL ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage -WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec -WANTLIB += avformat avutil bz2 c cairo cddb cdio crypto curl dbus-1 -WANTLIB += expat faad ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0 -WANTLIB += gtk-x11-2.0 idn m mad mms mp3lame mpcdec ogg orc-0.4 -WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread pthread-stubs schroedinger-1.0 sndfile -WANTLIB += sndio speex ssl theoradec theoraenc vorbis vorbisenc -WANTLIB += vorbisfile vpx wavpack x264 xcb xcb-render xcb-shm -WANTLIB += xvidcore z zip +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 +WANTLIB += atspi avcodec avformat avutil c cairo cairo-gobject +WANTLIB += cddb cdio crypto curl dbus-1 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 gthread-2.0 gtk-3 harfbuzz icudata icule +WANTLIB += icuuc idn m mad mms mpcdec ogg pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs +WANTLIB += sndfile sndio ssl vorbis vorbisfile wavpack xcb xcb-render +WANTLIB += xcb-shm z zip MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/} EXTRACT_SUFX = .tar.bz2 @@ -58,7 +56,7 @@ LIB_DEPENDS = archivers/libzip \ multimedia/libmms \ net/curl \ x11/dbus \ - x11/gtk+2 + x11/gtk+3 USE_GMAKE = Yes USE_LIBTOOL = gnu @@ -81,7 +79,10 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --disable-wildmidi \ --disable-supereq \ --disable-src \ - --disable-mono2stereo + --disable-mono2stereo \ + --disable-abstract-socket \ + --disable-gtk2 \ + --enable-ffmpeg CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/lib/libzip/include -I${X11BASE}/include' \ LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' @@ -93,5 +94,8 @@ post-patch: pre-configure: @cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf + +post-install: + @rm -f ${PREFIX}/lib/deadbeef/*.la .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ distinfo 4 Dec 2012 21:23:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (deadbeef-0.5.5.tar.bz2) = 2dASdvB+kBVdo3+yV8dEr0rMtNoX2gSM5WBMsRdHULc= -SIZE (deadbeef-0.5.5.tar.bz2) = 3219511 +SHA256 (deadbeef-0.5.6.tar.bz2) = F8Ej61DjPIlAPY0wNbkTJGOiJ6aQX9Qry7KjpWFs6ls= +SIZE (deadbeef-0.5.6.tar.bz2) = 3279899 Index: patches/patch-conf_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-conf_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-conf_c --- patches/patch-conf_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-conf_c 4 Dec 2012 21:23:25 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-conf_c,v 1.1.1.1 2012/08 Fix "pthread_mutex_destroy on mutex with waiters!" ---- conf.c.orig Thu May 31 03:15:48 2012 -+++ conf.c Tue Jun 5 21:57:26 2012 -@@ -65,6 +65,7 @@ conf_free (void) { +--- conf.c.orig Fri Oct 19 21:40:14 2012 ++++ conf.c Tue Oct 23 22:32:14 2012 +@@ -72,6 +72,7 @@ conf_free (void) { } conf_items = NULL; changed = 0; Index: patches/patch-configure_ac =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-configure_ac,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-configure_ac --- patches/patch-configure_ac 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-configure_ac 4 Dec 2012 21:23:25 -0000 @@ -1,15 +1,15 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- configure.ac.orig Tue Jun 5 00:10:17 2012 -+++ configure.ac Tue Jun 5 22:05:24 2012 -@@ -110,6 +110,7 @@ AC_ARG_ENABLE(shn, [AS_HELP_STRING([--enable-shn - AC_ARG_ENABLE(psf, [AS_HELP_STRING([--enable-psf ], [build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default: auto)])], [enable_psf=$enableval], [enable_psf=yes]) - AC_ARG_ENABLE(mono2stereo, [AS_HELP_STRING([--enable-mono2stereo ], [build mono2stereo DSP plugin (default: auto)])], [enable_mono2stereo=$enableval], [enable_mono2stereo=yes]) +--- configure.ac.orig Tue Oct 23 01:36:08 2012 ++++ configure.ac Tue Oct 23 22:36:22 2012 +@@ -111,6 +111,7 @@ AC_ARG_ENABLE(mono2stereo, [AS_HELP_STRING([--ena AC_ARG_ENABLE(shellexecui, [AS_HELP_STRING([--enable-shellexecui ], [build shellexec GTK UI plugin (default: auto)])], [enable_shellexecui=$enableval], [enable_shellexecui=yes]) + AC_ARG_ENABLE(alac, [AS_HELP_STRING([--enable-alac ], [build ALAC plugin (default: auto)])], [enable_alac=$enableval], [enable_alac=yes]) + AC_ARG_ENABLE(abstract_socket, [AS_HELP_STRING([--enable-abstract-socket ], [use abstract socket (default: enabled)])], [enable_abstract_socket=$enableval], [enable_abstract_socket=yes]) +AC_ARG_ENABLE(sndio, [AS_HELP_STRING([--enable-sndio ], [enable sndio output plugin (default: enabled)])], [enable_sndio=$enableval], [enable_sndio=yes]) if test "x$enable_staticlink" != "xno" ; then AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version]) -@@ -264,11 +265,11 @@ if test "x$enable_staticlink" != "xno" ; then +@@ -278,11 +279,11 @@ if test "x$enable_staticlink" != "xno" ; then VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a" AC_SUBST(VORBIS_LIBS) else @@ -24,7 +24,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2 AC_SUBST(VORBIS_LIBS) fi fi -@@ -281,10 +282,10 @@ if test "x$enable_staticlink" != "xno" ; then +@@ -295,10 +296,10 @@ if test "x$enable_staticlink" != "xno" ; then FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a" AC_SUBST(FLAC_LIBS) else @@ -37,40 +37,39 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2 AC_SUBST(FLAC_LIBS) fi fi -@@ -588,8 +589,12 @@ if test "x$enable_mono2stereo" != "xno" ; then - HAVE_MONO2STEREO=yes +@@ -603,8 +604,11 @@ if test "x$enable_alac" != "xno" ; then + HAVE_ALAC=yes fi --PLUGINS_DIRS="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/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui" +if test "x$enable_sndio" != "xno" ; then + HAVE_SNDIO=yes +fi -+PLUGINS_DIRS="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/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/sndio" -+ +-PLUGINS_DIRS="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/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac" ++PLUGINS_DIRS="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/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac plugins/sndio" + AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes") - AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes") -@@ -640,6 +645,7 @@ AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STE - AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes") - AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes") - AM_CONDITIONAL(HAVE_ICE, test "x$HAVE_ICE" = "xyes") +@@ -657,6 +661,7 @@ AM_CONDITIONAL(STATICLINK, test "x$STATICLINK" = "xyes + AM_CONDITIONAL(PORTABLE, test "x$PORTABLE" = "xyes") + AM_CONDITIONAL(PORTABLE_FULL, test "x$PORTABLE_FULL" = "xyes") + AM_CONDITIONAL(USE_ABSTRACT_SOCKET_NAME, test "x$USE_ABSTRACT_SOCKET_NAME" = "xyes") +AM_CONDITIONAL(HAVE_SNDIO, test "x$HAVE_SNDIO" = "xyes") AC_SUBST(PLUGINS_DIRS) -@@ -705,6 +711,7 @@ PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, - PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"]) +@@ -724,6 +729,7 @@ PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn] PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"]) PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for configuring shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"]) + PRINT_PLUGIN_INFO([alac],[ALAC plugin],[test "x$HAVE_ALAC" = "xyes"]) +PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"]) echo -@@ -751,6 +758,7 @@ plugins/ao/Makefile - plugins/shn/Makefile +@@ -771,6 +777,7 @@ plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile + plugins/alac/Makefile +plugins/sndio/Makefile intl/Makefile po/Makefile.in Index: patches/patch-junklib_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-junklib_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-junklib_c --- patches/patch-junklib_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-junklib_c 4 Dec 2012 21:23:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-junklib_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- junklib.c.orig Sat May 14 16:45:26 2011 -+++ junklib.c Mon May 16 19:22:06 2011 -@@ -23,7 +23,6 @@ +--- junklib.c.orig Fri Oct 19 21:58:50 2012 ++++ junklib.c Tue Oct 23 22:32:14 2012 +@@ -32,7 +32,6 @@ #include <stdlib.h> #include <string.h> #if HAVE_ICONV Index: patches/patch-playlist_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-playlist_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-playlist_c --- patches/patch-playlist_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-playlist_c 4 Dec 2012 21:23:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-playlist_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- playlist.c.orig Wed May 23 02:34:47 2012 -+++ playlist.c Tue Jun 5 21:57:26 2012 -@@ -53,6 +53,10 @@ +--- playlist.c.orig Fri Oct 19 21:58:50 2012 ++++ playlist.c Tue Oct 23 22:32:14 2012 +@@ -62,6 +62,10 @@ #include "volume.h" #include "pltmeta.h" Index: patches/patch-plugins_aac_Makefile_am =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_aac_Makefile_am,v retrieving revision 1.1 diff -u -p -r1.1 patch-plugins_aac_Makefile_am --- patches/patch-plugins_aac_Makefile_am 10 Aug 2012 17:25:01 -0000 1.1 +++ patches/patch-plugins_aac_Makefile_am 4 Dec 2012 21:23:25 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-plugins_aac_Makefile_am,v 1.1 2012/08/10 17:25:01 shadchin Exp $ ---- plugins/aac/Makefile.am.orig Thu Aug 9 23:40:15 2012 -+++ plugins/aac/Makefile.am Thu Aug 9 23:40:25 2012 -@@ -12,7 +12,7 @@ mp4ff/mp4ff.h\ - mp4ff/mp4ffint.h\ - mp4ff/mp4ff_int_types.h +--- plugins/aac/Makefile.am.orig Fri Oct 19 21:40:14 2012 ++++ plugins/aac/Makefile.am Wed Oct 24 00:05:09 2012 +@@ -13,7 +13,7 @@ aac_la_SOURCES = aac.c aac_parser.c aac_parser.h\ + ../libmp4ff/mp4ffint.h\ + ../libmp4ff/mp4ff_int_types.h -aac_la_LDFLAGS = -module +aac_la_LDFLAGS = -module -avoid-version aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) - AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING + AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I$(aacpath)/../libmp4ff Index: patches/patch-plugins_aac_aac_c =================================================================== RCS file: patches/patch-plugins_aac_aac_c diff -N patches/patch-plugins_aac_aac_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_aac_aac_c 4 Dec 2012 21:23:25 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/aac/aac.c.orig Sun Nov 18 22:47:40 2012 ++++ plugins/aac/aac.c Sun Nov 18 22:47:48 2012 +@@ -29,7 +29,7 @@ + #include "../../deadbeef.h" + #include "aac_parser.h" + +-#include "mp4ff.h" ++#include "../libmp4ff/mp4ff.h" + + #define min(x,y) ((x)<(y)?(x):(y)) + #define max(x,y) ((x)>(y)?(x):(y)) Index: patches/patch-plugins_alac_Makefile_am =================================================================== RCS file: patches/patch-plugins_alac_Makefile_am diff -N patches/patch-plugins_alac_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_alac_Makefile_am 4 Dec 2012 21:23:25 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/alac/Makefile.am.orig Tue Oct 23 22:45:50 2012 ++++ plugins/alac/Makefile.am Tue Oct 23 22:45:58 2012 +@@ -13,7 +13,7 @@ alac.c decomp.h demux.c demux.h stream.c stream.h\ + ../libmp4ff/mp4ffint.h\ + ../libmp4ff/mp4ff_int_types.h + +-alac_la_LDFLAGS = -module ++alac_la_LDFLAGS = -module -avoid-version + + alac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) + AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I../libmp4ff Index: patches/patch-plugins_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-plugins_c --- patches/patch-plugins_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-plugins_c 4 Dec 2012 21:23:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-plugins_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- plugins.c.orig Mon Jun 4 02:56:09 2012 -+++ plugins.c Tue Jun 5 21:57:26 2012 -@@ -1091,7 +1091,7 @@ plug_select_output (void) { +--- plugins.c.orig Fri Oct 19 21:58:50 2012 ++++ plugins.c Tue Oct 23 22:32:14 2012 +@@ -1099,7 +1099,7 @@ plug_select_output (void) { return 0; #else char outplugname[100]; @@ -10,7 +10,7 @@ $OpenBSD: patch-plugins_c,v 1.1.1.1 2012 for (int i = 0; g_output_plugins[i]; i++) { DB_output_t *p = g_output_plugins[i]; if (!strcmp (p->plugin.name, outplugname)) { -@@ -1133,7 +1133,7 @@ plug_reinit_sound (void) { +@@ -1141,7 +1141,7 @@ plug_reinit_sound (void) { if (plug_select_output () < 0) { char outplugname[100]; Index: patches/patch-plugins_converter_Makefile_am =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_converter_Makefile_am,v retrieving revision 1.1 diff -u -p -r1.1 patch-plugins_converter_Makefile_am --- patches/patch-plugins_converter_Makefile_am 10 Aug 2012 17:25:01 -0000 1.1 +++ patches/patch-plugins_converter_Makefile_am 4 Dec 2012 21:23:25 -0000 @@ -1,16 +1,26 @@ $OpenBSD: patch-plugins_converter_Makefile_am,v 1.1 2012/08/10 17:25:01 shadchin Exp $ ---- plugins/converter/Makefile.am.orig Thu Aug 9 23:42:15 2012 -+++ plugins/converter/Makefile.am Thu Aug 9 23:42:42 2012 -@@ -29,10 +29,10 @@ EXTRA_DIST = $(convdata_DATA) converter.glade +--- plugins/converter/Makefile.am.orig Fri Oct 19 21:40:14 2012 ++++ plugins/converter/Makefile.am Tue Oct 23 22:38:25 2012 +@@ -29,11 +29,11 @@ EXTRA_DIST = $(convdata_DATA) converter.glade AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC converter_la_SOURCES = converter.c converter.h -converter_la_LDFLAGS = -module +converter_la_LDFLAGS = -module -avoid-version + if HAVE_GTK2 converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h -converter_gtk2_la_LDFLAGS = -module +converter_gtk2_la_LDFLAGS = -module -avoid-version - endif + if STATICLINK + GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr + +@@ -48,7 +48,7 @@ endif + if HAVE_GTK3 converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +-converter_gtk3_la_LDFLAGS = -module ++converter_gtk3_la_LDFLAGS = -module -avoid-version + if STATICLINK + GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 + Index: patches/patch-plugins_ffmpeg_ffmpeg_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_ffmpeg_ffmpeg_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-plugins_ffmpeg_ffmpeg_c --- patches/patch-plugins_ffmpeg_ffmpeg_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-plugins_ffmpeg_ffmpeg_c 4 Dec 2012 21:23:25 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-plugins_ffmpeg_ffmpeg_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- plugins/ffmpeg/ffmpeg.c.orig Tue May 8 02:49:13 2012 -+++ plugins/ffmpeg/ffmpeg.c Tue May 15 23:44:47 2012 -@@ -51,6 +51,10 @@ - - #endif +--- plugins/ffmpeg/ffmpeg.c.orig Mon Oct 15 00:51:02 2012 ++++ plugins/ffmpeg/ffmpeg.c Tue Oct 23 22:32:14 2012 +@@ -56,6 +56,10 @@ + //#define av_get_bits_per_sample_format av_get_bits_per_sample_fmt + #else +#if defined(__GNUC__) && defined(__STRICT_ANSI__) +#define alloca(size) __builtin_alloca(size) Index: patches/patch-plugins_gtkui_Makefile_am =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_gtkui_Makefile_am,v retrieving revision 1.1 diff -u -p -r1.1 patch-plugins_gtkui_Makefile_am --- patches/patch-plugins_gtkui_Makefile_am 10 Aug 2012 17:25:01 -0000 1.1 +++ patches/patch-plugins_gtkui_Makefile_am 4 Dec 2012 21:23:25 -0000 @@ -1,12 +1,30 @@ $OpenBSD: patch-plugins_gtkui_Makefile_am,v 1.1 2012/08/10 17:25:01 shadchin Exp $ ---- plugins/gtkui/Makefile.am.orig Thu Aug 9 23:56:42 2012 -+++ plugins/gtkui/Makefile.am Thu Aug 9 23:57:02 2012 -@@ -66,7 +66,7 @@ endif - # normal lib +--- plugins/gtkui/Makefile.am.orig Fri Oct 19 21:58:50 2012 ++++ plugins/gtkui/Makefile.am Tue Oct 23 22:40:24 2012 +@@ -76,7 +76,7 @@ endif if HAVE_GTK2 + ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES) -ddb_gui_GTK2_la_LDFLAGS = -module +ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version - ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) - ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) - endif + + if STATICLINK + GTK_ROOT_216=@top_srcdir@/$(LIB)/gtk-2.16.0 +@@ -93,7 +93,7 @@ endif + + if HAVE_GTK3 + ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) +-ddb_gui_GTK3_la_LDFLAGS = -module ++ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version + if STATICLINK + GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 + +@@ -112,7 +112,7 @@ if STATICLINK + GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr + + ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES) +-ddb_gui_GTK2_fallback_la_LDFLAGS = -module ++ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version + + ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la $(SM_LIBADD) + Index: patches/patch-plugins_gtkui_prefwin_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_gtkui_prefwin_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-plugins_gtkui_prefwin_c --- patches/patch-plugins_gtkui_prefwin_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-plugins_gtkui_prefwin_c 4 Dec 2012 21:23:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-plugins_gtkui_prefwin_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- plugins/gtkui/prefwin.c.orig Sat May 19 14:56:40 2012 -+++ plugins/gtkui/prefwin.c Tue Jun 5 21:57:27 2012 -@@ -501,7 +501,7 @@ on_preferences_activate (GtkMenuItem +--- plugins/gtkui/prefwin.c.orig Fri Oct 19 21:58:50 2012 ++++ plugins/gtkui/prefwin.c Tue Oct 23 22:32:15 2012 +@@ -496,7 +496,7 @@ on_preferences_activate (GtkMenuItem // 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); -@@ -714,7 +714,7 @@ on_pref_output_plugin_changed (GtkComboBox +@@ -720,7 +720,7 @@ on_pref_output_plugin_changed (GtkComboBox DB_output_t *new = NULL; deadbeef->conf_lock (); Index: patches/patch-plugins_shellexecui_Makefile_am =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-plugins_shellexecui_Makefile_am,v retrieving revision 1.1 diff -u -p -r1.1 patch-plugins_shellexecui_Makefile_am --- patches/patch-plugins_shellexecui_Makefile_am 10 Aug 2012 17:25:01 -0000 1.1 +++ patches/patch-plugins_shellexecui_Makefile_am 4 Dec 2012 21:23:25 -0000 @@ -1,12 +1,21 @@ $OpenBSD: patch-plugins_shellexecui_Makefile_am,v 1.1 2012/08/10 17:25:01 shadchin Exp $ ---- plugins/shellexecui/Makefile.am.orig Thu Aug 9 23:48:59 2012 -+++ plugins/shellexecui/Makefile.am Thu Aug 9 23:49:13 2012 +--- plugins/shellexecui/Makefile.am.orig Fri Oct 19 21:40:14 2012 ++++ plugins/shellexecui/Makefile.am Tue Oct 23 22:39:28 2012 @@ -18,7 +18,7 @@ AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC if HAVE_GTK2 shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h -shellexecui_gtk2_la_LDFLAGS = -module +shellexecui_gtk2_la_LDFLAGS = -module -avoid-version - endif + if STATICLINK + GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr + +@@ -33,7 +33,7 @@ endif + if HAVE_GTK3 shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h +-shellexecui_gtk3_la_LDFLAGS = -module ++shellexecui_gtk3_la_LDFLAGS = -module -avoid-version + if STATICLINK + GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 + Index: patches/patch-utf8_c =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-utf8_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-utf8_c --- patches/patch-utf8_c 8 Aug 2012 18:06:48 -0000 1.1.1.1 +++ patches/patch-utf8_c 4 Dec 2012 21:23:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-utf8_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $ ---- utf8.c.orig Thu May 3 02:10:22 2012 -+++ utf8.c Tue May 15 23:44:11 2012 -@@ -34,6 +34,10 @@ +--- 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" Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/audio/deadbeef/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 10 Aug 2012 17:25:01 -0000 1.2 +++ pkg/PLIST 4 Dec 2012 22:35:56 -0000 @@ -4,16 +4,12 @@ include/deadbeef/ include/deadbeef/deadbeef.h include/deadbeef/gtkui_api.h lib/deadbeef/ -@comment lib/deadbeef/aac.la lib/deadbeef/aac.so -@comment lib/deadbeef/artwork.la +lib/deadbeef/alac.so lib/deadbeef/artwork.so -@comment lib/deadbeef/cdda.la lib/deadbeef/cdda.so -@comment lib/deadbeef/converter.la lib/deadbeef/converter.so -@comment lib/deadbeef/converter_gtk2.la -lib/deadbeef/converter_gtk2.so +lib/deadbeef/converter_gtk3.so lib/deadbeef/convpresets/ lib/deadbeef/convpresets/AAC_(Nero_FAAC).txt lib/deadbeef/convpresets/FLAC_(compression_level_5).txt @@ -24,57 +20,31 @@ lib/deadbeef/convpresets/MusePack.txt lib/deadbeef/convpresets/Ogg_Vorbis_(-q_5).txt lib/deadbeef/convpresets/TTA.txt lib/deadbeef/convpresets/WavPack.txt -@comment lib/deadbeef/dca.la lib/deadbeef/dca.so -@comment lib/deadbeef/ddb_ao.la lib/deadbeef/ddb_ao.so -@comment lib/deadbeef/ddb_dumb.la lib/deadbeef/ddb_dumb.so -@comment lib/deadbeef/ddb_gui_GTK2.la -lib/deadbeef/ddb_gui_GTK2.so -@comment lib/deadbeef/ddb_shn.la +lib/deadbeef/ddb_gui_GTK3.so lib/deadbeef/ddb_shn.so -@comment lib/deadbeef/ffap.la lib/deadbeef/ffap.so -@comment lib/deadbeef/ffmpeg.la lib/deadbeef/ffmpeg.so -@comment lib/deadbeef/flac.la lib/deadbeef/flac.so -@comment lib/deadbeef/hotkeys.la lib/deadbeef/hotkeys.so -@comment lib/deadbeef/lastfm.la lib/deadbeef/lastfm.so -@comment lib/deadbeef/m3u.la lib/deadbeef/m3u.so -@comment lib/deadbeef/mms.la lib/deadbeef/mms.so -@comment lib/deadbeef/mpgmad.la lib/deadbeef/mpgmad.so -@comment lib/deadbeef/musepack.la lib/deadbeef/musepack.so -@comment lib/deadbeef/notify.la lib/deadbeef/notify.so -@comment lib/deadbeef/nullout.la lib/deadbeef/nullout.so -@comment lib/deadbeef/shellexec.la lib/deadbeef/shellexec.so -@comment lib/deadbeef/shellexecui_gtk2.la -lib/deadbeef/shellexecui_gtk2.so -@comment lib/deadbeef/sndfile.la +lib/deadbeef/shellexecui_gtk3.so lib/deadbeef/sndfile.so -@comment lib/deadbeef/sndio.la lib/deadbeef/sndio.so -@comment lib/deadbeef/tta.la lib/deadbeef/tta.so -@comment lib/deadbeef/vfs_curl.la lib/deadbeef/vfs_curl.so -@comment lib/deadbeef/vfs_zip.la lib/deadbeef/vfs_zip.so -@comment lib/deadbeef/vorbis.la lib/deadbeef/vorbis.so -@comment lib/deadbeef/vtx.la lib/deadbeef/vtx.so -@comment lib/deadbeef/wavpack.la lib/deadbeef/wavpack.so share/applications/deadbeef.desktop share/deadbeef/ @@ -130,8 +100,6 @@ share/locale/it/LC_MESSAGES/deadbeef.mo share/locale/ja/LC_MESSAGES/deadbeef.mo share/locale/kk/LC_MESSAGES/deadbeef.mo share/locale/km/LC_MESSAGES/deadbeef.mo -share/locale/lg/ -share/locale/lg/LC_MESSAGES/ share/locale/lg/LC_MESSAGES/deadbeef.mo share/locale/lt/LC_MESSAGES/deadbeef.mo share/locale/nb/LC_MESSAGES/deadbeef.mo -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
