-AUX aubio-0.3.2-multilib.patch 420 RMD160 bff07b86d296ad8de57252260c3790167c543474 SHA1 da7552530668096be8bf94036fa82b34e6bc6577 SHA256 ff264f47c7c1d35f703c28dce59053428015c616a7c43ddf3dbd8c21e806b16a
-AUX aubio-9999-0001-Wrap-IFELSE-code-with-AC_LANG_SOURCE-in-configure.ac.patch 1029 RMD160 b7ada6e4c0f039067eecf0af8a53a1ce6c3c9fa7 SHA1 8822f3a2fb8693684dc2cb6278daefdf93bc285d SHA256 890f5dca47009d4ee529e21638a9020f5199da81dd169fbc19204766b2cd4dd5
-AUX aubio-9999-0002-Tell-autotools-that-macros-should-be-stored-in-the-m.patch 1152 RMD160 3c66ee1d77558d650fb3202b86d768d30eead4a7 SHA1 f589e5ec802c5139ea5ec3359cd3a9195a8b08b6 SHA256 5f29858524368dd2fa5484b5d8ded8fd14afdb9eeb47f87c06ca70d31edb5ad0
-AUX aubio-9999-0003-Add-trailing-slash-to-wrap-noinst_PROGRAMS-in-exampl.patch 988 RMD160 fc9207cafd53833cc628598511c4881515edf5fa SHA1 4ffbc0398405fbac2b9b014074a405437c136575 SHA256 23003d709257dbb63ae1abbb52c190a17ad404f346d107af67f1a70693781731
-AUX aubio-9999-0004-Include-aubio.h-and-config.h-in-examples-sndfileio.c.patch 1693 RMD160 b102a4f0225524bfef8622089c5dd18694ef3d42 SHA1 b09cc34f96c561b037eba920e1084ecb202792d2 SHA256 3345e6d48e0caa75bb74a124a621fa6d8c0f89af56e49e1b164fc478b52bde57
-AUX aubio-9999-0005-Declare-aubio_sndfile_read_mono-in-sndfileio.h.patch 1305 RMD160 63333fa889063c03f8dd4227ba16dcc1029a9c03 SHA1 ba9b9c4603036a892428a268074f8fdc2ef70452 SHA256 4d846d4439ef9f666f39d968ae31ee844ffdbe119a4c716c985ca60416542100
-EBUILD aubio-9999.ebuild 2182 RMD160 de416fddeb55bd4634ddbcb5474b737a4546f9ec SHA1 29b16027405a4d154081bf81ed60276b91d6789a SHA256 06d66147feb792d8839adaa2efc3f667cddfe40baa76fff972b98a5724efff36
+AUX aubio-0.3.2-multilib.patch 420 SHA256 ff264f47c7c1d35f703c28dce59053428015c616a7c43ddf3dbd8c21e806b16a SHA512 ba6c400a989367fab7f09d150d0f3934d9fb7de87bf84d2cf52276622ceacdaa799ba4c35e264a9875b87c17ebcdac68fedd4f20be2ad0efd9b44948c50fb03d WHIRLPOOL 759b6bab1b8dd605aa4de1086be223bedc27e00902351bd0e9cf454eeb87a8ca27b4753d37ebd58f26b2616984e3cf5a1d9f5c3ccfb82359dffee5d1095a948a
+AUX aubio-9999-0001-configure.ac-wrap-IFELSE-code-with-AC_LANG_SOURCE.patch 1109 SHA256 45353c6ae316c3891a02d6e49029eb2d7b2973f4d5ad4d43be555bd4b54f4edd SHA512 126f2904bafff3782fdec39060b5691f52b3bbcb2bdab6c450bfc3cb13b4f662142cf86f44d49e7d87c3e9818ee624d510af0848914f17e56b4ff28d134901a0 WHIRLPOOL ede477370daf6308708837902db3781c6cdd10e82443485905dcc39e8c61341daeadb61d026c180d71ee86929d601b166cb7e93dce2d35a0bb211d632069dc8a
+AUX aubio-9999-0002-m4-add-empty-directory-to-satisfy-autoreconf.patch 1277 SHA256 66a16a1c5c31349e86f25f543e66cfa081bc0dc7a4f2c53ac72e80f337e39409 SHA512 c6bba16647cd518e42d441976d0561fae921c8f73316bc551aeaeb20ec18eac3ce7a5703ab4cefe4874d259ddbbbfd0e22341655198541cd8b14d4552215444c WHIRLPOOL 08519d353c80b387b355ec071245df17da54762d4e086f91c67c8fd522ed5b50cc8e2f9dffc71376b6898e036b9971bc3fd7e7e01a597a4b7dc86ee296f5908b
+AUX aubio-9999-0003-examples-Makefile.am-remove-sndfileio-from-EXTRA_DIS.patch 1419 SHA256 1360947e56466c5f6e4a030e39ca89391dfc26cc935714f534db2259085f1730 SHA512 f29e33fe1b90fc748a8118f429bab7c73b2935041281b5664a5fdb126388f69a1998767ee636efab26a1a195b71e08085c2cf14d018dc392a06691b44433d27b WHIRLPOOL 96463f803c0ee335cf792ce2e8bdbeb64792c50f101c7578b20392c64206150c88679e52d39b62207bd4dc2beda056c88c75e663ae43c4a09127131eaabcdff0
+AUX aubio-9999-0004-src-Makefile.am-add-io-.-ch-to-libaubio-sources.patch 2964 SHA256 c69b0525bbc2329dec5320cea1a32f3d15ee8dc96e3f127dfba4cc6c20931ac1 SHA512 9e8163ce383a37ab558cfa45444344790ef9429d1be61cb917fe6672b52603da4bc240333fcd3d9bfa69d32ffb613ebb1912cec788202e1da374e57e90b847eb WHIRLPOOL 791420d51492367c7a6393536f1046dc7ee46762432664b801220b6930bbd73e1baecdad3cd962b7360cee5f94d44e4519fa38422b5c1481a44b4a181673a846
+AUX aubio-9999-0005-swig-aubio.i-remove-sndfileio.h.patch 1580 SHA256 c75a4921dd034c40fcd2197203505d129fd7fa3cd3cca856081784132b3a6787 SHA512 23c5f70a6c2ece39bf17a162807b74365da9446f235bda1834581522ae2b7ab9de31babe80131d9c5949852ffc58c74b2801fd5a539ec8c913dbe6b08326e8ab WHIRLPOOL 1b289398ba5e3a3166189b7c065bf59f2b77aaf016e85636c00d5d719a89937e89d1e8dd4ca0ca2f2df6d1f104ec7d61b70b293d3d3bd99207199230bfb8990a
+AUX aubio-9999-0006-python-aubio-Makefile.am-don-t-depend-on-sndfileio.c.patch 1438 SHA256 1a96b8d448cd090204682757e31deba2dd69bd6978aa110a1edd22d993c1521b SHA512 766e58018137b60be910580f4d2caeebde876c7ba16e6b0ae01cb5a187d8b5e50b385527be0e62384a4f8a0c37cd8de0f8cbff5517d8bacc51284de5035ec5dd WHIRLPOOL 4c4e307a448bf5f952105468053cf49761d63f9638519382bdbc0e32a6f8d1374dc5d661ba2ee47fcd7124216c902ee9ce6b7db097a9899f6ca9b2312dfbc1f9
+AUX aubio-9999-0007-tests-src-Makefile.am-add-sndfile-and-jack-cflags-an.patch 1906 SHA256 1be9e8083d8941fb07d42c78b566bbf8d08b5eb26b14e6aea9da30d80b5245ed SHA512 e88f1d6896807936527cdb76a06a3a931d722115db12139a2c6355222ab6b82448d0f9118497b69832597ed68ab0fb7df36803552e6f71765fda816a1a4defa0 WHIRLPOOL b460b24499d1325ad03307aa695dbeff8bf16c026d262af0fa150be8a16d84ae9d6a3644faf163bd6d4f9e31fb32735ddf36e7550ed75b5ca089bd3c122c20fb
+AUX aubio-9999-0008-tests-src-Makefile.am-fix-temporal-test-.c-names.patch 1332 SHA256 8b7048e04010d31721b0853b69ea508cdb47acedb41e18813ebdbd3d95f09ba8 SHA512 efa89eadab0b7a238d656befd9221e90402c53d8793470d2fa19ae104df08901dc787ed3a0ae75d8ab4c16871d1478854afe207eab4244fb36917b56997c87ff WHIRLPOOL 8c6e2e31767dff2eda421690010b1e5f5c41b262f3dd8e502a51bc61e42426a2a5f97d9920783a6c416cf0905768bc74906dd55c5d3443d7c294fb43423f2423
+EBUILD aubio-9999.ebuild 2183 SHA256 0a5893667f1a2a8e4dbbfecd45e6ae34b9388170df7596fdaab6e57006cd9300 SHA512 c86c76aaacd5da75ae73aa0fddc45d2b15c46c6ad235d407c01cf49109db40b9f0987d2e106195781dace35f9cb9b786f11b7e58cfd9a7b442754838349e7c9f WHIRLPOOL 90396675c776da1df72ce759b2e409760d29808bebbc4ee7c5c8839c1abaa9e722678c85d93ff54c071964318313d000071e452a479e80722185b310a5dae748
if [[ "${PV}" == "9999" ]]; then
inherit git-2
- EGIT_BRANCH="master"
+ EGIT_BRANCH="develop"
EGIT_REPO_URI="git://git.aubio.org/git/${PN}"
SRC_URI=""
else
-From 9b68e8211910808f97fbf9814124cba5ddef5372 Mon Sep 17 00:00:00 2001
-From: W. Trevor King <wking@drexel.edu>
+From a0affe8ac898b988a5082040b11ad675eb622d43 Mon Sep 17 00:00:00 2001
+Message-Id: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@drexel.edu>
Date: Thu, 8 Mar 2012 16:32:45 -0500
-Subject: [PATCH 1/4] Wrap IFELSE code with AC_LANG_SOURCE in configure.ac.
+Subject: [PATCH 1/8] configure.ac: wrap IFELSE code with AC_LANG_SOURCE.
This keeps up with changes from 2.66 and 2.68 [1], and fixes
[1]: http://www.flameeyes.eu/autotools-mythbuster/forwardporting/autoconf.html
---
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 1df71e4..ea9e76b 100644
+index 4232172..73b4dc0 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -70,7 +70,7 @@ then
+@@ -72,7 +72,7 @@ then
AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra,
[old_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wextra"
CFLAGS="$old_CFLAGS"
])
--
-1.7.3.4
+1.7.12
+++ /dev/null
-From 4c7e473546296be4310d358e770b26f2883d3490 Mon Sep 17 00:00:00 2001
-From: W. Trevor King <wking@drexel.edu>
-Date: Thu, 8 Mar 2012 16:46:32 -0500
-Subject: [PATCH 2/4] Tell autotools that macros should be stored in the m4 directory.
-
-This fixes
-
- aubio $ autoreconf --install --force
- ...
- libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
- ...
- libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
- ...
----
- Makefile.am | 2 +-
- configure.ac | 1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8357c9f..966936a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,7 @@ PYTHONDIR = python
- endif
- endif
-
--
-+ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src examples sounds $(PYTHONDIR) $(SWIGDIR) $(DOC) tests
- EXTRA_DIST = bootstrap VERSION
-
-diff --git a/configure.ac b/configure.ac
-index ea9e76b..41f06ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -103,6 +103,7 @@ AC_PROG_LIBTOOL
-
- AC_CONFIG_HEADERS(src/config.h)
- AC_CONFIG_FILES(aubio.pc)
-+AC_CONFIG_MACRO_DIR([m4])
-
- AM_CONDITIONAL(MINGW, false)
- AM_CONDITIONAL(DARWIN, false)
---
-1.7.3.4
-
--- /dev/null
+From e85918883c2e549f53f0b3654225a26bd3690f06 Mon Sep 17 00:00:00 2001
+Message-Id: <e85918883c2e549f53f0b3654225a26bd3690f06.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 09:00:00 -0400
+Subject: [PATCH 2/8] m4: add empty directory to satisfy autoreconf.
+
+The .gitignore is a placeholder, because Git tracks content, not files
+or directories.
+
+This fixes:
+
+ $ ./bootstrap
+ aclocal-1.11: couldn't open directory 'm4': No such file or directory
+ autoreconf-2.68: aclocal failed with exit status: 1
+
+Ben Pfaff submitted a patch for this issue to automake-patches@gnu.org
+[1] and Debian's bug 565663 [2] back in 2010, but it doesn't seem to
+have been accepted upstream.
+
+[1]: http://lists.gnu.org/archive/html/automake-patches/2010-02/msg00030.html
+[2]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
+---
+ m4/.gitignore | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 m4/.gitignore
+
+diff --git a/m4/.gitignore b/m4/.gitignore
+new file mode 100644
+index 0000000..72e8ffc
+--- /dev/null
++++ b/m4/.gitignore
+@@ -0,0 +1 @@
++*
+--
+1.7.12
+
+++ /dev/null
-From f5b02bf22c0953eb419064cb171243465f789dfb Mon Sep 17 00:00:00 2001
-From: W. Trevor King <wking@drexel.edu>
-Date: Thu, 8 Mar 2012 17:18:11 -0500
-Subject: [PATCH 3/4] Add trailing slash to wrap noinst_PROGRAMS in examples/Makefile.am.
-
-This fixes
-
- aubio $ autoreconf --install --force
- ...
- examples/Makefile.am:24: variable `aubioquiet_SOURCES' is defined but no
- program or library has `aubioquiet' as canonical name (possible typo)
- examples/Makefile.am:31: variable `aubioquiet_LDADD' is defined but no
- program or library has `aubioquiet' as canonical name (possible typo)
----
- examples/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 45ac487..a9c2e05 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -10,7 +10,7 @@ bin_PROGRAMS = \
- aubiomfcc
-
- noinst_PROGRAMS = \
-- aubiopitch
-+ aubiopitch \
- aubioquiet
-
- EXTRA_DIST = utils.h sndfileio.h jackio.h
---
-1.7.3.4
-
--- /dev/null
+From 5d459f6867dd223d63d8633abbf424ac21ba1370 Mon Sep 17 00:00:00 2001
+Message-Id: <5d459f6867dd223d63d8633abbf424ac21ba1370.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 09:07:33 -0400
+Subject: [PATCH 3/8] examples/Makefile.am: remove sndfileio from EXTRA_DIST
+ and COMMON_SOURCE_FILES
+
+This should have happened in
+
+ commit eae5898461eaf335dee156fdc68c56d1b015ec2c
+ Author: Paul Brossier <piem@piem.org>
+ Date: Fri Jul 13 13:00:12 2012 -0600
+
+ src/io: moved sndfileio from examples
+---
+ examples/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index a9c2e05..ef661fd 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -13,10 +13,10 @@ noinst_PROGRAMS = \
+ aubiopitch \
+ aubioquiet
+
+-EXTRA_DIST = utils.h sndfileio.h jackio.h
++EXTRA_DIST = utils.h jackio.h
+
+ # optionally add sources file for these programs
+-COMMON_SOURCE_FILES = sndfileio.c jackio.c utils.c
++COMMON_SOURCE_FILES = jackio.c utils.c
+ aubioonset_SOURCES = aubioonset.c $(COMMON_SOURCE_FILES)
+ aubionotes_SOURCES = aubionotes.c $(COMMON_SOURCE_FILES)
+ aubiotrack_SOURCES = aubiotrack.c $(COMMON_SOURCE_FILES)
+--
+1.7.12
+
+++ /dev/null
-From 21524ae2a950c29edb87f78b8179027d43fa8916 Mon Sep 17 00:00:00 2001
-From: W. Trevor King <wking@drexel.edu>
-Date: Sat, 10 Mar 2012 13:50:42 -0500
-Subject: [PATCH 4/4] Include aubio.h and config.h in examples/sndfileio.c.
-
-This fixes:
-
- $ make
- /bin/sh ../libtool --tag=CC --mode=link gcc -DAUBIO_PREFIX=\"/usr/local\" -DP\
- ACKAGE=\"aubio\" -I../src -Wall -Wextra -g -O2 -L../src -laubio -lm -o a\
- ubioonset aubioonset.o utils.o jackio.o sndfileio.o -lsndfile -lpthread -lm
- libtool: link: gcc -DAUBIO_PREFIX=\"/usr/local\" -DPACKAGE=\"aubio\" -I../src -\
- Wall -Wextra -g -O2 -o .libs/aubioonset aubioonset.o sndfileio.o jackio.o utils\
- .o -L../src /home/wking/src/aubio/src/.libs/libaubio.so /usr/lib/libfftw3f.so \
- /usr/lib/libsamplerate.so /usr/lib/libsndfile.so -lFLAC -lvorbisenc -lvorbis -l\
- ogg -lpthread -lm
- utils.o: In function `examples_common_init':
- /tmp/aubio/examples/utils.c:218: undefined reference to `new_aubio_sndfile_ro'
- ...
-
-when you have sndfile support, because `utils.o` was (correctly)
-looking for the sndfile support that `sndfileio.o` was (incorrectly)
-not supplying.
-
-I'm not sure that `aubio.h` needs to be included, but it was in
-`examples/jackio.c`, which I checked for inspiration, and including it
-seemed like a good idea ;). It certainly shouldn't hurt to include it.
----
- examples/sndfileio.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/examples/sndfileio.c b/examples/sndfileio.c
-index 808553b..9b01d95 100644
---- a/examples/sndfileio.c
-+++ b/examples/sndfileio.c
-@@ -18,6 +18,9 @@
-
- */
-
-+#include <aubio.h>
-+#include "config.h"
-+
- #ifdef HAVE_SNDFILE
-
- #include <string.h>
---
-1.7.3.4
-
--- /dev/null
+From 8e4892e0c624aed119c85c52c0ddd179c7eb199d Mon Sep 17 00:00:00 2001
+Message-Id: <8e4892e0c624aed119c85c52c0ddd179c7eb199d.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 09:50:28 -0400
+Subject: [PATCH 4/8] src/Makefile.am: add io/*.[ch] to libaubio sources.
+
+This fixes
+
+ $ make
+ ...
+ libtool: link: gcc -DAUBIO_PREFIX=\"/usr/local\" -DPACKAGE=\"aubio\" -I../src -Wall -Wextra -g -O2 -o .libs/aubioonset aubioonset.o jackio.o utils.o -L../src /.../aubio/src/.libs/libaubio.so /usr/lib/libfftw3f.so /usr/lib/libsamplerate.so /usr/lib/libsndfile.so -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm
+ utils.o: In function `examples_common_init':
+ /.../aubio/examples/utils.c:218: undefined reference to `new_aubio_sndfile_ro'
+ /.../aubio/examples/utils.c:225: undefined reference to `aubio_sndfile_samplerate'
+ /.../aubio/examples/utils.c:227: undefined reference to `new_aubio_sndfile_wo'
+ /.../aubio/examples/utils.c:250: undefined reference to `new_aubio_sndfile_ro'
+ /.../aubio/examples/utils.c:260: undefined reference to `aubio_sndfile_read_mono'
+ /.../aubio/examples/utils.c:224: undefined reference to `aubio_sndfile_info'
+ /.../aubio/examples/utils.c:250: undefined reference to `new_aubio_sndfile_ro'
+ /.../aubio/examples/utils.c:251: undefined reference to `new_aubio_sndfile_ro'
+ utils.o: In function `examples_common_process':
+ /.../aubio/examples/utils.c:328: undefined reference to `aubio_sndfile_write'
+ /.../aubio/examples/utils.c:324: undefined reference to `aubio_sndfile_read_mono'
+ /.../aubio/examples/utils.c:336: undefined reference to `del_aubio_sndfile'
+ /.../aubio/examples/utils.c:339: undefined reference to `del_aubio_sndfile'
+ collect2: ld returned 1 exit status
+---
+ src/Makefile.am | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f088d93..dbe2866 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,7 +34,14 @@ nobase_pkginclude_HEADERS = \
+ onset/onset.h \
+ onset/peakpicker.h \
+ tempo/tempo.h \
+- tempo/beattracking.h
++ tempo/beattracking.h \
++ io/sink.h \
++ io/sink_apple_audio.h \
++ io/sink_sndfile.h \
++ io/sndfileio.h \
++ io/source.h \
++ io/source_apple_audio.h \
++ io/source_sndfile.h
+
+ nodist_noinst_HEADERS = config.h
+
+@@ -71,7 +78,15 @@ libaubio_la_SOURCES = \
+ onset/onset.c \
+ onset/peakpicker.c \
+ tempo/tempo.c \
+- tempo/beattracking.c
++ tempo/beattracking.c \
++ io/sink.c \
++ io/sink_apple_audio.c \
++ io/sink_sndfile.c \
++ io/sndfileio.c \
++ io/source.c \
++ io/source_apple_audio.c \
++ io/source_sndfile.c \
++ io/utils_apple_audio.c
+
+ AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
+ libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
+--
+1.7.12
+
+++ /dev/null
-From 1ca4e96588d4f8ac527d5f3be31f4ae24e4ef2a8 Mon Sep 17 00:00:00 2001
-From: W. Trevor King <wking@drexel.edu>
-Date: Sat, 10 Mar 2012 14:26:49 -0500
-Subject: [PATCH 5/5] Declare aubio_sndfile_read_mono in sndfileio.h.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes:
-
- $ make
- ...
- x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../src -DAUBIO_PREFIX=\"/usr\" -DPACKAGE=\"aubio\" -I../src -Wall -Wextra -O2 -march=native -pipe -MT aubiotrack.o -MD -MP -MF .deps/aubiotrack.Tpo -c -o aubiotrack.o aubiotrack.c
- utils.c: In function ‘examples_common_init’:
- utils.c:260:5: warning: implicit declaration of function ‘aubio_sndfile_read_mono’
- ...
----
- examples/sndfileio.h | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/examples/sndfileio.h b/examples/sndfileio.h
-index cfa3d54..135d7cd 100644
---- a/examples/sndfileio.h
-+++ b/examples/sndfileio.h
-@@ -49,6 +49,8 @@ int aubio_sndfile_open_wo (aubio_sndfile_t * file, const char * outputname);
- * Read frames data from file
- */
- int aubio_sndfile_read(aubio_sndfile_t * file, int frames, fvec_t ** read);
-+int aubio_sndfile_read_mono(aubio_sndfile_t * file, int frames, fvec_t * read);
-+
- /**
- * Write data of length frames to file
- */
---
-1.7.3.4
-
--- /dev/null
+From c5ffb66449397058908afb2dd666a499d435bd81 Mon Sep 17 00:00:00 2001
+Message-Id: <c5ffb66449397058908afb2dd666a499d435bd81.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 09:54:56 -0400
+Subject: [PATCH 5/8] swig/aubio.i: remove sndfileio.h
+
+Now that sndfileio is included in aubio.h itself, there's not need for
+an explicit import.
+
+This fixes
+
+ $ make
+ libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../../src -Wall -Wextra -Wno-missing-prototypes -Wno-missing-declarations -Wno-strict-aliasing -I../../src -I../../src -I../../examples -I/usr/include/python3.2 -I/usr/local/include/python3.2 -I/usr/include -I/usr/local/include -g -O2 -MT aubio_wrap.lo -MD -MP -MF .deps/aubio_wrap.Tpo -c aubio_wrap.c -fPIC -DPIC -o .libs/aubio_wrap.o
+ aubio_wrap.c:3259:23: fatal error: sndfileio.h: No such file or directory
+ compilation terminated.
+---
+ swig/aubio.i | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/swig/aubio.i b/swig/aubio.i
+index 6324ce0..963506c 100644
+--- a/swig/aubio.i
++++ b/swig/aubio.i
+@@ -127,7 +127,6 @@ uint_t aubio_peakpicker_set_threshold(aubio_peakpicker_t * p, smpl_t threshold);
+ %{
+ #include "config.h"
+ #if HAVE_SNDFILE
+-#include "sndfileio.h"
+ %}
+ aubio_sndfile_t * new_aubio_sndfile_ro (const char * inputfile);
+ aubio_sndfile_t * new_aubio_sndfile_wo(aubio_sndfile_t * existingfile, const char * outputname);
+--
+1.7.12
+
--- /dev/null
+From 91029c71485131162204be27d478d691d99310e2 Mon Sep 17 00:00:00 2001
+Message-Id: <91029c71485131162204be27d478d691d99310e2.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 09:58:09 -0400
+Subject: [PATCH 6/8] python/aubio/Makefile.am: don't depend on sndfileio.c.
+
+Now that sndfileio is included in aubio.h itself, there's not need for
+an additional dependency here.
+
+This fixes:
+
+ $ make
+ ...
+ make[2]: Entering directory `/home/wking/src/aubio/python/aubio'
+ ...
+ make[2]: *** No rule to make target `../../examples/sndfileio.c', needed by `sndfileio.lo'. Stop.
+ ...
+---
+ python/aubio/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/aubio/Makefile.am b/python/aubio/Makefile.am
+index 426d12b..fafa3df 100644
+--- a/python/aubio/Makefile.am
++++ b/python/aubio/Makefile.am
+@@ -60,7 +60,7 @@ AUBIO_LDFLAGS = $(SWLDFLAGS) \
+ pkgpyexec_LTLIBRARIES = _aubiowrapper.la
+
+ _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS)
+-_aubiowrapper_la_SOURCES = aubio_wrap.c $(top_srcdir)/examples/sndfileio.c
++_aubiowrapper_la_SOURCES = aubio_wrap.c
+
+ aubio_wrap.c aubiowrapper.py:
+ $(SWIG) -outdir . -o aubio_wrap.c -python $(top_srcdir)/swig/aubio.i
+--
+1.7.12
+
--- /dev/null
+From b7a0e34fedc60d88261b1430cd07d3b6acb1881a Mon Sep 17 00:00:00 2001
+Message-Id: <b7a0e34fedc60d88261b1430cd07d3b6acb1881a.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 10:07:47 -0400
+Subject: [PATCH 7/8] tests/src/Makefile.am: add sndfile and jack cflags and
+ libs.
+
+This avoids a number of problems like:
+
+ libtool: link: gcc -I../../src -I../../examples -g -O2 -o .libs/test-fvec test-fvec.o -L../../src /.../aubio/src/.libs/libaubio.so /usr/lib/libsamplerate.so /usr/lib/libfftw3f.so -lpthread -lm
+ /.../aubio/src/.libs/libaubio.so: undefined reference to `sf_open'
+ /.../aubio/src/.libs/libaubio.so: undefined reference to `sf_write_float'
+ /.../aubio/src/.libs/libaubio.so: undefined reference to `sf_read_float'
+ /.../aubio/src/.libs/libaubio.so: undefined reference to `sf_close'
+ /.../aubio/src/.libs/libaubio.so: undefined reference to `sf_strerror'
+ collect2: ld returned 1 exit status
+ make[2]: *** [test-fvec] Error 1
+---
+ tests/src/Makefile.am | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
+index 9c143af..ce52c0b 100644
+--- a/tests/src/Makefile.am
++++ b/tests/src/Makefile.am
+@@ -1,8 +1,5 @@
+-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/examples
+-AM_LDFLAGS = -L$(top_builddir)/src -laubio @FFTWLIB_LIBS@
+-
+-spectral_test_phasevoc_jack_CFLAGS = $(AM_CFLAGS) @JACK_CFLAGS@
+-spectral_test_phasevoc_jack_LDADD = $(AM_LDFLAGS) @JACK_LIBS@
++AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/examples @SNDFILE_CFLAGS@ @JACK_CFLAGS@
++AM_LDFLAGS = -L$(top_builddir)/src -laubio @AUBIO_LIBS@ @SNDFILE_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@
+
+ noinst_PROGRAMS = \
+ test-fvec \
+--
+1.7.12
+
--- /dev/null
+From c5f406ffe282314656faf26635d23f986fda5e93 Mon Sep 17 00:00:00 2001
+Message-Id: <c5f406ffe282314656faf26635d23f986fda5e93.1350051084.git.wking@tremily.us>
+In-Reply-To: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+References: <a0affe8ac898b988a5082040b11ad675eb622d43.1350051084.git.wking@tremily.us>
+From: "W. Trevor King" <wking@tremily.us>
+Date: Fri, 12 Oct 2012 10:10:41 -0400
+Subject: [PATCH 8/8] tests/src/Makefile.am: fix temporal/test*.c names.
+
+This should have been done in
+
+ commit 02418f6a5f935cfe38de8c5ed40ede2afb4a1a17
+ Author: Paul Brossier <piem@piem.org>
+ Date: Tue Jul 10 15:26:12 2012 -0700
+
+ tests/: move file around to match src/
+---
+ tests/src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
+index ce52c0b..f0ed003 100644
+--- a/tests/src/Makefile.am
++++ b/tests/src/Makefile.am
+@@ -12,11 +12,11 @@ noinst_PROGRAMS = \
+ pitch/test-pitchmcomb \
+ pitch/test-pitchfcomb \
+ pitch/test-pitchschmitt \
+- temporal/test-cweighting \
++ temporal/test-c_weighting \
+ temporal/test-resampler \
+ temporal/test-filter \
+ temporal/test-biquad \
+- temporal/test-aweighting \
++ temporal/test-a_weighting \
+ onset/test-peakpicker \
+ onset/test-onset \
+ tempo/test-tempo \
+--
+1.7.12
+
projects / wtk-overlay.git / commitdiff