On Sat, 25 Jan 2020 21:11:59 +0100
Björn Ketelaars wrote:
> On Sat 25/01/2020 16:21, Charlene Wendling wrote:
> > On Wed, 22 Jan 2020 16:19:21 +0100
> > Björn Ketelaars wrote:
> >
> > > Diff below updates audacious to 3.10.1. Changes between 3.9 and
> > > 3.10 are explained at [0]. 3.10.1 fixes some additional bugs.
> > > Note that this update relies on a newer version of
> > > audacious-plugins, which has been send to ports@.
> > >
> > > Changes to the port:
> > > - Switch HOMEPAGE and MASTER_SITES to https
> > > - Sync WANTLIB
> > > - Bump major of libaudcore as symbols have been removed
> > >
> > > Lightly tested on amd64.
> > >
> > > Comments/OK?
> >
> > It builds and works fine on powerpc. audacious-plugins has "extra"
> > WANTLIBs (c.96 dbus-1.11 dbus-glib-1.5), but actually makes use of
> > DBus so they seem legit.
> >
> > Once it's cleared up by someone who knows better than me, OK cwen@
> > for audacious and audacious-plugins ^^
>
> My bad, I should have removed those extra WANTLIBs.
>
> Only thing that seems to be dbus related is the plugin mpris2, which
> is a standard dbus interface aiming to provide a API for controlling
> audacious. This plugin depends on gdbus-codegen(1), provided by glib,
> which generates some dbus code.
>
> I grepped through the output of ldd(1) of all plugins. There is no
> dependency on dbus or dbus-glib.
I grepped the source for potential dlopen() but I forgot that basic
method :)
> Enclosed is an updated diff, which additionally removes the extra
> WANTLIBs.
>
> OK?
I've retried in a partial bulk on amd64, it works fine here.
OK cwen@
> diff --git Makefile Makefile
> index 1501a02b0b0..3d31fa025d1 100644
> --- Makefile
> +++ Makefile
> @@ -2,9 +2,8 @@
>
> COMMENT = input and output plugins for Audacious
>
> -V = 3.9
> +V = 3.10.1
> DISTNAME = audacious-plugins-$V
> -REVISION = 3
>
> CATEGORIES = audio multimedia
>
> @@ -15,15 +14,15 @@ PERMIT_PACKAGE = Yes
>
> 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 iconv intl m mms modplug mp3lame
> -WANTLIB += mpg123 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/ +WANTLIB += audtag
> avcodec avformat avutil cairo cddb cdio cdio_cdda +WANTLIB += cue
> curl faad fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB +=
> gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0 +WANTLIB +=
> harfbuzz iconv intl m mms modplug mp3lame mpg123 neon +WANTLIB +=
> notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 samplerate +WANTLIB
> += sndfile sndio soxr vorbis vorbisenc vorbisfile wavpack +WANTLIB +=
> xml2 z +
> +MASTER_SITES =
> https://distfiles.audacious-media-player.org/
> EXTRACT_SUFX = .tar.bz2
>
> diff --git distinfo distinfo
> index f261a81d563..b4a3f1061c9 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (audacious-plugins-3.9.tar.bz2) =
> i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g= -SIZE
> (audacious-plugins-3.9.tar.bz2) = 1843084 +SHA256
> (audacious-plugins-3.10.1.tar.bz2) =
> 7sMXdjH5lym/DpQiO2J0BsxkjHDmZG41YTx7VQQKJkI= +SIZE
> (audacious-plugins-3.10.1.tar.bz2) = 1715477 diff --git
> patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in index
> 0b32ca27e8b..59f544b9292 100644
> --- patches/patch-buildsys_mk_in
> +++ patches/patch-buildsys_mk_in
> @@ -1,12 +1,13 @@
> $OpenBSD: patch-buildsys_mk_in,v 1.6 2014/11/03 04:29:05 bcallah Exp
> $
> ---- 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}
> +Index: buildsys.mk.in
> +--- buildsys.mk.in.orig
> ++++ buildsys.mk.in
> +@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
>
> MO_FILES = ${LOCALES:.po=.mo}
>
> -.SILENT:
> +#.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 ${SUBDIRS}
> + .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o
> .java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S
> .S.dep .xpm
> + .PHONY: all subdirs subdirs-after pre-depend depend install
> install-includes install-extra uninstall uninstall-extra clean
> distclean locales ${SUBDIRS} ${SUBDIRS_AFTER} diff --git
> patches/patch-configure patches/patch-configure index
> 051879f438f..f66a9125a79 100644
> --- patches/patch-configure
> +++ patches/patch-configure
> @@ -7,7 +7,7 @@ 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; }
> +@@ -9702,8 +9702,6 @@ $as_echo "yes" >&6; }
>
> fi
>
> @@ -16,7 +16,7 @@ Index: configure
>
>
> if test $HAVE_DARWIN = yes ; then
> -@@ -14657,6 +14655,8 @@ as_fn_error ()
> +@@ -14701,6 +14699,8 @@ as_fn_error ()
> as_fn_exit $as_status
> } # as_fn_error
>
> diff --git pkg/PLIST pkg/PLIST
> index f25ab5d6cae..021807726dc 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -2,72 +2,70 @@
> @pkgpath audio/audacious-plugins,-main
> 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
> -lib/audacious/Container/pls.so
> -lib/audacious/Container/xspf.so
> +@so lib/audacious/Container/asx.so
> +@so lib/audacious/Container/asx3.so
> +@so lib/audacious/Container/audpl.so
> +@so lib/audacious/Container/cue.so
> +@so lib/audacious/Container/m3u.so
> +@so lib/audacious/Container/pls.so
> +@so lib/audacious/Container/xspf.so
> lib/audacious/Effect/
> -lib/audacious/Effect/compressor.so
> -lib/audacious/Effect/crossfade.so
> -lib/audacious/Effect/crystalizer.so
> -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
> -lib/audacious/Effect/voice_removal.so
> +@so lib/audacious/Effect/compressor.so
> +@so lib/audacious/Effect/crossfade.so
> +@so lib/audacious/Effect/crystalizer.so
> +@so lib/audacious/Effect/echo.so
> +@so lib/audacious/Effect/ladspa.so
> +@so lib/audacious/Effect/mixer.so
> +@so lib/audacious/Effect/resample.so
> +@so lib/audacious/Effect/silence-removal.so
> +@so lib/audacious/Effect/sox-resampler.so
> +@so lib/audacious/Effect/speed-pitch.so
> +@so lib/audacious/Effect/stereo.so
> +@so lib/audacious/Effect/voice_removal.so
> lib/audacious/General/
> -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
> -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
> -lib/audacious/General/song_change.so
> -lib/audacious/General/statusicon.so
> +@so lib/audacious/General/alarm.so
> +@so lib/audacious/General/albumart.so
> +@so lib/audacious/General/aosd.so
> +@so lib/audacious/General/cd-menu-items.so
> +@so lib/audacious/General/delete-files.so
> +@so lib/audacious/General/gtkui.so
> +@so lib/audacious/General/hotkey.so
> +@so lib/audacious/General/lyricwiki.so
> +@so lib/audacious/General/mpris2.so
> +@so lib/audacious/General/notify.so
> +@so lib/audacious/General/playlist-manager.so
> +@so lib/audacious/General/scrobbler.so
> +@so lib/audacious/General/search-tool.so
> +@so lib/audacious/General/skins.so
> +@so lib/audacious/General/song_change.so
> +@so lib/audacious/General/statusicon.so
> lib/audacious/Input/
> -lib/audacious/Input/aac-raw.so
> -lib/audacious/Input/adplug.so
> -lib/audacious/Input/cdaudio-ng.so
> -lib/audacious/Input/console.so
> -lib/audacious/Input/ffaudio.so
> -lib/audacious/Input/flacng.so
> -lib/audacious/Input/madplug.so
> -lib/audacious/Input/metronom.so
> -lib/audacious/Input/modplug.so
> -lib/audacious/Input/psf2.so
> -lib/audacious/Input/sndfile.so
> -lib/audacious/Input/tonegen.so
> -lib/audacious/Input/vorbis.so
> -lib/audacious/Input/vtx.so
> -lib/audacious/Input/wavpack.so
> -lib/audacious/Input/xsf.so
> +@so lib/audacious/Input/aac-raw.so
> +@so lib/audacious/Input/cdaudio-ng.so
> +@so lib/audacious/Input/console.so
> +@so lib/audacious/Input/ffaudio.so
> +@so lib/audacious/Input/flacng.so
> +@so lib/audacious/Input/madplug.so
> +@so lib/audacious/Input/metronom.so
> +@so lib/audacious/Input/modplug.so
> +@so lib/audacious/Input/psf2.so
> +@so lib/audacious/Input/sndfile.so
> +@so lib/audacious/Input/tonegen.so
> +@so lib/audacious/Input/vorbis.so
> +@so lib/audacious/Input/vtx.so
> +@so lib/audacious/Input/wavpack.so
> +@so lib/audacious/Input/xsf.so
> lib/audacious/Output/
> -lib/audacious/Output/filewriter.so
> -lib/audacious/Output/sndio-ng.so
> +@so lib/audacious/Output/filewriter.so
> +@so lib/audacious/Output/sndio-ng.so
> lib/audacious/Transport/
> -lib/audacious/Transport/gio.so
> -lib/audacious/Transport/mms.so
> -lib/audacious/Transport/neon.so
> +@so lib/audacious/Transport/gio.so
> +@so lib/audacious/Transport/mms.so
> +@so lib/audacious/Transport/neon.so
> lib/audacious/Visualization/
> -lib/audacious/Visualization/blur_scope.so
> -lib/audacious/Visualization/cairo-spectrum.so
> -lib/audacious/Visualization/gl-spectrum.so
> +@so lib/audacious/Visualization/blur_scope.so
> +@so lib/audacious/Visualization/cairo-spectrum.so
> +@so lib/audacious/Visualization/gl-spectrum.so
> share/audacious/Skins/
> share/audacious/Skins/Classic/
> share/audacious/Skins/Classic/balance.png
>
