From owner-svn-ports-all@freebsd.org Tue Mar 13 14:11:43 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05BBEF50818; Tue, 13 Mar 2018 14:11:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE5487EC2F; Tue, 13 Mar 2018 14:11:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A93761AE46; Tue, 13 Mar 2018 14:11:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DEBgbk038197; Tue, 13 Mar 2018 14:11:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DEBgbl038195; Tue, 13 Mar 2018 14:11:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803131411.w2DEBgbl038195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 13 Mar 2018 14:11:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464376 - in head/audio/alsa-lib: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/audio/alsa-lib: . files X-SVN-Commit-Revision: 464376 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 14:11:43 -0000 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