Hi ports@,
Below is an attempt to update audio/audacious{,-plugins} to 3.7.2.
The codebase is now C++11 so I included the gcc4 module.
Also, upstream changed back from Gtk+ 3 to Gtk+ 2:
> We have switched back to using GTK+ version 2.x by default. It has
> now been over three years since the release of GTK+ 3.0, and yet
> the "legacy" version of the toolkit provides more features relevant
> to Audacious, better cross-platform support, a more stable API, and
> lower memory usage. Audacious can still be built with GTK3 if
> desired, but we recommend the GTK2 variant for any desktop environment
> other than GNOME 3.
Source: http://audacious-media-player.org/news/32-audacious-3-6-released
So they still provide a Gtk+ 3 version (in a separate distfile) but I
followed their recommendation to switch to Gtk+ 2. I didn't test with
Gnome 3.
Feedback is appreciated.
Best regards,
Caspar Schutijser
Index: audacious/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- audacious/Makefile 18 Mar 2016 21:38:22 -0000 1.54
+++ audacious/Makefile 18 Apr 2016 19:10:21 -0000
@@ -4,14 +4,13 @@ BROKEN-arm = no atomic ops / __sync_fetc
BROKEN-hppa = no atomic ops / __sync_fetch_and_add_4
BROKEN-alpha = tinylock.c:58: internal compiler error: in extract_insn, at
recog.c:2077
-COMMENT = Gtk+3 media player
+COMMENT = Gtk+2 media player
-DISTNAME = audacious-3.5.2
-REVISION = 0
+DISTNAME = audacious-3.7.2
-SHARED_LIBS += audcore 3.0 # 1.0
-SHARED_LIBS += audgui 3.0 # 1.0
-SHARED_LIBS += audtag 2.1 # 1.0
+SHARED_LIBS += audcore 4.0 # 1.0
+SHARED_LIBS += audgui 4.0 # 1.0
+SHARED_LIBS += audtag 3.0 # 1.0
CATEGORIES = audio multimedia
@@ -20,10 +19,11 @@ HOMEPAGE = http://audacious-media-playe
# BSD
PERMIT_PACKAGE_CDROM =Yes
-WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pthread z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk_pixbuf-2.0 gdk-x11-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -31,10 +31,13 @@ EXTRACT_SUFX = .tar.bz2
MODULES = devel/gettext
+MODULES += gcc4
+MODGCC4_ARCHS = *
+MODGCC4_LANGS = c++
+
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS = devel/libguess>=1.2 \
- x11/gtk+3
+LIB_DEPENDS = x11/gtk+2
MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
LIBaudgui_VERSION=${LIBaudgui_VERSION} \
Index: audacious/distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- audacious/distinfo 3 Nov 2014 04:28:11 -0000 1.21
+++ audacious/distinfo 18 Apr 2016 19:10:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.5.2.tar.bz2) = ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
-SIZE (audacious-3.5.2.tar.bz2) = 448436
+SHA256 (audacious-3.7.2.tar.bz2) = BPnqukUizpZ05u2K/HvWtfqaHiQPgJBYn8GHT2ZZ80A=
+SIZE (audacious-3.7.2.tar.bz2) = 572437
Index: audacious/patches/patch-src_libaudcore_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_libaudcore_Makefile
--- audacious/patches/patch-src_libaudcore_Makefile 3 Nov 2014 04:28:11
-0000 1.7
+++ audacious/patches/patch-src_libaudcore_Makefile 18 Apr 2016 19:10:21
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah Exp $
---- src/libaudcore/Makefile.orig Thu Oct 16 20:00:28 2014
-+++ src/libaudcore/Makefile Sat Nov 1 19:11:40 2014
+--- src/libaudcore/Makefile.orig Tue Dec 29 03:28:36 2015
++++ src/libaudcore/Makefile Thu Mar 10 15:19:57 2016
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
- LIB_MAJOR = 2
- LIB_MINOR = 0
+ LIB_MAJOR = 3
+ LIB_MINOR = 1
Index: audacious/patches/patch-src_libaudcore_vfs_h
===================================================================
RCS file: audacious/patches/patch-src_libaudcore_vfs_h
diff -N audacious/patches/patch-src_libaudcore_vfs_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacious/patches/patch-src_libaudcore_vfs_h 18 Apr 2016 19:10:21
-0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+http://gitweb.dragonflybsd.org/dports.git/blob/a58cb0343154ab8705ca5b46e102d693c97784d4:/multimedia/audacious/dragonfly/patch-src_libaudcore_vfs.h
+
+--- src/libaudcore/vfs.h.orig Thu Mar 10 15:20:04 2016
++++ src/libaudcore/vfs.h Thu Mar 10 15:20:22 2016
+@@ -66,6 +66,9 @@ constexpr VFSSeekType to_vfs_seek_type (int whence)
+
+ #endif // WANT_VFS_STDIO_COMPAT
+
++#include <stdio.h>
++#undef feof
++
+ class VFSImpl
+ {
+ public:
Index: audacious/patches/patch-src_libaudgui_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudgui_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_libaudgui_Makefile
--- audacious/patches/patch-src_libaudgui_Makefile 3 Nov 2014 04:28:11
-0000 1.4
+++ audacious/patches/patch-src_libaudgui_Makefile 18 Apr 2016 19:10:21
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudgui_Makefile,v 1.4 2014/11/03 04:28:11 bcallah Exp $
---- src/libaudgui/Makefile.orig Thu Oct 16 20:00:28 2014
-+++ src/libaudgui/Makefile Sat Nov 1 19:11:40 2014
+--- src/libaudgui/Makefile.orig Tue Dec 29 03:28:36 2015
++++ src/libaudgui/Makefile Thu Mar 10 15:19:57 2016
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audgui.so.${LIBaudgui_VERSION}
- LIB_MAJOR = 2
- LIB_MINOR = 0
+ LIB_MAJOR = 3
+ LIB_MINOR = 1
Index: audacious/patches/patch-src_libaudtag_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudtag_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_libaudtag_Makefile
--- audacious/patches/patch-src_libaudtag_Makefile 23 Oct 2013 19:15:15
-0000 1.3
+++ audacious/patches/patch-src_libaudtag_Makefile 18 Apr 2016 19:10:21
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudtag_Makefile,v 1.3 2013/10/23 19:15:15 naddy Exp $
---- src/libaudtag/Makefile.orig Mon Sep 2 21:01:58 2013
-+++ src/libaudtag/Makefile Mon Oct 21 00:13:00 2013
+--- src/libaudtag/Makefile.orig Tue Dec 29 03:28:36 2015
++++ src/libaudtag/Makefile Thu Mar 10 15:19:57 2016
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audtag.so.${LIBaudtag_VERSION}
- LIB_MAJOR = 1
- LIB_MINOR = 0
+ LIB_MAJOR = 2
+ LIB_MINOR = 1
Index: audacious/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- audacious/pkg/PLIST 3 Nov 2014 04:28:11 -0000 1.20
+++ audacious/pkg/PLIST 18 Apr 2016 19:10:21 -0000
@@ -2,39 +2,34 @@
@bin bin/audacious
@bin bin/audtool
include/audacious/
-include/audacious/api-alias-begin.h
-include/audacious/api-alias-end.h
-include/audacious/api-define-begin.h
-include/audacious/api-define-end.h
-include/audacious/api.h
include/audacious/audtag.h
-include/audacious/debug.h
-include/audacious/drct-api.h
-include/audacious/drct.h
-include/audacious/i18n.h
-include/audacious/input-api.h
-include/audacious/input.h
-include/audacious/misc-api.h
-include/audacious/misc.h
-include/audacious/playlist-api.h
-include/audacious/playlist.h
-include/audacious/plugin.h
-include/audacious/plugins-api.h
-include/audacious/plugins.h
-include/audacious/preferences.h
-include/audacious/types.h
include/libaudcore/
include/libaudcore/audio.h
include/libaudcore/audstrings.h
-include/libaudcore/core.h
+include/libaudcore/drct.h
+include/libaudcore/equalizer.h
include/libaudcore/hook.h
+include/libaudcore/i18n.h
include/libaudcore/index.h
include/libaudcore/inifile.h
+include/libaudcore/interface.h
+include/libaudcore/list.h
+include/libaudcore/mainloop.h
include/libaudcore/multihash.h
+include/libaudcore/objects.h
+include/libaudcore/playlist.h
+include/libaudcore/plugin.h
+include/libaudcore/plugins.h
+include/libaudcore/preferences.h
+include/libaudcore/probe.h
+include/libaudcore/ringbuf.h
+include/libaudcore/runtime.h
+include/libaudcore/templates.h
include/libaudcore/tinylock.h
include/libaudcore/tuple.h
include/libaudcore/vfs.h
include/libaudcore/vfs_async.h
+include/libaudcore/visualizer.h
include/libaudgui/
include/libaudgui/libaudgui-gtk.h
include/libaudgui/libaudgui.h
@@ -52,6 +47,7 @@ share/audacious/AUTHORS
share/audacious/COPYING
share/audacious/images/
share/audacious/images/about-logo.png
+share/audacious/images/about-logo.svg
share/audacious/images/album.png
share/audacious/images/appearance.png
share/audacious/images/audio.png
@@ -95,6 +91,8 @@ share/locale/id_ID/LC_MESSAGES/audacious
share/locale/it/LC_MESSAGES/audacious.mo
share/locale/ja/LC_MESSAGES/audacious.mo
share/locale/ko/LC_MESSAGES/audacious.mo
+share/locale/ky/
+share/locale/ky/LC_MESSAGES/
share/locale/ky/LC_MESSAGES/audacious.mo
share/locale/lt/LC_MESSAGES/audacious.mo
share/locale/lv/LC_MESSAGES/audacious.mo
Index: audacious-plugins/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- audacious-plugins/Makefile 18 Mar 2016 21:38:22 -0000 1.67
+++ audacious-plugins/Makefile 18 Apr 2016 19:10:21 -0000
@@ -2,8 +2,7 @@
COMMENT = input and output plugins for Audacious
-V = 3.5.2
-REVISION = 1
+V = 3.7.2
DISTNAME = audacious-plugins-$V
CATEGORIES = audio multimedia
@@ -14,13 +13,15 @@ HOMEPAGE = http://audacious-media-playe
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += FLAC GL X11 Xcomposite Xrender atk-1.0 audgui audtag
-WANTLIB += avcodec avformat avutil c cairo cairo-gobject cddb
+WANTLIB += avcodec avformat avutil c cairo cddb
WANTLIB += cdio cdio_cdda cue curl dbus-1 dbus-glib-1 faad fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-3 m mms modplug mp3lame mpg123 neon
+WANTLIB += freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 m mms modplug mp3lame mpg123 neon
WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
-WANTLIB += samplerate sndfile sndio soxr stdc++ vorbis vorbisenc
+WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc
WANTLIB += vorbisfile wavpack xml2 z
+WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr gdk-x11-2.0
+WANTLIB += gtk-x11-2.0
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -28,6 +29,10 @@ EXTRACT_SUFX = .tar.bz2
MODULES = devel/gettext
+MODULES += gcc4
+MODGCC4_ARCHS = *
+MODGCC4_LANGS = c++
+
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = audio/audacious>=${V}
@@ -52,7 +57,7 @@ LIB_DEPENDS = audio/faad>=2.7 \
net/curl \
net/neon \
textproc/libxml \
- x11/gtk+3 \
+ x11/gtk+2 \
x11/dbus-glib
USE_GMAKE = Yes
Index: audacious-plugins/distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- audacious-plugins/distinfo 3 Nov 2014 04:29:05 -0000 1.22
+++ audacious-plugins/distinfo 18 Apr 2016 19:10:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.5.2.tar.bz2) =
F5YA1/iuMafZxXhc5vp+CRhNvRJx4K24xXdgQyxqTNk=
-SIZE (audacious-plugins-3.5.2.tar.bz2) = 1734588
+SHA256 (audacious-plugins-3.7.2.tar.bz2) =
/PdIjwF4HI9R4K9cq6zdWCsiU3oAhfJqpcpjY3P44f8=
+SIZE (audacious-plugins-3.7.2.tar.bz2) = 1839881
Index: audacious-plugins/patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure
--- audacious-plugins/patches/patch-configure 3 Nov 2014 04:29:05 -0000
1.8
+++ audacious-plugins/patches/patch-configure 18 Apr 2016 19:10:21 -0000
@@ -4,9 +4,9 @@ Set AUDACIOUS_{CFLAGS,LIBS} only after t
This fixes some of the autoconf checks as the LIBS variable is being
polluted very early on, breaking most of the checks using AC_CHECK_LIB.
---- configure.orig Thu Oct 16 20:01:40 2014
-+++ configure Sat Nov 1 19:44:28 2014
-@@ -8098,8 +8098,6 @@ $as_echo "yes" >&6; }
+--- configure.orig Thu Mar 10 15:35:14 2016
++++ configure Thu Mar 10 15:35:16 2016
+@@ -9409,8 +9409,6 @@ $as_echo "yes" >&6; }
fi
@@ -14,8 +14,8 @@ polluted very early on, breaking most of
-LIBS="$LIBS $AUDACIOUS_LIBS"
-
-@@ -12594,6 +12592,8 @@ as_fn_error ()
+ if test $HAVE_DARWIN = yes ; then
+@@ -14148,6 +14146,8 @@ as_fn_error ()
as_fn_exit $as_status
} # as_fn_error
Index: audacious-plugins/patches/patch-src_psf_psx_hw_c
===================================================================
RCS file: audacious-plugins/patches/patch-src_psf_psx_hw_c
diff -N audacious-plugins/patches/patch-src_psf_psx_hw_c
--- audacious-plugins/patches/patch-src_psf_psx_hw_c 9 Dec 2014 20:29:03
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_psf_psx_hw_c,v 1.1 2014/12/09 20:29:03 sthen Exp $
---- src/psf/psx_hw.c.orig Tue Dec 9 20:10:57 2014
-+++ src/psf/psx_hw.c Tue Dec 9 20:11:17 2014
-@@ -1547,7 +1547,7 @@ void psx_bios_hle(uint32_t pc)
- #if DEBUG_HLE_BIOS
- printf("HLEBIOS: srand(%x)\n", a0);
- #endif
-- srand(a0);
-+ srand_deterministic(a0);
- break;
-
- case 0x33: // malloc
Index: audacious-plugins/patches/patch-src_psf_psx_hw_cc
===================================================================
RCS file: audacious-plugins/patches/patch-src_psf_psx_hw_cc
diff -N audacious-plugins/patches/patch-src_psf_psx_hw_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacious-plugins/patches/patch-src_psf_psx_hw_cc 18 Apr 2016 19:10:21
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/psf/psx_hw.cc.orig Fri Apr 15 17:29:23 2016
++++ src/psf/psx_hw.cc Fri Apr 15 17:29:51 2016
+@@ -1546,7 +1546,7 @@ void psx_bios_hle(uint32_t pc)
+ #if DEBUG_HLE_BIOS
+ printf("HLEBIOS: srand(%x)\n", a0);
+ #endif
+- srand(a0);
++ srand_deterministic(a0);
+ break;
+
+ case 0x33: // malloc
Index: audacious-plugins/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- audacious-plugins/pkg/PLIST 3 Nov 2014 04:29:05 -0000 1.12
+++ audacious-plugins/pkg/PLIST 18 Apr 2016 19:10:21 -0000
@@ -17,6 +17,7 @@ lib/audacious/Effect/echo.so
lib/audacious/Effect/ladspa.so
lib/audacious/Effect/mixer.so
lib/audacious/Effect/resample.so
+lib/audacious/Effect/silence-removal.so
lib/audacious/Effect/sox-resampler.so
lib/audacious/Effect/speed-pitch.so
lib/audacious/Effect/stereo.so
@@ -33,6 +34,7 @@ lib/audacious/General/hotkey.so
lib/audacious/General/lyricwiki.so
lib/audacious/General/mpris2.so
lib/audacious/General/notify.so
+lib/audacious/General/playlist-manager.so
lib/audacious/General/scrobbler.so
lib/audacious/General/search-tool.so
lib/audacious/General/skins.so
@@ -40,7 +42,7 @@ lib/audacious/General/song_change.so
lib/audacious/General/statusicon.so
lib/audacious/Input/
lib/audacious/Input/aac-raw.so
-lib/audacious/Input/aac.so
+lib/audacious/Input/adplug.so
lib/audacious/Input/cdaudio-ng.so
lib/audacious/Input/console.so
lib/audacious/Input/ffaudio.so
@@ -57,7 +59,7 @@ lib/audacious/Input/wavpack.so
lib/audacious/Input/xsf.so
lib/audacious/Output/
lib/audacious/Output/filewriter.so
-lib/audacious/Output/sndio.so
+lib/audacious/Output/sndio-ng.so
lib/audacious/Transport/
lib/audacious/Transport/gio.so
lib/audacious/Transport/mms.so
