Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_158780769283450"
MIME-Version: 1.0
Date: Sat, 25 Apr 2020 09:41:32 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/portaudio
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200425094132.34C55FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_158780769283450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sat Apr 25 09:41:32 UTC 2020

Modified Files:
	pkgsrc/audio/portaudio: distinfo
	pkgsrc/audio/portaudio/patches: patch-configure.in

Log Message:
portaudio: Fix detection of sun


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/portaudio/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/portaudio/patches/patch-configure.in

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


--_----------=_158780769283450
Content-Disposition: inline
Content-Length: 2556
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/portaudio/distinfo
diff -u pkgsrc/audio/portaudio/distinfo:1.22 pkgsrc/audio/portaudio/distinfo:1.23
--- pkgsrc/audio/portaudio/distinfo:1.22	Fri Apr 17 15:50:03 2020
+++ pkgsrc/audio/portaudio/distinfo	Sat Apr 25 09:41:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/04/17 15:50:03 nia Exp $
+$NetBSD: distinfo,v 1.23 2020/04/25 09:41:31 nia Exp $
 
 SHA1 (pa_stable_v190600_20161030.tgz) = 56c596bba820d90df7d057d8f6a0ec6bf9ab82e8
 RMD160 (pa_stable_v190600_20161030.tgz) = e6e5cd3f3cb7469aa17549c189e445d573567e13
@@ -6,7 +6,7 @@ SHA512 (pa_stable_v190600_20161030.tgz) 
 Size (pa_stable_v190600_20161030.tgz) = 1450572 bytes
 SHA1 (patch-Makefile.in) = 28f587f171b4a504e3982e6f8fcf3f148e5aa5c9
 SHA1 (patch-bindings_cpp_Makefile.am) = bcd45cba537c867ed9b2e20e1468e9f16ed0b3f7
-SHA1 (patch-configure.in) = 4241ddc620e50364aa86fe583a6d8709fdf833ee
+SHA1 (patch-configure.in) = 9ccc782631a6aaa9e2c7b8390a6b527ead25d0a5
 SHA1 (patch-include_pa__unix__oss.h) = 8e4ede09d5bf730bf8c2e8ca4aca6f700f58f2f7
 SHA1 (patch-include_portaudio.h) = 9a2e4aeb126056aded5cc49c40cde40e16738757
 SHA1 (patch-src_common_pa__front.c) = cdddb6f537f803b55873ad6bfa936a6bff47556d

Index: pkgsrc/audio/portaudio/patches/patch-configure.in
diff -u pkgsrc/audio/portaudio/patches/patch-configure.in:1.1 pkgsrc/audio/portaudio/patches/patch-configure.in:1.2
--- pkgsrc/audio/portaudio/patches/patch-configure.in:1.1	Fri Apr 17 15:50:03 2020
+++ pkgsrc/audio/portaudio/patches/patch-configure.in	Sat Apr 25 09:41:32 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure.in,v 1.1 2020/04/17 15:50:03 nia Exp $
+$NetBSD: patch-configure.in,v 1.2 2020/04/25 09:41:32 nia Exp $
 
 - Sun/NetBSD audio support
 - Install extra headers needed by portmixer in Audacity for OSS.
-- Don't use -pthread
+- Don't use -lpthread
 
 --- configure.in.orig	2016-10-30 01:23:04.000000000 +0000
 +++ configure.in
@@ -23,7 +23,7 @@ $NetBSD: patch-configure.in,v 1.1 2020/0
  fi
 +have_sun=no
 +if test "x$with_sun" != "xno"; then
-+    AC_CHECK_HEADERS([sys/audioio.h], [have_sun=yes])
++    AC_CHECK_HEADERS([sys/audioio.h], [have_sun=yes], [have_sun=no])
 +fi
  have_jack=no
  if test "x$with_jack" != "xno"; then
@@ -40,7 +40,7 @@ $NetBSD: patch-configure.in,v 1.1 2020/0
             AC_DEFINE(PA_USE_OSS,1)
          fi
  
-+        if [[ "$with_sun" != "no" ]] ; then
++        if [[ "$have_sun" = "yes" ] && [ "$with_sun" != "no" ]] ; then
 +           OTHER_OBJS="$OTHER_OBJS src/hostapi/sun/pa_unix_sun.o"
 +           AC_DEFINE(PA_USE_SUN,1)
 +        fi


--_----------=_158780769283450--