CVS commit: [pkgsrc-2021Q1] pkgsrc/emulators/qemu

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Apr 10 08:43:22 UTC 2021

Modified Files:
        pkgsrc/emulators/qemu [pkgsrc-2021Q1]: Makefile

Log Message:
Pullup ticket #6438 - requested by nia
emulators/qemu: bugfix

Revisions pulled up:
- emulators/qemu/Makefile                                       1.273

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Thu Apr  8 13:18:04 UTC 2021

   Modified Files:
        pkgsrc/emulators/qemu: Makefile

   Log Message:
   qemu: correct path to OSS audio device


To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.268.2.1 pkgsrc/emulators/qemu/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.268 pkgsrc/emulators/qemu/Makefile:1.268.2.1
--- pkgsrc/emulators/qemu/Makefile:1.268        Fri Mar 19 13:24:15 2021
+++ pkgsrc/emulators/qemu/Makefile      Sat Apr 10 08:43:22 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.268 2021/03/19 13:24:15 reinoud Exp $
+# $NetBSD: Makefile,v 1.268.2.1 2021/04/10 08:43:22 bsiegert Exp $
 
 DISTNAME=      qemu-5.2.0
-PKGREVISION=   4
+PKGREVISION=   6
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -91,6 +91,16 @@ PKG_SYSCONFSUBDIR=   qemu
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu
 
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+SUBST_CLASSES+=                oss
+SUBST_STAGE.oss=       pre-configure
+SUBST_MESSAGE.oss=     Correcting the path to the OSS device.
+SUBST_FILES.oss+=      audio/ossaudio.c
+SUBST_SED.oss+=                -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.endif
+
 UE_ARCHS+=             aarch64 aarch64_be
 UE_ARCHS+=             alpha arm armeb cris
 UE_ARCHS+=             hppa
@@ -166,10 +176,6 @@ post-install:
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
 
-# On Darwin, qemu uses CoreAudio
-.if ${OPSYS} != "Darwin"
-.include "../../mk/oss.buildlink3.mk"
-.endif
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/jemalloc/buildlink3.mk"