Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/oss.buildlink3.mk: Simplify per-OS DEV* conditio...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f4712ee601c
branches:  trunk
changeset: 428771:3f4712ee601c
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Apr 11 10:31:14 2020 +0000

description:
mk/oss.buildlink3.mk: Simplify per-OS DEV* conditionals. Add MIDI.

diffstat:

 mk/oss.buildlink3.mk |  21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diffs (37 lines):

diff -r 30eb05c9664e -r 3f4712ee601c mk/oss.buildlink3.mk
--- a/mk/oss.buildlink3.mk      Sat Apr 11 08:25:20 2020 +0000
+++ b/mk/oss.buildlink3.mk      Sat Apr 11 10:31:14 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: oss.buildlink3.mk,v 1.13 2019/06/30 21:28:28 rillig Exp $
+# $NetBSD: oss.buildlink3.mk,v 1.14 2020/04/11 10:31:14 nia Exp $
 #
 # This Makefile fragment is included by packages that require an Open Sound
 # System (OSS) implementation.  After inclusion of this file, the following
@@ -33,21 +33,14 @@
 
 .if !empty(OSS_BUILDLINK3_MK:M+)
 LIBOSSAUDIO?=          ${BUILDLINK_LDADD.oss}
-.  if (${OPSYS} == "Linux") && exists(/dev/dsp)
-DEVOSSAUDIO?=          /dev/dsp
-DEVOSSSOUND?=          /dev/dsp
-.  elif ${OPSYS} == "DragonFly"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+DEVOSSAUDIO?=          /dev/audio
+DEVOSSSOUND?=          /dev/sound
+DEVOSSMIDI?=           /dev/rmidi0
+.  else
 DEVOSSAUDIO?=          /dev/dsp
 DEVOSSSOUND?=          /dev/dsp
-.  elif ${OPSYS} == "FreeBSD"
-DEVOSSAUDIO?=          /dev/dsp
-DEVOSSSOUND?=          /dev/dsp
-.  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) && exists(/dev/dsp)
-DEVOSSAUDIO?=          /dev/dsp
-DEVOSSSOUND?=          /dev/dsp
-.  else
-DEVOSSAUDIO?=          /dev/audio
-DEVOSSSOUND?=          /dev/sound
+DEVOSSMIDI?=           /dev/midi
 .  endif
 
 CONFIGURE_ENV+=                LIBOSSAUDIO=${LIBOSSAUDIO:Q}



Home | Main Index | Thread Index | Old Index