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
cvs diff -r1.91 -r1.92 pkgsrc/audio/audacious-plugins/Makefile (expand / switch to unified diff)

--- 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,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.91 2019/07/01 04:07:55 ryoon Exp $ 1# $NetBSD: Makefile,v 1.92 2019/07/05 15:21:18 nia Exp $
2 2
3DISTNAME= audacious-plugins-3.5.2 3DISTNAME= audacious-plugins-3.5.2
4PKGREVISION= 28 4PKGREVISION= 29
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= http://distfiles.audacious-media-player.org/ 6MASTER_SITES= http://distfiles.audacious-media-player.org/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://audacious-media-player.org/ 10HOMEPAGE= https://audacious-media-player.org/
11COMMENT= Plugins for Audacious media player 11COMMENT= Plugins for Audacious media player
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 14TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= gmake intltool pkg-config msgfmt 17USE_TOOLS+= gmake intltool pkg-config
 18USE_TOOLS+= msgfmt msgmerge xgettext
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19#CONFIGURE_ARGS+= --disable-aac 20#CONFIGURE_ARGS+= --disable-aac
20CONFIGURE_ARGS+= --disable-amidiplug 21CONFIGURE_ARGS+= --disable-amidiplug
21CONFIGURE_ARGS+= --disable-evdevplug 
22#CONFIGURE_ARGS+= --disable-coreaudio 22#CONFIGURE_ARGS+= --disable-coreaudio
23CONFIGURE_ARGS+= --disable-gnomeshortcuts 23CONFIGURE_ARGS+= --disable-gnomeshortcuts
24CONFIGURE_ARGS+= --disable-modplug 24CONFIGURE_ARGS+= --disable-modplug
25CONFIGURE_ARGS+= --disable-projectm 
26CONFIGURE_ARGS+= --with-ffmpeg=none 25CONFIGURE_ARGS+= --with-ffmpeg=none
27 26
28.include "../../mk/compiler.mk" 27.include "../../mk/compiler.mk"
29.if empty(PKGSRC_COMPILER:Mclang) 28.if empty(PKGSRC_COMPILER:Mclang)
30# This should avoid an error like: libstdc++.so.6: Undefined PLT symbol "_Unwind_GetIP" on NetBSD i386 and maybe amd64, with gcc4 at least. 29# This should avoid an error like: libstdc++.so.6: Undefined PLT symbol "_Unwind_GetIP" on NetBSD i386 and maybe amd64, with gcc4 at least.
31# This seems to happen when libstdc++ gets linked in with the plug-ins and the code is not compiled with g++. 30# This seems to happen when libstdc++ gets linked in with the plug-ins and the code is not compiled with g++.
32# For a similar problem see http://archive.netbsd.se/?ml=netbsd-java&a=2007-08&m=4912662 : 31# For a similar problem see http://archive.netbsd.se/?ml=netbsd-java&a=2007-08&m=4912662 :
33# Systems with Clang are supposed to be new enough to have a correctly linked 32# Systems with Clang are supposed to be new enough to have a correctly linked
34# libstdc++. 33# libstdc++.
35LDFLAGS.NetBSD+= -lgcc_s 34LDFLAGS.NetBSD+= -lgcc_s
36.endif 35.endif
37 36
38# From audio/bmp/Makefile: 37# From audio/bmp/Makefile:
@@ -41,62 +40,41 @@ LDFLAGS.NetBSD+= -lgcc_s @@ -41,62 +40,41 @@ LDFLAGS.NetBSD+= -lgcc_s
41# library is loaded, and is the one causing problems. See PR pkg/26846 40# library is loaded, and is the one causing problems. See PR pkg/26846
42# for more information. 41# for more information.
43LDFLAGS.NetBSD+= -lstdc++ -lm 42LDFLAGS.NetBSD+= -lstdc++ -lm
44 43
45# cdaudio plugin complains about missing OSS at runtime 44# cdaudio plugin complains about missing OSS at runtime
46LDFLAGS+= ${LIBOSSAUDIO} 45LDFLAGS+= ${LIBOSSAUDIO}
47 46
48# do not use pkgsrc' flac if it is installed 47# do not use pkgsrc' flac if it is installed
49CFLAGS+= -I. -I../flacng -Ilibflacng 48CFLAGS+= -I. -I../flacng -Ilibflacng
50 49
51.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
52.include "options.mk" 51.include "options.mk"
53 52
54PLIST_VARS+= oss sun oss4 53PLIST_VARS+= oss4
55 54
56.if ${OPSYS} == "NetBSD" 55.if ${OPSYS} == "NetBSD"
57RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j 56RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
58CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND} \ 
59 --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh} \ 
60 --with-cdda-dir=/cdrom/ 
61PLIST.oss= yes 
62PLIST.sun= yes 
63.elif ${OPSYS} == "FreeBSD" 
64PLIST.oss= yes 
65.elif ${OPSYS} == "DragonFly" 
66PLIST.oss= yes 
67.elif ${OPSYS} == "SunOS" 57.elif ${OPSYS} == "SunOS"
68CPPFLAGS.SunOS= -D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t 58CPPFLAGS.SunOS= -D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
69CONFIGURE_ARGS+= --enable-oss4 59CONFIGURE_ARGS+= --enable-oss4
70PLIST.oss4= yes 60PLIST.oss4= yes
71PLIST.oss= yes 
72#.elif ${OPSYS} == "Linux" 
73#. include "../../wip/alsa-lib/buildlink3.mk" 
74#PKG_SUPPORTED_OPTIONS+= lirc 
75#. if !empty(PKG_OPTIONS:Mlirc) 
76#CONFIGURE_ARGS+= --enable-lirc 
77#. include "../../wip/lirc/buildlink3.mk" 
78#. endif 
79.endif 61.endif
80 62
81.include "../../audio/audacious/buildlink3.mk" 63.include "../../audio/audacious/buildlink3.mk"
82.include "../../audio/faad2/buildlink3.mk" 64.include "../../audio/faad2/buildlink3.mk"
83.include "../../audio/lame/buildlink3.mk" 65.include "../../audio/lame/buildlink3.mk"
84.include "../../audio/libcddb/buildlink3.mk" 66.include "../../audio/libcddb/buildlink3.mk"
85.include "../../audio/libmad/buildlink3.mk" 
86.include "../../audio/libmpcdec/buildlink3.mk" 
87.include "../../audio/libsamplerate/buildlink3.mk" 67.include "../../audio/libsamplerate/buildlink3.mk"
88.include "../../audio/libsndfile/buildlink3.mk" 68.include "../../audio/libsndfile/buildlink3.mk"
89.include "../../audio/libvorbis/buildlink3.mk" 69.include "../../audio/libvorbis/buildlink3.mk"
90.include "../../audio/mpg123/buildlink3.mk" 70.include "../../audio/mpg123/buildlink3.mk"
91.include "../../audio/taglib/buildlink3.mk" 
92.include "../../audio/wavpack/buildlink3.mk" 71.include "../../audio/wavpack/buildlink3.mk"
93.include "../../devel/SDL/buildlink3.mk" 72.include "../../devel/SDL2/buildlink3.mk"
94.include "../../devel/libbinio/buildlink3.mk" 73.include "../../devel/libbinio/buildlink3.mk"
95.include "../../graphics/imlib2/buildlink3.mk" 
96.include "../../misc/libcdio-paranoia/buildlink3.mk" 74.include "../../misc/libcdio-paranoia/buildlink3.mk"
97.include "../../multimedia/libogg/buildlink3.mk" 75.include "../../multimedia/libogg/buildlink3.mk"
98.include "../../net/libmms/buildlink3.mk" 76.include "../../net/libmms/buildlink3.mk"
99.include "../../www/curl/buildlink3.mk" 77.include "../../www/curl/buildlink3.mk"
100.include "../../www/neon/buildlink3.mk" 78.include "../../www/neon/buildlink3.mk"
101.include "../../mk/oss.buildlink3.mk" 79.include "../../mk/oss.buildlink3.mk"
102.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/audio/audacious-plugins/options.mk (expand / switch to unified diff)

