svn commit: r464376 - in head/audio/alsa-lib: . files

[Jan Beich]

Author: jbeich
Date: Tue Mar 13 14:11:42 2018
New Revision: 464376
URL: https://svnweb.freebsd.org/changeset/ports/464376

Log:
  audio/alsa-lib: drop _WANT_SEMUN

Modified:
  head/audio/alsa-lib/Makefile   (contents, props changed)
  head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c   (contents, props changed)

Modified: head/audio/alsa-lib/Makefile
==============================================================================
--- head/audio/alsa-lib/Makefile	Tue Mar 13 14:05:10 2018	(r464375)
+++ head/audio/alsa-lib/Makefile	Tue Mar 13 14:11:42 2018	(r464376)
@@ -23,7 +23,6 @@ INSTALL_TARGET=	install-strip
 TEST_ENV=	${MAKE_ENV} ALSA_CONFIG_PATH="${FILESDIR}/asound.conf.sample"
 TEST_TARGET=	check
 CPPFLAGS+=	-I${FILESDIR}
-CPPFLAGS+=	-D_WANT_SEMUN
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes

Modified: head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c
==============================================================================
--- head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c	Tue Mar 13 14:05:10 2018	(r464375)
+++ head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c	Tue Mar 13 14:11:42 2018	(r464376)
@@ -1,17 +1,18 @@
 --- src/pcm/pcm_direct.c.orig	2016-03-31 13:10:39 UTC
 +++ src/pcm/pcm_direct.c
-@@ -44,12 +44,16 @@
+@@ -44,12 +44,17 @@
   *
   */
   
-+#if defined(__NetBSD__)
-+typedef __semun semun;
-+#elif !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
++#if !defined(__DragonFly__) && !defined(__OpenBSD__) \
++  && !(defined(__FreeBSD__) && __FreeBSD__ < 12)
  union semun {
  	int              val;    /* Value for SETVAL */
  	struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
  	unsigned short  *array;  /* Array for GETALL, SETALL */
++#ifdef __linux__
  	struct seminfo  *__buf;  /* Buffer for IPC_INFO (Linux specific) */
++#endif
  };
 +#endif