Hi ports --
Attached is a diff to update both audio/audacious and
audio/audacious-plugins to their latest version, 3.5.2
This needs the libguess update posted earlier.
Works well on amd64.
OK?
~Brian
Index: audacious/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- audacious/Makefile 11 Jan 2014 19:19:43 -0000 1.47
+++ audacious/Makefile 2 Nov 2014 01:18:25 -0000
@@ -4,12 +4,11 @@ SHARED_ONLY = Yes
COMMENT = Gtk+3 media player
-DISTNAME = audacious-3.4.3
+DISTNAME = audacious-3.5.2
-SHARED_LIBS = audclient 3.0 # 2.0
-SHARED_LIBS += audcore 2.1 # 1.0
-SHARED_LIBS += audgui 2.1 # 1.0
-SHARED_LIBS += audtag 2.0 # 1.0
+SHARED_LIBS += audcore 3.0 # 1.0
+SHARED_LIBS += audgui 3.0 # 1.0
+SHARED_LIBS += audtag 2.1 # 1.0
CATEGORIES = audio multimedia
@@ -18,10 +17,10 @@ HOMEPAGE = http://audacious-media-playe
# BSD
PERMIT_PACKAGE_CDROM =Yes
-WANTLIB += atk-1.0 c cairo cairo-gobject dbus-1 dbus-glib-1
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 guess m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread z
+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
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -32,12 +31,9 @@ MODULES = devel/gettext
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+2,-guic
LIB_DEPENDS = devel/libguess \
- x11/dbus-glib \
- x11/dbus \
x11/gtk+3
-MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION} \
- LIBaudcore_VERSION=${LIBaudcore_VERSION} \
+MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
LIBaudgui_VERSION=${LIBaudgui_VERSION} \
LIBaudtag_VERSION=${LIBaudtag_VERSION}
Index: audacious/distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- audacious/distinfo 11 Jan 2014 19:19:43 -0000 1.20
+++ audacious/distinfo 2 Nov 2014 01:18:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.4.3.tar.bz2) = GDRU9N8UguVp0W0UUrPhQBDa6rL7+d/dgs90GnLjnxI=
-SIZE (audacious-3.4.3.tar.bz2) = 485267
+SHA256 (audacious-3.5.2.tar.bz2) = ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
+SIZE (audacious-3.5.2.tar.bz2) = 448436
Index: audacious/patches/patch-buildsys_mk_in
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-buildsys_mk_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-buildsys_mk_in
--- audacious/patches/patch-buildsys_mk_in 23 Oct 2013 19:15:15 -0000 1.6
+++ audacious/patches/patch-buildsys_mk_in 2 Nov 2014 01:18:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-buildsys_mk_in,v 1.6 2013/10/23 19:15:15 naddy Exp $
---- buildsys.mk.in.orig Mon Sep 2 21:01:58 2013
-+++ buildsys.mk.in Mon Oct 21 00:13:00 2013
-@@ -102,7 +102,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+--- buildsys.mk.in.orig Thu Oct 16 20:00:28 2014
++++ buildsys.mk.in Sat Nov 1 19:11:40 2014
+@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
MO_FILES = ${LOCALES:.po=.mo}
@@ -9,4 +9,4 @@ $OpenBSD: patch-buildsys_mk_in,v 1.6 201
+#.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
Index: audacious/patches/patch-src_libaudclient_Makefile
===================================================================
RCS file: audacious/patches/patch-src_libaudclient_Makefile
diff -N audacious/patches/patch-src_libaudclient_Makefile
--- audacious/patches/patch-src_libaudclient_Makefile 23 Oct 2013 19:15:15 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-src_libaudclient_Makefile,v 1.4 2013/10/23 19:15:15 naddy Exp $
---- src/libaudclient/Makefile.orig Mon Sep 2 21:01:58 2013
-+++ src/libaudclient/Makefile Mon Oct 21 00:13:00 2013
-@@ -1,4 +1,4 @@
--SHARED_LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
-+SHARED_LIB = ${LIB_PREFIX}audclient.so.${LIBaudclient_VERSION}
- LIB_MAJOR = 2
- LIB_MINOR = 0
-
Index: audacious/patches/patch-src_libaudcore_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_libaudcore_Makefile
--- audacious/patches/patch-src_libaudcore_Makefile 23 Oct 2013 19:15:15 -0000 1.6
+++ audacious/patches/patch-src_libaudcore_Makefile 2 Nov 2014 01:18:25 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudcore_Makefile,v 1.6 2013/10/23 19:15:15 naddy Exp $
---- src/libaudcore/Makefile.orig Mon Sep 2 21:01:58 2013
-+++ src/libaudcore/Makefile Mon Oct 21 00:13:00 2013
+--- src/libaudcore/Makefile.orig Thu Oct 16 20:00:28 2014
++++ src/libaudcore/Makefile Sat Nov 1 19:11:40 2014
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
- LIB_MAJOR = 1
+ LIB_MAJOR = 2
LIB_MINOR = 0
Index: audacious/patches/patch-src_libaudgui_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudgui_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_libaudgui_Makefile
--- audacious/patches/patch-src_libaudgui_Makefile 23 Oct 2013 19:15:15 -0000 1.3
+++ audacious/patches/patch-src_libaudgui_Makefile 2 Nov 2014 01:18:25 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudgui_Makefile,v 1.3 2013/10/23 19:15:15 naddy Exp $
---- src/libaudgui/Makefile.orig Mon Sep 2 21:01:58 2013
-+++ src/libaudgui/Makefile Mon Oct 21 00:13:00 2013
+--- src/libaudgui/Makefile.orig Thu Oct 16 20:00:28 2014
++++ src/libaudgui/Makefile Sat Nov 1 19:11:40 2014
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audgui.so.${LIBaudgui_VERSION}
- LIB_MAJOR = 1
+ LIB_MAJOR = 2
LIB_MINOR = 0
Index: audacious/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- audacious/pkg/PLIST 11 Jan 2014 19:19:43 -0000 1.19
+++ audacious/pkg/PLIST 2 Nov 2014 01:18:25 -0000
@@ -7,14 +7,13 @@ include/audacious/api-alias-end.h
include/audacious/api-define-begin.h
include/audacious/api-define-end.h
include/audacious/api.h
-include/audacious/audctrl.h
include/audacious/audtag.h
-include/audacious/dbus-service.h
-include/audacious/dbus.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
@@ -30,6 +29,9 @@ include/libaudcore/audstrings.h
include/libaudcore/core.h
include/libaudcore/hook.h
include/libaudcore/index.h
+include/libaudcore/inifile.h
+include/libaudcore/multihash.h
+include/libaudcore/tinylock.h
include/libaudcore/tuple.h
include/libaudcore/vfs.h
include/libaudcore/vfs_async.h
@@ -37,12 +39,11 @@ include/libaudgui/
include/libaudgui/libaudgui-gtk.h
include/libaudgui/libaudgui.h
include/libaudgui/list.h
-@lib lib/libaudclient.so.${LIBaudclient_VERSION}
+include/libaudgui/menu.h
@lib lib/libaudcore.so.${LIBaudcore_VERSION}
@lib lib/libaudgui.so.${LIBaudgui_VERSION}
@lib lib/libaudtag.so.${LIBaudtag_VERSION}
lib/pkgconfig/audacious.pc
-lib/pkgconfig/audclient.pc
@man man/man1/audacious.1
@man man/man1/audtool.1
share/applications/audacious.desktop
@@ -52,13 +53,10 @@ share/audacious/COPYING
share/audacious/images/
share/audacious/images/about-logo.png
share/audacious/images/album.png
-share/audacious/images/audacious.png
+share/audacious/images/appearance.png
share/audacious/images/audio.png
share/audacious/images/connectivity.png
share/audacious/images/info.png
-share/audacious/images/menu_playlist.png
-share/audacious/images/menu_plugin.png
-share/audacious/images/menu_queue_toggle.png
share/audacious/images/playlist.png
share/audacious/images/plugins.png
share/icons/hicolor/48x48/apps/audacious.png
@@ -89,6 +87,7 @@ share/locale/fa_IR/LC_MESSAGES/audacious
share/locale/fi/LC_MESSAGES/audacious.mo
share/locale/fr/LC_MESSAGES/audacious.mo
share/locale/gl/LC_MESSAGES/audacious.mo
+share/locale/he/LC_MESSAGES/audacious.mo
share/locale/hu/LC_MESSAGES/audacious.mo
share/locale/id_ID/
share/locale/id_ID/LC_MESSAGES/
@@ -116,6 +115,10 @@ share/locale/sk/LC_MESSAGES/audacious.mo
share/locale/sq/LC_MESSAGES/audacious.mo
share/locale/sr/LC_MESSAGES/audacious.mo
share/locale/sr@latin/LC_MESSAGES/audacious.mo
+share/locale/sr_RS/
+share/locale/sr_RS/LC_MESSAGES/
+share/locale/sr_RS/LC_MESSAGES/audacious.mo
+share/locale/sv/LC_MESSAGES/audacious.mo
share/locale/ta/LC_MESSAGES/audacious.mo
share/locale/tr/LC_MESSAGES/audacious.mo
share/locale/uk/LC_MESSAGES/audacious.mo
Index: audacious-plugins/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- audacious-plugins/Makefile 11 Jan 2014 19:19:43 -0000 1.63
+++ audacious-plugins/Makefile 2 Nov 2014 01:18:25 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = input and output plugins for Audacious
-V = 3.4.3
+V = 3.5.2
DISTNAME = audacious-plugins-$V
CATEGORIES = audio multimedia
@@ -14,14 +14,14 @@ HOMEPAGE = http://audacious-media-playe
# BSD / GPL
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += FLAC GL X11 Xcomposite Xrender atk-1.0 audcore audgui
-WANTLIB += audtag avcodec avformat avutil c cairo cairo-gobject
-WANTLIB += cddb cdio cdio_cdda cue curl dbus-1 dbus-glib-1
-WANTLIB += faad fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 m mms modplug
-WANTLIB += mp3lame mpg123 neon notify ogg pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio soxr stdc++
-WANTLIB += vorbis vorbisenc vorbisfile wavpack xml2 z
+WANTLIB += FLAC GL X11 Xcomposite Xrender atk-1.0 audgui audtag
+WANTLIB += avcodec avformat avutil c cairo cairo-gobject 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 += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
+WANTLIB += samplerate sndfile sndio soxr stdc++ vorbis vorbisenc
+WANTLIB += vorbisfile wavpack xml2 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
Index: audacious-plugins/distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- audacious-plugins/distinfo 11 Jan 2014 19:19:43 -0000 1.21
+++ audacious-plugins/distinfo 2 Nov 2014 01:18:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.4.3.tar.bz2) = vuZ6j46E2FXUAINnph5mLx5tFdtazNpYfEAl7RJGKAM=
-SIZE (audacious-plugins-3.4.3.tar.bz2) = 1812774
+SHA256 (audacious-plugins-3.5.2.tar.bz2) = F5YA1/iuMafZxXhc5vp+CRhNvRJx4K24xXdgQyxqTNk=
+SIZE (audacious-plugins-3.5.2.tar.bz2) = 1734588
Index: audacious-plugins/patches/patch-buildsys_mk_in
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-buildsys_mk_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-buildsys_mk_in
--- audacious-plugins/patches/patch-buildsys_mk_in 25 Aug 2012 11:30:19 -0000 1.5
+++ audacious-plugins/patches/patch-buildsys_mk_in 2 Nov 2014 01:18:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-buildsys_mk_in,v 1.5 2012/08/25 11:30:19 dcoppa Exp $
---- buildsys.mk.in.orig Sat Aug 11 22:13:39 2012
-+++ buildsys.mk.in Thu Aug 16 13:45:42 2012
-@@ -101,7 +101,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+--- buildsys.mk.in.orig Thu Oct 16 20:01:19 2014
++++ buildsys.mk.in Sat Nov 1 19:44:28 2014
+@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
MO_FILES = ${LOCALES:.po=.mo}
@@ -9,4 +9,4 @@ $OpenBSD: patch-buildsys_mk_in,v 1.5 201
+#.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
Index: audacious-plugins/patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- audacious-plugins/patches/patch-configure 1 Dec 2013 22:37:36 -0000 1.7
+++ audacious-plugins/patches/patch-configure 2 Nov 2014 01:18:25 -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 Fri Nov 1 15:19:49 2013
-+++ configure Fri Nov 29 20:15:57 2013
-@@ -8802,8 +8802,6 @@ $as_echo "yes" >&6; }
+--- 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; }
fi
@@ -14,13 +14,13 @@ polluted very early on, breaking most of
-LIBS="$LIBS $AUDACIOUS_LIBS"
- INPUT_PLUGINS="tonegen metronom vtx"
-@@ -13319,6 +13317,8 @@ fi
- fi
+@@ -12594,6 +12592,8 @@ as_fn_error ()
+ as_fn_exit $as_status
+ } # as_fn_error
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
- plugindir=`pkg-config audacious --variable=plugin_dir`
-
+ # as_fn_set_status STATUS
+ # -----------------------
Index: audacious-plugins/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- audacious-plugins/pkg/PLIST 11 Jan 2014 19:19:43 -0000 1.11
+++ audacious-plugins/pkg/PLIST 2 Nov 2014 01:18:25 -0000
@@ -3,6 +3,7 @@
lib/audacious/
lib/audacious/Container/
lib/audacious/Container/asx.so
+lib/audacious/Container/asx3.so
lib/audacious/Container/audpl.so
lib/audacious/Container/cue.so
lib/audacious/Container/m3u.so
@@ -25,6 +26,7 @@ lib/audacious/General/alarm.so
lib/audacious/General/albumart.so
lib/audacious/General/aosd.so
lib/audacious/General/cd-menu-items.so
+lib/audacious/General/delete-files.so
lib/audacious/General/gnomeshortcuts.so
lib/audacious/General/gtkui.so
lib/audacious/General/hotkey.so
@@ -37,6 +39,7 @@ lib/audacious/General/skins.so
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/cdaudio-ng.so
lib/audacious/Input/console.so
@@ -59,7 +62,6 @@ lib/audacious/Transport/
lib/audacious/Transport/gio.so
lib/audacious/Transport/mms.so
lib/audacious/Transport/neon.so
-lib/audacious/Transport/unix-io.so
lib/audacious/Visualization/
lib/audacious/Visualization/blur_scope.so
lib/audacious/Visualization/cairo-spectrum.so
@@ -191,10 +193,6 @@ share/audacious/Skins/TinyPlayer/text.pn
share/audacious/Skins/TinyPlayer/titlebar.png
share/audacious/Skins/TinyPlayer/viscolor.txt
share/audacious/Skins/TinyPlayer/volume.png
-share/audacious/ui/
-share/audacious/ui/equalizer.ui
-share/audacious/ui/mainwin.ui
-share/audacious/ui/playlist.ui
share/locale/be/LC_MESSAGES/audacious-plugins.mo
share/locale/bg/LC_MESSAGES/audacious-plugins.mo
share/locale/ca/LC_MESSAGES/audacious-plugins.mo
@@ -209,6 +207,7 @@ share/locale/es_AR/LC_MESSAGES/audacious
share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
share/locale/et/LC_MESSAGES/audacious-plugins.mo
share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
share/locale/fi/LC_MESSAGES/audacious-plugins.mo
share/locale/fr/LC_MESSAGES/audacious-plugins.mo
share/locale/gl/LC_MESSAGES/audacious-plugins.mo
@@ -221,15 +220,17 @@ share/locale/ky/LC_MESSAGES/audacious-pl
share/locale/lt/LC_MESSAGES/audacious-plugins.mo
share/locale/lv/LC_MESSAGES/audacious-plugins.mo
share/locale/ml_IN/LC_MESSAGES/audacious-plugins.mo
+share/locale/ms/LC_MESSAGES/audacious-plugins.mo
+share/locale/nl/LC_MESSAGES/audacious-plugins.mo
share/locale/pl/LC_MESSAGES/audacious-plugins.mo
share/locale/pt_BR/LC_MESSAGES/audacious-plugins.mo
share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo
share/locale/ru/LC_MESSAGES/audacious-plugins.mo
share/locale/si/LC_MESSAGES/audacious-plugins.mo
share/locale/sk/LC_MESSAGES/audacious-plugins.mo
-share/locale/sr_RS/
-share/locale/sr_RS/LC_MESSAGES/
+share/locale/sr/LC_MESSAGES/audacious-plugins.mo
share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
+share/locale/sv/LC_MESSAGES/audacious-plugins.mo
share/locale/ta/LC_MESSAGES/audacious-plugins.mo
share/locale/tr/LC_MESSAGES/audacious-plugins.mo
share/locale/uk/LC_MESSAGES/audacious-plugins.mo
