Fri Jul 5 15:21:18 2019 UTC ()
audacious-plugins: Disable options / dependencies that were removed.
Should fix the musepack conflicts with VLC, since I can't find musepack
support existing in audacious any more (maybe through ffmpeg).
(nia)
diff -r1.91 -r1.92 pkgsrc/audio/audacious-plugins/Makefile
diff -r1.8 -r1.9 pkgsrc/audio/audacious-plugins/options.mk
--- pkgsrc/audio/audacious-plugins/Makefile 2019/07/01 04:07:55 1.91
+++ pkgsrc/audio/audacious-plugins/Makefile 2019/07/05 15:21:18 1.92
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2019/07/01 04:07:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2019/07/05 15:21:18 nia Exp $
DISTNAME= audacious-plugins-3.5.2
-PKGREVISION= 28
+PKGREVISION= 29
CATEGORIES= audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
EXTRACT_SUFX= .tar.bz2
@@ -14,15 +14,14 @@
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake intltool pkg-config msgfmt
+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-evdevplug
#CONFIGURE_ARGS+= --disable-coreaudio
CONFIGURE_ARGS+= --disable-gnomeshortcuts
CONFIGURE_ARGS+= --disable-modplug
-CONFIGURE_ARGS+= --disable-projectm
CONFIGURE_ARGS+= --with-ffmpeg=none
.include "../../mk/compiler.mk"
@@ -51,48 +50,27 @@
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-PLIST_VARS+= oss sun oss4
+PLIST_VARS+= oss4
.if ${OPSYS} == "NetBSD"
RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
-CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND} \
- --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh} \
- --with-cdda-dir=/cdrom/
-PLIST.oss= yes
-PLIST.sun= yes
-.elif ${OPSYS} == "FreeBSD"
-PLIST.oss= yes
-.elif ${OPSYS} == "DragonFly"
-PLIST.oss= yes
.elif ${OPSYS} == "SunOS"
CPPFLAGS.SunOS= -D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
CONFIGURE_ARGS+= --enable-oss4
PLIST.oss4= yes
-PLIST.oss= yes
-#.elif ${OPSYS} == "Linux"
-#. include "../../wip/alsa-lib/buildlink3.mk"
-#PKG_SUPPORTED_OPTIONS+= lirc
-#. if !empty(PKG_OPTIONS:Mlirc)
-#CONFIGURE_ARGS+= --enable-lirc
-#. include "../../wip/lirc/buildlink3.mk"
-#. endif
.endif
.include "../../audio/audacious/buildlink3.mk"
.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libcddb/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libmpcdec/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/mpg123/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
.include "../../audio/wavpack/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
.include "../../devel/libbinio/buildlink3.mk"
-.include "../../graphics/imlib2/buildlink3.mk"
.include "../../misc/libcdio-paranoia/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../net/libmms/buildlink3.mk"
--- pkgsrc/audio/audacious-plugins/options.mk 2017/09/27 13:33:07 1.8
+++ pkgsrc/audio/audacious-plugins/options.mk 2019/07/05 15:21:18 1.9
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2017/09/27 13:33:07 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2019/07/05 15:21:18 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.audacious-plugins
-PKG_SUPPORTED_OPTIONS= esound inet6 jack midi pulseaudio sid
-PKG_SUGGESTED_OPTIONS+= inet6 pulseaudio jack
+PKG_SUPPORTED_OPTIONS= jack pulseaudio sid
+PKG_SUGGESTED_OPTIONS+= pulseaudio jack
.include "../../mk/bsd.options.mk"
@@ -14,32 +14,12 @@
CONFIGURE_ARGS+= --disable-sid
.endif
-PLIST_VARS+= esd
-.if !empty(PKG_OPTIONS:Mesound)
-. include "../../audio/esound/buildlink3.mk"
-PLIST.esd= yes
-.else
-CONFIGURE_ARGS+= --disable-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
PLIST_VARS+= jack
.if !empty(PKG_OPTIONS:Mjack)
. include "../../audio/jack/buildlink3.mk"
PLIST.jack= yes
.else
CONFIGURE_ARGS+= --disable-jack
-.endif
-
-PLIST_VARS+= midi
-.if !empty(PKG_OPTIONS:Mmidi)
-BUILD_DEPENDS+= timidity>=0:../../audio/timidity
-PLIST.midi= yes
-.else
-CONFIGURE_ARGS+= --disable-timidity
.endif
PLIST_VARS+= pulse