portaudio: Don't link with uuid (msys2#8805)

oscarfv · Jul 23, 2021 · e483ce4 · e483ce4
1 parent 2a0924a
commit e483ce4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/mingw-w64-portaudio/PKGBUILD b/mingw-w64-portaudio/PKGBUILD
@@ -4,7 +4,7 @@ _realname=portaudio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=190600_20161030
-pkgrel=3
+pkgrel=4
 pkgdesc="A free, cross-platform, open source, audio I/O library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,7 +18,7 @@ source=("http://www.portaudio.com/archives/pa_stable_v${pkgver}.tgz"
         "wdmks-wasapi-dsound.patch")
 sha256sums=('f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513'
             '77e8438d482ad03baa5c23afbe293e8cbdb95287ff6a489515bde61231e78525'
-            'fd62577c6fcf2811618701d49c68d6f0de515fad26f644ccacce57a16cf11bbc'
+            '1d023829bcfc2dd50de9d8aade52070c293564e047d96be83e95d112475cb6bb'
             )
 
 prepare() {

diff --git a/mingw-w64-portaudio/wdmks-wasapi-dsound.patch b/mingw-w64-portaudio/wdmks-wasapi-dsound.patch
@@ -1,9 +1,42 @@
 diff -Naur configure.in configure.in
 --- configure.in	2016-10-30 02:23:04.000000000 +0100
 +++ configure.in	2017-05-29 22:20:15.000000000 +0200
-@@ -346,7 +346,7 @@
+@@ -312,8 +312,8 @@ case "${host_os}" in
+         if [[ "x$with_asio" = "xyes" ]]; then
+             ASIODIR="$with_asiodir"
+             add_objects src/hostapi/asio/pa_asio.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_coinitialize.o src/hostapi/asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o
+-            LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
+-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid"
++            LIBS="${LIBS} -lwinmm -lm -lole32"
++            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32"
+             CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -UPA_USE_ASIO -DPA_USE_ASIO=1 -DWINDOWS"
+
+             dnl Setting the windows version flags below resolves a conflict between Interlocked* 
+@@ -328,8 +328,8 @@ case "${host_os}" in
+         if [[ "x$with_wdmks" = "xyes" ]]; then
+             DXDIR="$with_dxdir"
+             add_objects src/hostapi/wdmks/pa_win_wdmks.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_wdmks_utils.o src/os/win/pa_win_waveformat.o
+-            LIBS="${LIBS} -lwinmm -lm -luuid -lsetupapi -lole32"
+-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -luuid -lsetupapi -lole32"
++            LIBS="${LIBS} -lwinmm -lm -lsetupapi -lole32"
++            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -lsetupapi -lole32"
+             #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
+             #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
+             CFLAGS="$CFLAGS -I$DXDIR/include -UPA_USE_WDMKS -DPA_USE_WDMKS=1"
+@@ -337,15 +337,15 @@ case "${host_os}" in
+
+         if [[ "x$with_wmme" = "xyes" ]]; then
+             add_objects src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
+-            LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
++            LIBS="${LIBS} -lwinmm -lm -lole32"
+             DLL_LIBS="${DLL_LIBS} -lwinmm"
+             CFLAGS="$CFLAGS -UPA_USE_WMME -DPA_USE_WMME=1"
+         fi
+
+         if [[ "x$with_wasapi" = "xyes" ]]; then
              add_objects src/hostapi/wasapi/pa_win_wasapi.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_coinitialize.o src/os/win/pa_win_waveformat.o
-             LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
+-            LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
++            LIBS="${LIBS} -lwinmm -lm -lole32"
              DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
 -            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
 +            CFLAGS="$CFLAGS -UPA_USE_WASAPI -DPA_USE_WASAPI=1"