Thu Apr 8 13:18:04 2021 UTC ()
qemu: correct path to OSS audio device


(nia)
diff -r1.272 -r1.273 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.272 -r1.273 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2021/04/08 13:10:18 1.272
+++ pkgsrc/emulators/qemu/Makefile 2021/04/08 13:18:04 1.273
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.272 2021/04/08 13:10:18 nia Exp $ 1# $NetBSD: Makefile,v 1.273 2021/04/08 13:18:04 nia Exp $
2 2
3DISTNAME= qemu-5.2.0 3DISTNAME= qemu-5.2.0
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 14BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
15 15
16USE_CURSES= resize_term wide 16USE_CURSES= resize_term wide
17USE_LANGUAGES+= c c++ 17USE_LANGUAGES+= c c++
@@ -81,26 +81,36 @@ NOT_PAX_MPROTECT_SAFE+= bin/qemu-system- @@ -81,26 +81,36 @@ NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-
81NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4 81NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4
82NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4eb 82NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4eb
83NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc 83NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc
84NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc64 84NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc64
85NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-tricore 85NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-tricore
86NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64 86NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64
87NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensa 87NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensa
88NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb 88NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb
89 89
90PKG_SYSCONFSUBDIR= qemu 90PKG_SYSCONFSUBDIR= qemu
91 91
92INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 92INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
93 93
 94.include "../../mk/oss.buildlink3.mk"
 95
 96.if ${OSS_TYPE} != "none"
 97SUBST_CLASSES+= oss
 98SUBST_STAGE.oss= pre-configure
 99SUBST_MESSAGE.oss= Correcting the path to the OSS device.
 100SUBST_FILES.oss+= audio/ossaudio.c
 101SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
 102.endif
 103
94UE_ARCHS+= aarch64 aarch64_be 104UE_ARCHS+= aarch64 aarch64_be
95UE_ARCHS+= alpha arm armeb cris 105UE_ARCHS+= alpha arm armeb cris
96UE_ARCHS+= hppa 106UE_ARCHS+= hppa
97UE_ARCHS+= i386 107UE_ARCHS+= i386
98UE_ARCHS+= m68k microblaze microblazeel 108UE_ARCHS+= m68k microblaze microblazeel
99UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el 109UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el
100UE_ARCHS+= nios2 110UE_ARCHS+= nios2
101UE_ARCHS+= or1k ppc ppc64 ppc64le 111UE_ARCHS+= or1k ppc ppc64 ppc64le
102UE_ARCHS+= riscv32 riscv64 112UE_ARCHS+= riscv32 riscv64
103UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64 113UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64
104UE_ARCHS+= x86_64 xtensa xtensaeb 114UE_ARCHS+= x86_64 xtensa xtensaeb
105 115
106.if ${OPSYS} == "NetBSD" 116.if ${OPSYS} == "NetBSD"
@@ -155,30 +165,26 @@ do-install: @@ -155,30 +165,26 @@ do-install:
155# failing due to configure bugs. 165# failing due to configure bugs.
156post-build: 166post-build:
157 ${TOUCH} ${WRKSRC}/config-host.mak 167 ${TOUCH} ${WRKSRC}/config-host.mak
158 168
159post-install: 169post-install:
160 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \ 170 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
161 ${DESTDIR}${PREFIX}/share/doc/qemu/ 171 ${DESTDIR}${PREFIX}/share/doc/qemu/
162 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo 172 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
163 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo 173 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo
164 ${RM} -f ${WRKDIR}/PLIST.STATIC 174 ${RM} -f ${WRKDIR}/PLIST.STATIC
165 cd ${DESTDIR}${PREFIX} && \ 175 cd ${DESTDIR}${PREFIX} && \
166 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC 176 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
167 177
168# On Darwin, qemu uses CoreAudio 
169.if ${OPSYS} != "Darwin" 
170.include "../../mk/oss.buildlink3.mk" 
171.endif 
172.include "../../archivers/lzo/buildlink3.mk" 178.include "../../archivers/lzo/buildlink3.mk"
173.include "../../devel/glib2/buildlink3.mk" 179.include "../../devel/glib2/buildlink3.mk"
174.include "../../devel/jemalloc/buildlink3.mk" 180.include "../../devel/jemalloc/buildlink3.mk"
175.include "../../devel/snappy/buildlink3.mk" 181.include "../../devel/snappy/buildlink3.mk"
176.include "../../devel/zlib/buildlink3.mk" 182.include "../../devel/zlib/buildlink3.mk"
177.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 183.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
178.include "../../graphics/png/buildlink3.mk" 184.include "../../graphics/png/buildlink3.mk"
179.include "../../lang/python/extension.mk" 185.include "../../lang/python/extension.mk"
180.include "../../lang/python/versioned_dependencies.mk" 186.include "../../lang/python/versioned_dependencies.mk"
181.include "../../security/libgcrypt/buildlink3.mk" 187.include "../../security/libgcrypt/buildlink3.mk"
182.include "../../www/curl/buildlink3.mk" 188.include "../../www/curl/buildlink3.mk"
183.include "../../x11/pixman/buildlink3.mk" 189.include "../../x11/pixman/buildlink3.mk"
184.include "../../mk/curses.buildlink3.mk" 190.include "../../mk/curses.buildlink3.mk"