Hi,
Here's update to bring audacious-plugins to latest version. Requires update to
audacious port itself I sent earlier.
The diff is a bit off, I couldn't restore updated patch-configure so here's the
updated patch-configure file inline:
$OpenBSD$
Set AUDACIOUS_{CFLAGS,LIBS} only after the end of all plugin checks.
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.
Index: configure
--- configure.orig
+++ configure
@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
fi
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
-LIBS="$LIBS $AUDACIOUS_LIBS"
if test $HAVE_DARWIN = yes ; then
@@ -14657,6 +14655,8 @@ as_fn_error ()
as_fn_exit $as_status
} # as_fn_error
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
# as_fn_set_status STATUS
# -----------------------
And here's the rest of the diff without the above bits.
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 26 Jul 2017 22:45:14 -0000 1.71
+++ Makefile 6 Sep 2017 10:26:10 -0000
@@ -2,8 +2,7 @@
COMMENT = input and output plugins for Audacious
-V = 3.5.2
-REVISION = 3
+V = 3.9
DISTNAME = audacious-plugins-$V
CATEGORIES = audio multimedia
@@ -13,14 +12,15 @@ HOMEPAGE = http://audacious-media-playe
# BSD / GPL
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 += 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 ${COMPILER_LIBCXX} vorbis vorbisenc
-WANTLIB += vorbisfile wavpack xml2 z
+WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
+WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
+WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gtk-x11-2.0 m mms modplug mp3lame mpg123
+WANTLIB += neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
+WANTLIB += wavpack xml2 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -52,7 +52,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: distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo 3 Nov 2014 04:29:05 -0000 1.22
+++ distinfo 6 Sep 2017 10:26:10 -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.9.tar.bz2) =
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
+SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
Index: patches/patch-src_psf_psx_hw_c
===================================================================
RCS file: patches/patch-src_psf_psx_hw_c
diff -N patches/patch-src_psf_psx_hw_c
--- 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: patches/patch-src_psf_psx_hw_cc
===================================================================
RCS file: patches/patch-src_psf_psx_hw_cc
diff -N patches/patch-src_psf_psx_hw_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_psf_psx_hw_cc 6 Sep 2017 10:26:10 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+change some srand to srand_deterministic, found by deraadt@
+
+Index: src/psf/psx_hw.cc
+--- src/psf/psx_hw.cc.orig
++++ src/psf/psx_hw.cc
+@@ -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: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 3 Nov 2014 04:29:05 -0000 1.12
+++ pkg/PLIST 6 Sep 2017 10:26:10 -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
@@ -193,6 +195,7 @@ 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/locale/ar/LC_MESSAGES/audacious-plugins.mo
share/locale/be/LC_MESSAGES/audacious-plugins.mo
share/locale/bg/LC_MESSAGES/audacious-plugins.mo
share/locale/ca/LC_MESSAGES/audacious-plugins.mo
