pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio audacious: Update to 3.10.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/28bb540747ea
branches: trunk
changeset: 336055:28bb540747ea
user: nia <nia%pkgsrc.org@localhost>
date: Sat Jul 06 13:17:00 2019 +0000
description:
audacious: Update to 3.10.0
Upstream decided to drop GTK3 support.
GTK3 was previously the default UI in pkgsrc.
I've changed the deafult to Qt5 to retain HiDPI support.
GTK2 is also available for those who want it.
New plugins: sox-resampler, silence-removal, ffaudio (used for formats
not handled by other plugins like opus), alsa
diffstat:
audio/audacious-plugins/Makefile | 84 ++++++---------
audio/audacious-plugins/PLIST | 55 ++++++---
audio/audacious-plugins/distinfo | 10 +-
audio/audacious-plugins/hacks.mk | 29 +++++
audio/audacious-plugins/options.mk | 68 +++++++++++-
audio/audacious/Makefile | 22 +--
audio/audacious/PLIST | 87 +++++++---------
audio/audacious/buildlink3.mk | 25 +++-
audio/audacious/distinfo | 13 +-
audio/audacious/options.mk | 32 ++++++
audio/audacious/patches/patch-configure | 20 +--
audio/audacious/patches/patch-src_libaudcore_audio.h.in | 27 +++++
12 files changed, 299 insertions(+), 173 deletions(-)
diffs (truncated from 705 to 300 lines):
diff -r 46ab6206562f -r 28bb540747ea audio/audacious-plugins/Makefile
--- a/audio/audacious-plugins/Makefile Sat Jul 06 12:54:22 2019 +0000
+++ b/audio/audacious-plugins/Makefile Sat Jul 06 13:17:00 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2019/07/05 15:21:18 nia Exp $
+# $NetBSD: Makefile,v 1.93 2019/07/06 13:17:01 nia Exp $
-DISTNAME= audacious-plugins-3.5.2
-PKGREVISION= 29
+DISTNAME= audacious-plugins-3.10.1
CATEGORIES= audio
-MASTER_SITES= http://distfiles.audacious-media-player.org/
+MASTER_SITES= https://distfiles.audacious-media-player.org/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,70 +10,55 @@
COMMENT= Plugins for Audacious media player
LICENSE= 2-clause-bsd
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake intltool pkg-config
+USE_TOOLS+= msgfmt msgmerge xgettext
+GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake intltool pkg-config
-USE_TOOLS+= msgfmt msgmerge xgettext
-GNU_CONFIGURE= yes
-#CONFIGURE_ARGS+= --disable-aac
-CONFIGURE_ARGS+= --disable-amidiplug
-#CONFIGURE_ARGS+= --disable-coreaudio
-CONFIGURE_ARGS+= --disable-gnomeshortcuts
-CONFIGURE_ARGS+= --disable-modplug
-CONFIGURE_ARGS+= --with-ffmpeg=none
+CONFIGURE_ARGS+= --disable-ampache
+CONFIGURE_ARGS+= --disable-bs2b
+CONFIGURE_ARGS+= --disable-cue
+CONFIGURE_ARGS+= --disable-notify
+# use SDL instead, it has working volume control
+CONFIGURE_ARGS+= --disable-oss4
+CONFIGURE_ARGS+= --disable-qtaudio
+CONFIGURE_ARGS+= --disable-sndio
-.include "../../mk/compiler.mk"
-.if empty(PKGSRC_COMPILER:Mclang)
-# This should avoid an error like: libstdc++.so.6: Undefined PLT symbol "_Unwind_GetIP" on NetBSD i386 and maybe amd64, with gcc4 at least.
-# This seems to happen when libstdc++ gets linked in with the plug-ins and the code is not compiled with g++.
-# For a similar problem see http://archive.netbsd.se/?ml=netbsd-java&a=2007-08&m=4912662 :
-# Systems with Clang are supposed to be new enough to have a correctly linked
-# libstdc++.
-LDFLAGS.NetBSD+= -lgcc_s
-.endif
+PLIST_VARS+= dbus gtk qt
-# From audio/bmp/Makefile:
-# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
-# any open plugin. libstdc++ gets dynamically linked in when the id3lib
-# library is loaded, and is the one causing problems. See PR pkg/26846
-# for more information.
-LDFLAGS.NetBSD+= -lstdc++ -lm
-
-# cdaudio plugin complains about missing OSS at runtime
-LDFLAGS+= ${LIBOSSAUDIO}
-
-# do not use pkgsrc' flac if it is installed
-CFLAGS+= -I. -I../flacng -Ilibflacng
-
-.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-
-PLIST_VARS+= oss4
-
-.if ${OPSYS} == "NetBSD"
-RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
-.elif ${OPSYS} == "SunOS"
-CPPFLAGS.SunOS= -D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
-CONFIGURE_ARGS+= --enable-oss4
-PLIST.oss4= yes
+.include "../../audio/audacious/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mdbus)
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+PLIST.dbus= yes
+.else
+CONFIGURE_ARGS+= --disable-mpris2
.endif
-
-.include "../../audio/audacious/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mqt5)
+PLIST.qt= yes
+CONFIGURE_ARGS+= --enable-qt
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mgtk2)
+PLIST.gtk= yes
+.else
+CONFIGURE_ARGS+= --disable-gtk
+.endif
.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libcddb/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libsoxr/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/mpg123/buildlink3.mk"
.include "../../audio/wavpack/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/libbinio/buildlink3.mk"
.include "../../misc/libcdio-paranoia/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../net/libmms/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../www/neon/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 46ab6206562f -r 28bb540747ea audio/audacious-plugins/PLIST
--- a/audio/audacious-plugins/PLIST Sat Jul 06 12:54:22 2019 +0000
+++ b/audio/audacious-plugins/PLIST Sat Jul 06 13:17:00 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2018/07/31 14:01:40 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/07/06 13:17:01 nia Exp $
lib/audacious/Container/asx.so
lib/audacious/Container/asx3.so
lib/audacious/Container/audpl.so
@@ -9,34 +9,47 @@
lib/audacious/Effect/crossfade.so
lib/audacious/Effect/crystalizer.so
lib/audacious/Effect/echo.so
-lib/audacious/Effect/ladspa.so
+${PLIST.gtk}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
-lib/audacious/General/alarm.so
-lib/audacious/General/albumart.so
-lib/audacious/General/aosd.so
+${PLIST.gtk}lib/audacious/General/alarm.so
+${PLIST.qt}lib/audacious/General/albumart-qt.so
+${PLIST.gtk}lib/audacious/General/albumart.so
+${PLIST.gtk}lib/audacious/General/aosd.so
lib/audacious/General/cd-menu-items.so
lib/audacious/General/delete-files.so
-lib/audacious/General/gtkui.so
-lib/audacious/General/hotkey.so
-lib/audacious/General/lyricwiki.so
-lib/audacious/General/mpris2.so
+${PLIST.gtk}lib/audacious/General/gtkui.so
+${PLIST.gtk}lib/audacious/General/hotkey.so
+${PLIST.qt}lib/audacious/General/lyricwiki-qt.so
+${PLIST.gtk}lib/audacious/General/lyricwiki.so
+${PLIST.dbus}lib/audacious/General/mpris2.so
+${PLIST.qt}lib/audacious/General/playlist-manager-qt.so
+${PLIST.gtk}lib/audacious/General/playlist-manager.so
+${PLIST.qt}lib/audacious/General/qtui.so
lib/audacious/General/scrobbler.so
-lib/audacious/General/search-tool.so
-lib/audacious/General/skins.so
+${PLIST.qt}lib/audacious/General/search-tool-qt.so
+${PLIST.gtk}lib/audacious/General/search-tool.so
+${PLIST.qt}lib/audacious/General/skins-qt.so
+${PLIST.gtk}lib/audacious/General/skins.so
+${PLIST.qt}lib/audacious/General/song-info-qt.so
lib/audacious/General/song_change.so
-lib/audacious/General/statusicon.so
+${PLIST.qt}lib/audacious/General/statusicon-qt.so
+${PLIST.gtk}lib/audacious/General/statusicon.so
lib/audacious/Input/aac-raw.so
-lib/audacious/Input/aac.so
-lib/audacious/Input/adplug.so
+${PLIST.adplug}lib/audacious/Input/adplug.so
+${PLIST.fluidsynth}lib/audacious/Input/amidi-plug.so
lib/audacious/Input/cdaudio-ng.so
-lib/audacious/Input/console.so
+${PLIST.libgme}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
+${PLIST.modplug}lib/audacious/Input/modplug.so
lib/audacious/Input/psf2.so
lib/audacious/Input/sndfile.so
lib/audacious/Input/tonegen.so
@@ -44,17 +57,18 @@
lib/audacious/Input/vtx.so
lib/audacious/Input/wavpack.so
lib/audacious/Input/xsf.so
+${PLIST.alsa}lib/audacious/Output/alsa.so
lib/audacious/Output/filewriter.so
-${PLIST.jack}lib/audacious/Output/jackout.so
-${PLIST.oss4}lib/audacious/Output/oss4.so
+${PLIST.jack}lib/audacious/Output/jack-ng.so
${PLIST.pulse}lib/audacious/Output/pulse_audio.so
lib/audacious/Output/sdlout.so
lib/audacious/Transport/gio.so
lib/audacious/Transport/mms.so
lib/audacious/Transport/neon.so
-lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/cairo-spectrum.so
-lib/audacious/Visualization/gl-spectrum.so
+${PLIST.gtk}lib/audacious/Visualization/blur_scope.so
+${PLIST.gtk}lib/audacious/Visualization/cairo-spectrum.so
+${PLIST.qt}lib/audacious/Visualization/gl-spectrum-qt.so
+${PLIST.gtk}lib/audacious/Visualization/gl-spectrum.so
share/audacious/Skins/Classic/balance.png
share/audacious/Skins/Classic/cbuttons.png
share/audacious/Skins/Classic/eq_ex.png
@@ -174,6 +188,7 @@
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
diff -r 46ab6206562f -r 28bb540747ea audio/audacious-plugins/distinfo
--- a/audio/audacious-plugins/distinfo Sat Jul 06 12:54:22 2019 +0000
+++ b/audio/audacious-plugins/distinfo Sat Jul 06 13:17:00 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:12:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/07/06 13:17:01 nia Exp $
-SHA1 (audacious-plugins-3.5.2.tar.bz2) = 470a9c009a92627fb824118762b156eb4604099f
-RMD160 (audacious-plugins-3.5.2.tar.bz2) = 2cf98e4fbf0e778672d509cd486274a8f7e4f10d
-SHA512 (audacious-plugins-3.5.2.tar.bz2) = eaf46f403a77b5de63f26e096b968a6d94bbe3917df4400e5791143d846c1f3cbf83f2937210055a9b493dfa56ddb36b12d6d57b1453708b23dd41c0e2a94a72
-Size (audacious-plugins-3.5.2.tar.bz2) = 1734588 bytes
+SHA1 (audacious-plugins-3.10.1.tar.bz2) = d2e549a402baa59b0181aabad6d7481369e8930e
+RMD160 (audacious-plugins-3.10.1.tar.bz2) = 96b7f2b0041508e8cea5f8188d9fb7b69b08f0a3
+SHA512 (audacious-plugins-3.10.1.tar.bz2) = 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
+Size (audacious-plugins-3.10.1.tar.bz2) = 1715477 bytes
diff -r 46ab6206562f -r 28bb540747ea audio/audacious-plugins/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/audacious-plugins/hacks.mk Sat Jul 06 13:17:00 2019 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: hacks.mk,v 1.1 2019/07/06 13:17:01 nia Exp $
+
+.if !defined(AUDACIOUS_PLUGINS_HACKS_MK)
+AUDACIOUS_PLUGINS_HACKS_MK:=
+
+.include "../../mk/compiler.mk"
+
+.if empty(PKGSRC_COMPILER:Mclang)
+# This should avoid an error like: libstdc++.so.6: Undefined PLT symbol "_Unwind_GetIP" on NetBSD i386 and maybe amd64, with gcc4 at least.
+# This seems to happen when libstdc++ gets linked in with the plug-ins and the code is not compiled with g++.
+# For a similar problem see http://archive.netbsd.se/?ml=netbsd-java&a=2007-08&m=4912662 :
+# Systems with Clang are supposed to be new enough to have a correctly linked
+# libstdc++.
+LDFLAGS.NetBSD+= -lgcc_s
+.endif
+
+# From audio/bmp/Makefile:
+# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
+# any open plugin. libstdc++ gets dynamically linked in when the id3lib
+# library is loaded, and is the one causing problems. See PR pkg/26846
+# for more information.
+LDFLAGS.NetBSD+= -lstdc++ -lm
+.endif
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CPPFLAGS.SunOS= -D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
+.endif
diff -r 46ab6206562f -r 28bb540747ea audio/audacious-plugins/options.mk
--- a/audio/audacious-plugins/options.mk Sat Jul 06 12:54:22 2019 +0000
+++ b/audio/audacious-plugins/options.mk Sat Jul 06 13:17:00 2019 +0000
@@ -1,17 +1,19 @@
-# $NetBSD: options.mk,v 1.9 2019/07/05 15:21:18 nia Exp $
+# $NetBSD: options.mk,v 1.10 2019/07/06 13:17:01 nia Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.audacious-plugins
-PKG_SUPPORTED_OPTIONS= jack pulseaudio sid
-PKG_SUGGESTED_OPTIONS+= pulseaudio jack
+PKG_OPTIONS_VAR= PKG_OPTIONS.audacious-plugins
+PKG_SUPPORTED_OPTIONS+= alsa jack pulseaudio lirc
+PKG_SUPPORTED_OPTIONS+= adplug sidplay fluidsynth libgme modplug
+PKG_SUGGESTED_OPTIONS.Linux+= alsa lirc
+PKG_OPTIONS_LEGACY_OPTS+= sid:sidplay
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= sid
-.if !empty(PKG_OPTIONS:Msid)
-. include "../../audio/libsidplay/buildlink3.mk"
-PLIST.sid= yes
+PLIST_VARS+= alsa
+.if !empty(PKG_OPTIONS:Malsa)
+. include "../../audio/alsa-lib/buildlink3.mk"
+PLIST.alsa= yes
.else
-CONFIGURE_ARGS+= --disable-sid
+CONFIGURE_ARGS+= --disable-alsa
.endif
Home |
Main Index |
Thread Index |
Old Index