Thu May 28 20:00:23 2020 UTC ()
cmus: don't try to use OSS on NetBSD, format selection is busted


(nia)
diff -r1.84 -r1.85 pkgsrc/audio/cmus/Makefile
cvs diff -r1.84 -r1.85 pkgsrc/audio/cmus/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cmus/Makefile 2020/03/08 16:48:37 1.84
+++ pkgsrc/audio/cmus/Makefile 2020/05/28 20:00:23 1.85
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.84 2020/03/08 16:48:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.85 2020/05/28 20:00:23 nia Exp $
2 2
3DISTNAME= cmus-2.8.0 3DISTNAME= cmus-2.8.0
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=cmus/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=cmus/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ahoka@NetBSD.org 9MAINTAINER= ahoka@NetBSD.org
10HOMEPAGE= https://cmus.github.io/ 10HOMEPAGE= https://cmus.github.io/
11COMMENT= Small, fast and powerful text mode music player 11COMMENT= Small, fast and powerful text mode music player
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17 17
@@ -19,34 +19,33 @@ REPLACE_SH+= cmus-status-display @@ -19,34 +19,33 @@ REPLACE_SH+= cmus-status-display
19 19
20# C11 atomics 20# C11 atomics
21GCC_REQD+= 4.9 21GCC_REQD+= 4.9
22 22
23CONFIGURE_ARGS+= prefix=${PREFIX} 23CONFIGURE_ARGS+= prefix=${PREFIX}
24# not in pkgsrc yet 24# not in pkgsrc yet
25CONFIGURE_ARGS+= CONFIG_ROAR=n 25CONFIGURE_ARGS+= CONFIG_ROAR=n
26# requires systemd 26# requires systemd
27CONFIGURE_ARGS+= CONFIG_MPRIS=n 27CONFIGURE_ARGS+= CONFIG_MPRIS=n
28CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR} 28CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}
29PLIST_VARS+= coreaudio sunaudio oss 29PLIST_VARS+= coreaudio sunaudio oss
30 30
31.include "../../mk/oss.buildlink3.mk" 31.include "../../mk/oss.buildlink3.mk"
32.if ${OSS_TYPE} != "none" 32.if ${OPSYS} != "NetBSD" && ${OSS_TYPE} != "none"
33PLIST.oss= yes 33PLIST.oss= yes
34CONFIGURE_ARGS+= CONFIG_OSS=y 34CONFIGURE_ARGS+= CONFIG_OSS=y
35.else 35.else
36CONFIGURE_ARGS+= CONFIG_OSS=n 36CONFIGURE_ARGS+= CONFIG_OSS=n
37.endif 37.endif
38 38
39.include "../../mk/bsd.prefs.mk" 
40.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h) 39.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h)
41CONFIGURE_ARGS+= CONFIG_SUN=y 40CONFIGURE_ARGS+= CONFIG_SUN=y
42PLIST.sunaudio= yes 41PLIST.sunaudio= yes
43.else 42.else
44CONFIGURE_ARGS+= CONFIG_SUN=n 43CONFIGURE_ARGS+= CONFIG_SUN=n
45.endif 44.endif
46 45
47.if ${OPSYS} == "Darwin" 46.if ${OPSYS} == "Darwin"
48PLIST.coreaudio= yes 47PLIST.coreaudio= yes
49.endif 48.endif
50 49
51.if ${MACHINE_ARCH} == "i386" 50.if ${MACHINE_ARCH} == "i386"
52# 64 bit atomic ops are required 51# 64 bit atomic ops are required