fix build

3 files changed, 53 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0a48df2009f..92dd549a8221 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = mingw-w64-portaudio
 	pkgdesc = A free, cross-platform, open source, audio I/O library. (mingw-w64)
-	pkgver = 190600_20161030
-	pkgrel = 2
+	pkgver = 19.6.0
+	pkgrel = 1
+	epoch = 1
 	url = http://www.portaudio.com
 	arch = any
 	license = custom
@@ -15,9 +16,11 @@ pkgbase = mingw-w64-portaudio
 	source = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 	source = fix-build.patch
 	source = wdmks-wasapi-dsound.patch.tar.gz
+	source = fix-memmove-chk-error.patch
 	sha256sums = f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513
 	sha256sums = 77e8438d482ad03baa5c23afbe293e8cbdb95287ff6a489515bde61231e78525
 	sha256sums = e0d2c619323e81e2b9539bb6f061289f08f2a01b6c7edd6228f7e750b0421166
+	sha256sums = d1d83ed329b43f3ac89c653b7a01d0ba57eb94020c640490fbb1572b3b638273
 
 pkgname = mingw-w64-portaudio
 
diff --git a/PKGBUILD b/PKGBUILD
index b0d9e52549b7..e068ebb2c766 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,13 @@
-# Maintainer: Andrew Sun <adsun701@gmail.com>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Maintainer: Andrew Sun <adsun701 at gmail dot com>
+# Contributor: Daniel Micay <danielmicay at gmail dot com>
 
 pkgname=mingw-w64-portaudio
-pkgver=190600_20161030
-pkgrel=2
+# versioning is very bizarre:
+# https://app.assembla.com/wiki/show/portaudio/ReleaseNotes
+_version=190600_20161030
+pkgver=19.6.0
+pkgrel=1
+epoch=1
 pkgdesc="A free, cross-platform, open source, audio I/O library. (mingw-w64)"
 arch=('any')
 url="http://www.portaudio.com"
@@ -11,12 +15,14 @@ license=("custom")
 makedepends=('mingw-w64-configure')
 depends=('mingw-w64-crt')
 options=('!libtool' '!strip' '!buildflags' '!makeflags' 'staticlibs')
-source=("http://www.portaudio.com/archives/pa_stable_v${pkgver}.tgz"
+source=("http://www.portaudio.com/archives/pa_stable_v${_version}.tgz"
         "fix-build.patch"
-        "wdmks-wasapi-dsound.patch.tar.gz")
+        "wdmks-wasapi-dsound.patch.tar.gz"
+        "fix-memmove-chk-error.patch")
 sha256sums=('f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513'
             '77e8438d482ad03baa5c23afbe293e8cbdb95287ff6a489515bde61231e78525'
-            'e0d2c619323e81e2b9539bb6f061289f08f2a01b6c7edd6228f7e750b0421166')
+            'e0d2c619323e81e2b9539bb6f061289f08f2a01b6c7edd6228f7e750b0421166'
+            'd1d83ed329b43f3ac89c653b7a01d0ba57eb94020c640490fbb1572b3b638273')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -25,6 +31,7 @@ prepare() {
   
   patch -p0 -i ${srcdir}/fix-build.patch
   patch -p0 -i ${srcdir}/wdmks-wasapi-dsound.patch
+  patch -Np1 -i ${srcdir}/fix-memmove-chk-error.patch
 
   autoconf
 }
@@ -37,7 +44,7 @@ build() {
   for _arch in ${_architectures}; do
     # static
     mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    ${_arch}-configure \
+    DLL_LIBS+=" -lssp" ${_arch}-configure \
       --enable-static \
       --disable-shared \
       --with-dxdir=/usr/${_arch} \
@@ -48,7 +55,7 @@ build() {
     
     # shared
     mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
-    ${_arch}-configure \
+    DLL_LIBS+=" -lssp" ${_arch}-configure \
       --disable-static \
       --enable-shared \
       --with-dxdir=/usr/${_arch} \
diff --git a/fix-memmove-chk-error.patch b/fix-memmove-chk-error.patch
new file mode 100644
index 000000000000..cb4fd8c5bc85
--- /dev/null
+++ b/fix-memmove-chk-error.patch
@@ -0,0 +1,32 @@
+diff -Naur portaudio.orig/Makefile.in portaudio/Makefile.in
+--- portaudio.orig/Makefile.in	2020-03-06 14:30:53.315561726 -0500
++++ portaudio/Makefile.in	2020-03-06 14:43:02.694517432 -0500
+@@ -171,20 +171,20 @@
+ 	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS)
+ 
+ $(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c
+-	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
+-	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o $@ $(CXXFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
+ 
+ $(EXAMPLES): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) examples/%.c
+-	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS)
+-	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o $@ $(CFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o $@ $(CXXFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS)
+ 
+ $(SELFTESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) qa/%.c
+-	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS)
+-	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o $@ $(CFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_TRUE@  $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o $@ $(CXXFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS)
+ 
+ bin/paloopback: lib/$(PALIB) $(MAKEFILE) $(PAINC) $(LOOPBACK_OBJS)
+-	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS)
+-	@WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS)  $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o $@ $(CFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS)
++	@WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o $@ $(CXXFLAGS)  $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS)
+ 
+ install: lib/$(PALIB) portaudio-2.0.pc
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)