Update to audacious and audacious-plugins 3.9

From Timo Myyra, thanks!
This commit is contained in:
dcoppa 2017-09-08 13:33:07 +00:00
parent b15dd19d0e
commit e1dd8809e2
12 changed files with 95 additions and 86 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.71 2017/07/26 22:45:14 sthen Exp $
# $OpenBSD: Makefile,v 1.72 2017/09/08 13:33:07 dcoppa Exp $
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-player.org/
# 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,14 +52,13 @@ LIB_DEPENDS = audio/faad>=2.7 \
net/curl \
net/neon \
textproc/libxml \
x11/gtk+3 \
x11/gtk+2 \
x11/dbus-glib
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-adplug \
--disable-alsa \
CONFIGURE_ARGS += --disable-alsa \
--disable-amidiplug \
--disable-bs2b \
--disable-jack \

View File

@ -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

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-configure,v 1.8 2014/11/03 04:29:05 bcallah Exp $
$OpenBSD: patch-configure,v 1.9 2017/09/08 13:33:07 dcoppa Exp $
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.
--- 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; }
Index: configure
--- configure.orig
+++ configure
@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
fi
@ -14,8 +15,8 @@ polluted very early on, breaking most of the checks using AC_CHECK_LIB.
-LIBS="$LIBS $AUDACIOUS_LIBS"
@@ -12594,6 +12592,8 @@ as_fn_error ()
if test $HAVE_DARWIN = yes ; then
@@ -14657,6 +14655,8 @@ as_fn_error ()
as_fn_exit $as_status
} # as_fn_error

View File

@ -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

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_psf_psx_hw_cc,v 1.1 2017/09/08 13:33:07 dcoppa Exp $
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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2014/11/03 04:29:05 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.13 2017/09/08 13:33:07 dcoppa Exp $
@pkgpath audio/audacious-plugins,-main
lib/audacious/
lib/audacious/Container/
@ -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.png
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

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.55 2016/12/31 04:12:09 jsg Exp $
# $OpenBSD: Makefile,v 1.56 2017/09/08 13:33:07 dcoppa Exp $
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 = graphical audio player which supports lots of formats
DISTNAME = audacious-3.5.2
REVISION = 0
DISTNAME = audacious-3.9
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 # 5.0
SHARED_LIBS += audgui 4.0 # 5.0
SHARED_LIBS += audtag 3.0 # 3.0
CATEGORIES = audio multimedia
@ -19,10 +18,11 @@ HOMEPAGE = http://audacious-media-player.org/
# 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 += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@ -34,8 +34,7 @@ MODGCC4_ARCHS = arm
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} \

View File

@ -1,2 +1,2 @@
SHA256 (audacious-3.5.2.tar.bz2) = ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
SIZE (audacious-3.5.2.tar.bz2) = 448436
SHA256 (audacious-3.9.tar.bz2) = LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
SIZE (audacious-3.9.tar.bz2) = 599488

View File

@ -1,9 +1,10 @@
$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
$OpenBSD: patch-src_libaudcore_Makefile,v 1.8 2017/09/08 13:33:07 dcoppa Exp $
Index: src/libaudcore/Makefile
--- src/libaudcore/Makefile.orig
+++ src/libaudcore/Makefile
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
LIB_MAJOR = 2
LIB_MAJOR = 5
LIB_MINOR = 0

View File

@ -1,9 +1,10 @@
$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
$OpenBSD: patch-src_libaudgui_Makefile,v 1.5 2017/09/08 13:33:07 dcoppa Exp $
Index: src/libaudgui/Makefile
--- src/libaudgui/Makefile.orig
+++ src/libaudgui/Makefile
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audgui.so.${LIBaudgui_VERSION}
LIB_MAJOR = 2
LIB_MAJOR = 5
LIB_MINOR = 0

View File

@ -1,9 +1,10 @@
$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
$OpenBSD: patch-src_libaudtag_Makefile,v 1.4 2017/09/08 13:33:07 dcoppa Exp $
Index: src/libaudtag/Makefile
--- src/libaudtag/Makefile.orig
+++ src/libaudtag/Makefile
@@ -1,4 +1,4 @@
-SHARED_LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audtag.so.${LIBaudtag_VERSION}
LIB_MAJOR = 1
LIB_MAJOR = 3
LIB_MINOR = 0

View File

@ -1,40 +1,36 @@
@comment $OpenBSD: PLIST,v 1.20 2014/11/03 04:28:11 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.21 2017/09/08 13:33:07 dcoppa Exp $
@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/export.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 +48,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
@ -61,6 +58,7 @@ share/audacious/images/playlist.png
share/audacious/images/plugins.png
share/icons/hicolor/48x48/apps/audacious.png
share/icons/hicolor/scalable/apps/audacious.svg
share/locale/ar/LC_MESSAGES/audacious.mo
share/locale/ast/LC_MESSAGES/audacious.mo
share/locale/be/LC_MESSAGES/audacious.mo
share/locale/bg/LC_MESSAGES/audacious.mo
@ -95,6 +93,8 @@ share/locale/id_ID/LC_MESSAGES/audacious.mo
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