Mercurial > mxe-octave

changeset 3776:5fd074e27f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
audio: updates for libsound, portaudio * src/libsndfile-1-fixes.patch: added file * src/portaudio.mk: remove building of test program, fix typo for AR. * dist-files.mk: add libsndfile-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Sun, 25 Jan 2015 07:59:19 -0500
parents 7f250bf4c472
children 4e4cb8653942
files dist-files.mk src/libsndfile-1-fixes.patch src/libsndfile.mk src/portaudio.mk
diffstat 4 files changed, 31 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Jan 23 10:03:25 2015 -0500
+++ b/dist-files.mk	Sun Jan 25 07:59:19 2015 -0500
@@ -286,6 +286,7 @@
   libshout-1-fixes.patch \
   libshout.mk \
   libsigc++.mk \
+  libsndfile-1-fixes.patch \
   libsndfile.mk \
   libssh2-1-fixes.patch \
   libssh2-test.c \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libsndfile-1-fixes.patch	Sun Jan 25 07:59:19 2015 -0500
@@ -0,0 +1,28 @@
+This file is part of MXE.
+See index.html for further information.
+
+Taken from https://github.com/erikd/libsndfile/pull/76
+
+From 9ce0175df1fcb3db7a63ba8a72712b4676a3af86 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Mon, 1 Sep 2014 11:05:13 -0700
+Subject: [PATCH] configure.ac: Fix detection of MinGW
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index 20ba55a..d25201c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,7 +168,7 @@ unset ac_cv_sizeof_off_t
+ AC_CHECK_SIZEOF(off_t,1)	# Fake default value.
+ 
+ case "$host_os" in
+-	mingw32msvc | mingw32)
++	mingw32*)
+ 		TYPEOF_SF_COUNT_T="__int64"
+ 		SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL"
+ 		SIZEOF_SF_COUNT_T=8
+-- 
+1.9.1
+
--- a/src/libsndfile.mk	Fri Jan 23 10:03:25 2015 -0500
+++ b/src/libsndfile.mk	Sun Jan 25 07:59:19 2015 -0500
@@ -18,6 +18,7 @@
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)' && autoreconf -fi -IM4
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
--- a/src/portaudio.mk	Fri Jan 23 10:03:25 2015 -0500
+++ b/src/portaudio.mk	Sun Jan 25 07:59:19 2015 -0500
@@ -29,16 +29,12 @@
         --with-host_os=mingw \
         --with-winapi=wmme,directx \
         --with-dxdir=$(HOST_PREFIX) \
-        ac_cv_path_AR=$MXE_AR() \
+        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 '$(1)/test-portaudio.exe' \
-        `'$(MXE_PKG_CONFIG)' portaudio-2.0 --cflags --libs`
 endef