Mercurial > mxe-octave

changeset 3641:f362e10a0fa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portaudio: update to 19_20140130 * src/portaudio.mk: update version, settings for mingw-64 * src/portaudio-1-win32.patch: update patch
author John Donoghue
date Tue, 01 Jul 2014 09:48:50 -0400
parents 5e169963644e
children 5a459f007b2f
files src/portaudio-1-win32.patch src/portaudio.mk
diffstat 2 files changed, 37 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/src/portaudio-1-win32.patch	Tue Jul 01 10:11:40 2014 -0400
+++ b/src/portaudio-1-win32.patch	Tue Jul 01 09:48:50 2014 -0400
@@ -14,60 +14,29 @@
                              case DSSPEAKER_7POINT1:          count = 8; break;
  #ifndef DSSPEAKER_7POINT1_SURROUND
  #define DSSPEAKER_7POINT1_SURROUND 0x00000008
-diff -aur portaudio/src/hostapi/wdmks/pa_win_wdmks.c portaudio-patched/src/hostapi/wdmks/pa_win_wdmks.c
---- portaudio/src/hostapi/wdmks/pa_win_wdmks.c	2011-02-17 15:56:04.000000000 +0000
-+++ portaudio-patched/src/hostapi/wdmks/pa_win_wdmks.c	2012-03-02 21:49:13.000000000 +0000
-@@ -136,6 +136,7 @@
+diff -Nuar portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c
+--- portaudio/src/hostapi/dsound/pa_win_ds.c	2014-02-02 14:16:01.916602634 +0100
++++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c	2014-02-02 14:17:19.340378622 +0100
+@@ -2108,7 +2108,8 @@
+         }
+         else
+         {
+-            CalculateBufferSettings( &stream->hostBufferSizeFrames, &pollingPeriodFrames,
++            CalculateBufferSettings( (unsigned long*)&stream->hostBufferSizeFrames,
++                    &pollingPeriodFrames,
+                     /* isFullDuplex = */ (inputParameters && outputParameters),
+                     suggestedInputLatencyFrames,
+                     suggestedOutputLatencyFrames,
+diff --git a/configure.in b/configure.in
+index 305b64e..3f3b31e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -318,7 +318,7 @@ case "${host_os}" in
  
- #include <mmreg.h>
- #include <ks.h>
-+#define _WAVEFORMATEXTENSIBLE_
- #include <ksmedia.h>
- #include <tchar.h>
- #include <assert.h>
---- portaudio/configure.in 14:07:02.000000000 +0000
-+++ portaudio-patched/configure.in	2012-05-27 14:08:34.000000000 +0000
-@@ -247,7 +247,7 @@
-         if [[ "x$with_directx" = "xyes" ]]; then
-             DXDIR="$with_dxdir"
-             add_objects src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.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="-lwinmm -lm -ldsound -lole32"
-+            LIBS="$LIBS -lwinmm -lm -ldsound -lole32"
-             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -ldsound -lole32"
-             #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
-             #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
-@@ -257,7 +257,7 @@
-         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="-lwinmm -lm -lole32 -luuid"
-+            LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
-             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid"
-             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"
- 
-@@ -273,7 +273,7 @@
          if [[ "x$with_wdmks" = "xyes" ]]; then
              DXDIR="$with_dxdir"
-             add_objects src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o
--            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"
-+            LIBS="$LIBS -lwinmm -lm -luuid -lsetupapi -lole32"
+-            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_util.o src/os/win/pa_win_waveformat.o
++            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"
              #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
-             #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
-@@ -282,14 +282,14 @@
- 
-         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="-lwinmm -lm -lole32 -luuid"
-+            LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
-             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="-lwinmm -lm -lole32 -luuid"
-+            LIBS="$LIBS -lwinmm -lm -lole32 -luuid"
-             DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
-             CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
-         fi
--- a/src/portaudio.mk	Tue Jul 01 10:11:40 2014 -0400
+++ b/src/portaudio.mk	Tue Jul 01 09:48:50 2014 -0400
@@ -3,12 +3,12 @@
 
 PKG             := portaudio
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 19_20111121
-$(PKG)_CHECKSUM := f07716c470603729a55b70f5af68f4a6807097eb
+$(PKG)_VERSION  := 19_20140130
+$(PKG)_CHECKSUM := 526a7955de59016a06680ac24209ecb6ce05527d
 $(PKG)_SUBDIR   := portaudio
 $(PKG)_FILE     := pa_stable_v$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://www.portaudio.com/archives/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.portaudio.com/download.html' | \
@@ -18,19 +18,27 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
+    # libtool looks for a pei* format when linking shared libs
+    # apparently there's no real difference b/w pei and pe
+    # so we set the libtool cache variables
+    # https://sourceware.org/cgi-bin/cvsweb.cgi/src/bfd/libpei.h?annotate=1.25&cvsroot=src
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)'
         $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)' \
         --with-host_os=mingw \
-        --with-winapi=wmme,directx,wasapi,wdmks \
+        --with-winapi=wmme,directx \
         --with-dxdir=$(HOST_PREFIX) \
-        ac_cv_path_AR=$(MXE_AR)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' SHARED_FLAGS= TESTS=
+        ac_cv_path_AR=$MXE_AR() \
+        $(if $(filter $(BUILD_SHARED),yes),\
+            lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \
+            lt_cv_file_magic_cmd='$$OBJDUMP -f')
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(if $(filter $(BUILD_STATIC),yes),SHARED_FLAGS=) TESTS=
     $(MAKE) -C '$(1)' -j 1 install
 
     '$(MXE_CC)' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-portaudio.exe' \
+        '$(2).c' -o '$(1)/test-portaudio.exe' \
         `'$(MXE_PKG_CONFIG)' portaudio-2.0 --cflags --libs`
 endef
+