Mon Feb 20 12:23:44 2023 UTC ()
openal-soft: require gcc 9

This uses [[likely]] from C++20.

XXX: pkgsrc doesn't support "c++20" in USE_LANGUAGES yet


(wiz)
diff -r1.32 -r1.33 pkgsrc/audio/openal-soft/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/audio/openal-soft/Makefile (switch to unified diff)

--- pkgsrc/audio/openal-soft/Makefile 2023/02/16 15:15:55 1.32
+++ pkgsrc/audio/openal-soft/Makefile 2023/02/20 12:23:44 1.33
@@ -1,63 +1,64 @@ @@ -1,63 +1,64 @@
1# $NetBSD: Makefile,v 1.32 2023/02/16 15:15:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2023/02/20 12:23:44 wiz Exp $
2 2
3DISTNAME= openal-soft-1.23.0 3DISTNAME= openal-soft-1.23.0
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= https://openal-soft.org/openal-releases/ 5MASTER_SITES= https://openal-soft.org/openal-releases/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://openal-soft.org/ 9HOMEPAGE= https://openal-soft.org/
10COMMENT= Software implementation of the OpenAL 3D audio API 10COMMENT= Software implementation of the OpenAL 3D audio API
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13USE_LANGUAGES= c c++14 13# c++20 not yet supported by mk/
 14USE_LANGUAGES= c c++
14USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
15 16
16# https://github.com/kcat/openal-soft/issues/347 17# uses [[likely]] from C++20
17GCC_REQD+= 5 18GCC_REQD+= 9
18 19
19PKGCONFIG_OVERRIDE+= openal.pc.in 20PKGCONFIG_OVERRIDE+= openal.pc.in
20PKG_SYSCONFSUBDIR= openal 21PKG_SYSCONFSUBDIR= openal
21 22
22CMAKE_ARGS+= -DALSOFT_EXAMPLES=OFF 23CMAKE_ARGS+= -DALSOFT_EXAMPLES=OFF
23CMAKE_ARGS+= -DALSOFT_UTILS=ON 24CMAKE_ARGS+= -DALSOFT_UTILS=ON
24CMAKE_ARGS+= -DALSOFT_NO_CONFIG_UTIL=ON 25CMAKE_ARGS+= -DALSOFT_NO_CONFIG_UTIL=ON
25CMAKE_ARGS+= -DALSOFT_RTKIT=OFF 26CMAKE_ARGS+= -DALSOFT_RTKIT=OFF
26 27
27CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\"" 28CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\""
28CFLAGS.NetBSD+= -D_NETBSD_SOURCE 29CFLAGS.NetBSD+= -D_NETBSD_SOURCE
29CFLAGS.SunOS+= -D__EXTENSIONS__ 30CFLAGS.SunOS+= -D__EXTENSIONS__
30 31
31BUILDLINK_TRANSFORM+= rm:-Wall 32BUILDLINK_TRANSFORM+= rm:-Wall
32 33
33CONF_FILES+= ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf 34CONF_FILES+= ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf
34 35
35.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
36 37
37.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" 38.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
38CMAKE_ARGS+= -DALSOFT_BACKEND_SOLARIS=ON 39CMAKE_ARGS+= -DALSOFT_BACKEND_SOLARIS=ON
39CMAKE_ARGS+= -DALSOFT_REQUIRE_SOLARIS=ON 40CMAKE_ARGS+= -DALSOFT_REQUIRE_SOLARIS=ON
40.endif 41.endif
41 42
42.include "../../mk/oss.buildlink3.mk" 43.include "../../mk/oss.buildlink3.mk"
43 44
44.if ${OSS_TYPE} != "none" 45.if ${OSS_TYPE} != "none"
45CMAKE_ARGS+= -DALSOFT_BACKEND_OSS=ON 46CMAKE_ARGS+= -DALSOFT_BACKEND_OSS=ON
46CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS=ON 47CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS=ON
47SUBST_CLASSES+= oss 48SUBST_CLASSES+= oss
48SUBST_STAGE.oss= pre-configure 49SUBST_STAGE.oss= pre-configure
49SUBST_MESSAGE.oss= Fixing default OSS device references. 50SUBST_MESSAGE.oss= Fixing default OSS device references.
50SUBST_FILES.oss= alc/backends/oss.cpp 51SUBST_FILES.oss= alc/backends/oss.cpp
51SUBST_SED.oss= -e 's,/dev/dsp,${DEVOSSAUDIO},' 52SUBST_SED.oss= -e 's,/dev/dsp,${DEVOSSAUDIO},'
52.endif 53.endif
53 54
54.include "options.mk" 55.include "options.mk"
55 56
56post-install: 57post-install:
57 ${RM} ${DESTDIR}${PREFIX}/include/AL/al.h.orig 58 ${RM} ${DESTDIR}${PREFIX}/include/AL/al.h.orig
58 59
59.include "../../devel/cmake/build.mk" 60.include "../../devel/cmake/build.mk"
60.include "../../audio/libmysofa/buildlink3.mk" 61.include "../../audio/libmysofa/buildlink3.mk"
61.include "../../mk/dlopen.buildlink3.mk" 62.include "../../mk/dlopen.buildlink3.mk"
62.include "../../mk/pthread.buildlink3.mk" 63.include "../../mk/pthread.buildlink3.mk"
63.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"