--- 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,51 +1,31 @@ @@ -1,51 +1,31 @@
1# $NetBSD: options.mk,v 1.8 2017/09/27 13:33:07 wiz Exp $ 1# $NetBSD: options.mk,v 1.9 2019/07/05 15:21:18 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.audacious-plugins 3PKG_OPTIONS_VAR= PKG_OPTIONS.audacious-plugins
4PKG_SUPPORTED_OPTIONS= esound inet6 jack midi pulseaudio sid 4PKG_SUPPORTED_OPTIONS= jack pulseaudio sid
5PKG_SUGGESTED_OPTIONS+= inet6 pulseaudio jack 5PKG_SUGGESTED_OPTIONS+= pulseaudio jack
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= sid 9PLIST_VARS+= sid
10.if !empty(PKG_OPTIONS:Msid) 10.if !empty(PKG_OPTIONS:Msid)
11. include "../../audio/libsidplay/buildlink3.mk" 11. include "../../audio/libsidplay/buildlink3.mk"
12PLIST.sid= yes 12PLIST.sid= yes
13.else 13.else
14CONFIGURE_ARGS+= --disable-sid 14CONFIGURE_ARGS+= --disable-sid
15.endif 15.endif
16 16
17PLIST_VARS+= esd 
18.if !empty(PKG_OPTIONS:Mesound) 
19. include "../../audio/esound/buildlink3.mk" 
20PLIST.esd= yes 
21.else 
22CONFIGURE_ARGS+= --disable-esd 
23.endif 
24 
25.if !empty(PKG_OPTIONS:Minet6) 
26CONFIGURE_ARGS+= --enable-ipv6 
27.endif 
28 
29PLIST_VARS+= jack 17PLIST_VARS+= jack
30.if !empty(PKG_OPTIONS:Mjack) 18.if !empty(PKG_OPTIONS:Mjack)
31. include "../../audio/jack/buildlink3.mk" 19. include "../../audio/jack/buildlink3.mk"
32PLIST.jack= yes 20PLIST.jack= yes
33.else 21.else
34CONFIGURE_ARGS+= --disable-jack 22CONFIGURE_ARGS+= --disable-jack
35.endif 23.endif
36 24
37PLIST_VARS+= midi 
38.if !empty(PKG_OPTIONS:Mmidi) 
39BUILD_DEPENDS+= timidity>=0:../../audio/timidity 
40PLIST.midi= yes 
41.else 
42CONFIGURE_ARGS+= --disable-timidity 
43.endif 
44 
45PLIST_VARS+= pulse 25PLIST_VARS+= pulse
46.if !empty(PKG_OPTIONS:Mpulseaudio) 26.if !empty(PKG_OPTIONS:Mpulseaudio)
47. include "../../audio/pulseaudio/buildlink3.mk" 27. include "../../audio/pulseaudio/buildlink3.mk"
48PLIST.pulse= yes 28PLIST.pulse= yes
49.else 29.else
50CONFIGURE_ARGS+= --disable-pulse 30CONFIGURE_ARGS+= --disable-pulse
51.endif 31.endif