soundtouch: port to meson

Allows compilation with android's NDK r18 setup

10 files changed, 259 insertions, 394 deletions

diff --git a/recipes/soundtouch/0001-Add-dummy-file-to-make-sure-config-m4-exists.patch b/recipes/soundtouch/0001-Add-dummy-file-to-make-sure-config-m4-exists.patch
deleted file mode 100644
index ef41b64c..00000000
--- a/recipes/soundtouch/0001-Add-dummy-file-to-make-sure-config-m4-exists.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From 9f2e50bdd1ce9b6bc53d92e1da869504f3fd5440 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Thu, 25 Oct 2012 09:52:55 +0200
-Subject: [PATCH 1/9] Add dummy file to make sure config/m4 exists
-
----
- config/m4/dummy | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 config/m4/dummy
-
-diff --git a/config/m4/dummy b/config/m4/dummy
-new file mode 100644
-index 0000000..e69de29
--- 
-2.1.4
-
diff --git a/recipes/soundtouch/0001-Add-minimal-meson-build-system.patch b/recipes/soundtouch/0001-Add-minimal-meson-build-system.patch
new file mode 100644
index 00000000..1802d641
--- /dev/null
+++ b/recipes/soundtouch/0001-Add-minimal-meson-build-system.patch
@@ -0,0 +1,210 @@
+From 7c746092ff0d50ec62200374d2b532b697565490 Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Mon, 22 Oct 2018 21:05:58 +1100
+Subject: [PATCH 1/2] Add minimal meson build system
+
+No optimisations (mmx or sse)
+---
+ include/meson.build             | 17 ++++++++
+ meson.build                     | 42 ++++++++++++++++++++
+ meson_options.txt               |  9 +++++
+ source/SoundStretch/meson.build | 11 ++++++
+ source/SoundTouch/meson.build   | 69 +++++++++++++++++++++++++++++++++
+ source/meson.build              |  2 +
+ 6 files changed, 150 insertions(+)
+ create mode 100644 include/meson.build
+ create mode 100644 meson.build
+ create mode 100644 meson_options.txt
+ create mode 100644 source/SoundStretch/meson.build
+ create mode 100644 source/SoundTouch/meson.build
+ create mode 100644 source/meson.build
+
+diff --git a/include/meson.build b/include/meson.build
+new file mode 100644
+index 0000000..03bee39
+--- /dev/null
++++ b/include/meson.build
+@@ -0,0 +1,17 @@
++soundtouch_headers = [
++  'FIFOSampleBuffer.h',
++  'FIFOSamplePipe.h',
++  'SoundTouch.h',
++  'STTypes.h',
++  'BPMDetect.h',
++]
++
++soundtouch_config_h = configure_file(
++    configuration: conf,
++    output: 'soundtouch_config.h'
++)
++
++install_headers(
++    soundtouch_headers + [soundtouch_config_h],
++    subdir : 'soundtouch'
++)
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..e2850e0
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,42 @@
++project('SoundTouch', 'c', 'cpp',
++  version : '2.0.0',
++  meson_version : '>= 0.47',
++  default_options : [ 'warning_level=1',
++                      'buildtype=debugoptimized' ])
++
++pkgconfig = import('pkgconfig')
++
++soversion = 1
++libversion = '@0@.@1@.@2@'.format(soversion, 0, 0)
++
++conf = configuration_data()
++
++cxx = meson.get_compiler('cpp')
++
++if get_option('integer_samples')
++  conf.set10('SOUNDTOUCH_INTEGER_SAMPLES', true)
++else
++  conf.set10('SOUNDTOUCH_FLOAT_SAMPLES', true)
++endif
++# FIXME
++conf.set10('SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS', true)
++have_mmx = false
++have_sse = false
++# FIXME Check for cpuid.h
++
++libm = cxx.find_library('m', required : false)
++
++soundtouch_inc = include_directories('include')
++
++subdir('include')
++subdir('source')
++
++pkgconfig.generate(
++  name: 'SoundTouch',
++  description: 'SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or files',
++  url: 'https://www.surina.net/soundtouch/',
++  version: meson.project_version(),
++  filebase: 'soundtouch',
++  subdirs: 'soundtouch',
++  libraries: libsoundtouch,
++)
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..2e54708
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,9 @@
++option('integer_samples', type: 'boolean', value: false,
++        description: 'Use integer samples instead of floats')
++# FIXME
++option('openmp', type: 'boolean', value: false,
++        description: 'Use parallel multicore calculation through OpenMP')
++# FIXME
++option('x86_optimizations', type: 'boolean', value: false,
++        description: 'Use MMX or SSE optimizations')
++
+diff --git a/source/SoundStretch/meson.build b/source/SoundStretch/meson.build
+new file mode 100644
+index 0000000..aa57488
+--- /dev/null
++++ b/source/SoundStretch/meson.build
+@@ -0,0 +1,11 @@
++soundstretch_sources = [
++  'main.cpp',
++  'RunParameters.cpp',
++  'WavFile.cpp',
++]
++
++executable('SoundStretch',
++    soundstretch_sources,
++    dependencies: soundtouch_dep,
++    install: true
++)
+diff --git a/source/SoundTouch/meson.build b/source/SoundTouch/meson.build
+new file mode 100644
+index 0000000..99bdb09
+--- /dev/null
++++ b/source/SoundTouch/meson.build
+@@ -0,0 +1,69 @@
++soundtouch_sources = [
++  'AAFilter.cpp',
++  'FIRFilter.cpp',
++  'FIFOSampleBuffer.cpp',
++  'RateTransposer.cpp',
++  'SoundTouch.cpp',
++  'TDStretch.cpp',
++  'cpu_detect_x86.cpp',
++  'BPMDetect.cpp',
++  'PeakFinder.cpp',
++  'InterpolateLinear.cpp',
++  'InterpolateCubic.cpp',
++  'InterpolateShannon.cpp',
++]
++
++soundtouch_mmx_sources = [
++  'mmx_optimized.cpp',
++]
++
++soundtouch_sse_sources = [
++  'sse_optimized.cpp',
++]
++
++extra_libs = []
++if have_mmx
++  mmx_arg = '-mmmx'
++else
++  mmx_arg = ''
++endif
++
++extra_libs += [
++  static_library('SoundTouchMMX',
++    soundtouch_mmx_sources,
++    c_args: mmx_arg,
++    include_directories: [soundtouch_inc],
++    dependencies: platform_deps
++  )
++]
++
++if have_sse
++  sse_arg = '-msse'
++else
++  sse_arg = ''
++endif
++
++extra_libs += [
++  static_library('SoundTouchSSE',
++    soundtouch_sse_sources,
++    c_args : sse_arg,
++    include_directories: [soundtouch_inc],
++    dependencies: platform_deps
++  )
++]
++
++libsoundtouch = library('SoundTouch',
++    soundtouch_sources,
++    link_with: extra_libs,
++    version: libversion,
++    soversion: soversion,
++    install: true,
++    include_directories: [soundtouch_inc],
++    dependencies: [libm]
++)
++
++soundtouch_dep = declare_dependency(
++    link_with: libsoundtouch,
++    include_directories: [soundtouch_inc],
++    dependencies: [libm]
++)
+diff --git a/source/meson.build b/source/meson.build
+new file mode 100644
+index 0000000..19a56de
+--- /dev/null
++++ b/source/meson.build
+@@ -0,0 +1,2 @@
++subdir('SoundTouch')
++subdir('SoundStretch')
+-- 
+2.19.0
+
diff --git a/recipes/soundtouch/0002-Use-STLPORT-on-Android.patch b/recipes/soundtouch/0002-Use-STLPORT-on-Android.patch
deleted file mode 100644
index 1c79f75f..00000000
--- a/recipes/soundtouch/0002-Use-STLPORT-on-Android.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1525028246bcac98dae6fc47860fc9f7ec39240e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Thu, 25 Oct 2012 10:02:29 +0200
-Subject: [PATCH 2/2] Use STLPORT on Android
-
----
- configure.ac                  | 18 ++++++++++++++----
- source/SoundTouch/Makefile.am | 16 ++++++++--------
- 2 files changed, 22 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d3df5eb..ce4488d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -231,10 +231,20 @@ dnl add whatever functions you might want to check for here
- #AC_CHECK_FUNCS([floor ftruncate memmove memset mkdir modf pow realpath sqrt strchr strdup strerror strrchr strstr strtol])
- 
- 
--
--
--
--
-+AC_ARG_WITH(
-+  stlport,
-+  AC_HELP_STRING(
-+    [--with-stlport],
-+    [use stlport @<:@default=no@:>@]),
-+  [AS_CASE(
-+    [$withval], [no], [], [yes], [],
-+    [AC_MSG_ERROR([bad value "$withval" for --with-stlport])])],
-+  [with_stlport=no])
-+if test "x$with_stlport" != "xno"; then
-+  PKG_CHECK_MODULES(STLPORT, stlport)
-+fi
-+AC_SUBST(STLPORT_LIBS)
-+AC_SUBST(STLPORT_CFLAGS)
- 
- dnl ############################################################################
- dnl # Internationaliation and Localiation                                    #
-diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am
-index 4756880..7549259 100644
---- a/source/SoundTouch/Makefile.am
-+++ b/source/SoundTouch/Makefile.am
-@@ -34,10 +34,10 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp    \
-     InterpolateShannon.cpp

- 

- # Compiler flags

--AM_CXXFLAGS+=-O3

-+AM_CXXFLAGS+=-O3 $(STLPORT_CFLAGS)

- 

- # Compile the files that need MMX and SSE individually.

--libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la

-+libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la $(STLPORT_LIBS)

- noinst_LTLIBRARIES=libSoundTouchMMX.la libSoundTouchSSE.la

- libSoundTouchMMX_la_SOURCES=mmx_optimized.cpp

- libSoundTouchSSE_la_SOURCES=sse_optimized.cpp

-@@ -46,23 +46,23 @@ libSoundTouchSSE_la_SOURCES=sse_optimized.cpp
- # If MMX is supported compile with -mmmx.

- # Do not assume -msse is also supported.

- if HAVE_MMX

--libSoundTouchMMX_la_CXXFLAGS = -mmmx $(AM_CXXFLAGS)

-+libSoundTouchMMX_la_CXXFLAGS = -mmmx $(AM_CXXFLAGS) $(STLPORT_CFLAGS)

- else

--libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS)

-+libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)

- endif

- 

- # We enable optimizations by default.

- # If SSE is supported compile with -msse.

- if HAVE_SSE

--libSoundTouchSSE_la_CXXFLAGS = -msse $(AM_CXXFLAGS)

-+libSoundTouchSSE_la_CXXFLAGS = -msse $(AM_CXXFLAGS) $(STLPORT_CFLAGS)

- else

--libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS)

-+libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)

- endif

- 

- # Let the user disable optimizations if he wishes to.

- if !X86_OPTIMIZATIONS

--libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS)

--libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS)
-+libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)

-+libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
- endif
- 
- # Modify the default 0.0.0 to LIB_SONAME.0.0
--- 
-2.11.0
-
diff --git a/recipes/soundtouch/0002-add-support-for-linking-with-gnustl-on-android.patch b/recipes/soundtouch/0002-add-support-for-linking-with-gnustl-on-android.patch
new file mode 100644
index 00000000..a594d461
--- /dev/null
+++ b/recipes/soundtouch/0002-add-support-for-linking-with-gnustl-on-android.patch
@@ -0,0 +1,49 @@
+From d1d13721d97da7adb9316aa0cc4492cca2116de7 Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Mon, 22 Oct 2018 21:50:53 +1100
+Subject: [PATCH 2/2] add support for linking with gnustl on android
+
+---
+ meson.build                   | 6 ++++++
+ source/SoundTouch/meson.build | 4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e2850e0..3e8aeda 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,13 @@ have_mmx = false
+ have_sse = false
+ # FIXME Check for cpuid.h
+ 
++platform_deps = []
+ libm = cxx.find_library('m', required : false)
++platform_deps += libm
++
++if host_machine.system() == 'android'
++  platform_deps += dependency('gnustl')
++endif
+ 
+ soundtouch_inc = include_directories('include')
+ 
+diff --git a/source/SoundTouch/meson.build b/source/SoundTouch/meson.build
+index 99bdb09..9bfcf96 100644
+--- a/source/SoundTouch/meson.build
++++ b/source/SoundTouch/meson.build
+@@ -59,11 +59,11 @@ libsoundtouch = library('SoundTouch',
+     soversion: soversion,
+     install: true,
+     include_directories: [soundtouch_inc],
+-    dependencies: [libm]
++    dependencies: platform_deps
+ )
+ 
+ soundtouch_dep = declare_dependency(
+     link_with: libsoundtouch,
+     include_directories: [soundtouch_inc],
+-    dependencies: [libm]
++    dependencies: platform_deps
+ )
+-- 
+2.19.0
+
diff --git a/recipes/soundtouch/0003-Don-t-build-soundstretch.patch b/recipes/soundtouch/0003-Don-t-build-soundstretch.patch
deleted file mode 100644
index b75e6a10..00000000
--- a/recipes/soundtouch/0003-Don-t-build-soundstretch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6f58113396f35ed938e6e5d49f4aeffa02146cfc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Thu, 25 Oct 2012 10:12:44 +0200
-Subject: [PATCH 3/9] Don't build soundstretch
-
----
- source/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/Makefile.am b/source/Makefile.am
-index 960d8a9..f25185b 100644
---- a/source/Makefile.am
-+++ b/source/Makefile.am
-@@ -21,7 +21,7 @@
- 

- include $(top_srcdir)/config/am_include.mk

- 

--SUBDIRS=SoundTouch SoundStretch

-+SUBDIRS=SoundTouch 

- 

- # set to something if you want other stuff to be included in the distribution tarball

- #EXTRA_DIST=

--- 
-2.1.4
-
diff --git a/recipes/soundtouch/0004-Use-gnustl.patch b/recipes/soundtouch/0004-Use-gnustl.patch
deleted file mode 100644
index ce30d678..00000000
--- a/recipes/soundtouch/0004-Use-gnustl.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From bc4bb887c794da89662338a377df9433604a86be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Thu, 25 Oct 2012 10:59:29 +0200
-Subject: [PATCH 4/4] Use gnustl
-
----
- configure.ac                  | 18 +++++++++---------
- source/Makefile.am            |  2 +-
- source/SoundTouch/Makefile.am | 16 ++++++++--------
- 3 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ce4488d..85aca97 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -232,19 +232,19 @@ dnl add whatever functions you might want to check for here
- 
- 
- AC_ARG_WITH(
--  stlport,
-+  gnustl,
-   AC_HELP_STRING(
--    [--with-stlport],
--    [use stlport @<:@default=no@:>@]),
-+    [--with-gnustl],
-+    [use gnustl @<:@default=no@:>@]),
-   [AS_CASE(
-     [$withval], [no], [], [yes], [],
--    [AC_MSG_ERROR([bad value "$withval" for --with-stlport])])],
--  [with_stlport=no])
--if test "x$with_stlport" != "xno"; then
--  PKG_CHECK_MODULES(STLPORT, stlport)
-+    [AC_MSG_ERROR([bad value "$withval" for --with-gnustl])])],
-+  [with_gnustl=no])
-+if test "x$with_gnustl" != "xno"; then
-+  PKG_CHECK_MODULES(GNUSTL, gnustl)
- fi
--AC_SUBST(STLPORT_LIBS)
--AC_SUBST(STLPORT_CFLAGS)
-+AC_SUBST(GNUSTL_LIBS)
-+AC_SUBST(GNUSTL_CFLAGS)
- 
- dnl ############################################################################
- dnl # Internationaliation and Localiation                                    #
-diff --git a/source/Makefile.am b/source/Makefile.am
-index 7968419..aec67e4 100644
---- a/source/Makefile.am
-+++ b/source/Makefile.am
-@@ -21,7 +21,7 @@
- 

- include $(top_srcdir)/config/am_include.mk

- 

--SUBDIRS=SoundTouch 
-+SUBDIRS=SoundTouch

- 

- # set to something if you want other stuff to be included in the distribution tarball

- #EXTRA_DIST=

-diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am
-index e5d37fa..c9169bb 100644
---- a/source/SoundTouch/Makefile.am
-+++ b/source/SoundTouch/Makefile.am
-@@ -34,10 +34,10 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp    \
-     InterpolateShannon.cpp

- 

- # Compiler flags

--AM_CXXFLAGS+=-O3 $(STLPORT_CFLAGS)
-+AM_CXXFLAGS+=-O3 $(GNUSTL_CFLAGS)
- 

- # Compile the files that need MMX and SSE individually.

--libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la $(STLPORT_LIBS)
-+libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la $(GNUSTL_LIBS)
- noinst_LTLIBRARIES=libSoundTouchMMX.la libSoundTouchSSE.la

- libSoundTouchMMX_la_SOURCES=mmx_optimized.cpp

- libSoundTouchSSE_la_SOURCES=sse_optimized.cpp

-@@ -46,23 +46,23 @@ libSoundTouchSSE_la_SOURCES=sse_optimized.cpp
- # If MMX is supported compile with -mmmx.

- # Do not assume -msse is also supported.

- if HAVE_MMX

--libSoundTouchMMX_la_CXXFLAGS = -mmmx $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
-+libSoundTouchMMX_la_CXXFLAGS = -mmmx $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
- else

--libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
-+libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
- endif

- 

- # We enable optimizations by default.

- # If SSE is supported compile with -msse.

- if HAVE_SSE

--libSoundTouchSSE_la_CXXFLAGS = -msse $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
-+libSoundTouchSSE_la_CXXFLAGS = -msse $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
- else

--libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
-+libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
- endif

- 

- # Let the user disable optimizations if he wishes to.

- if !X86_OPTIMIZATIONS

--libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
--libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(STLPORT_CFLAGS)
-+libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
-+libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
- endif
- 
- # Modify the default 0.0.0 to LIB_SONAME.0.0
--- 
-2.11.0
-
diff --git a/recipes/soundtouch/0005-Fix-soundstretch-linking.patch b/recipes/soundtouch/0005-Fix-soundstretch-linking.patch
deleted file mode 100644
index e1a48470..00000000
--- a/recipes/soundtouch/0005-Fix-soundstretch-linking.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9726b4dc063e7260177756e57d1a26cf3f5a603e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Thu, 25 Oct 2012 11:00:51 +0200
-Subject: [PATCH 5/5] Fix soundstretch linking
-
----
- source/SoundStretch/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source/SoundStretch/Makefile.am b/source/SoundStretch/Makefile.am
-index d2c0dfa..cee20f1 100644
---- a/source/SoundStretch/Makefile.am
-+++ b/source/SoundStretch/Makefile.am
-@@ -41,14 +41,14 @@ soundstretch_SOURCES=main.cpp RunParameters.cpp WavFile.cpp
- ## created by the above soundstretch_SOURCES are automatically linked in, so here I

- ## list object files from other directories as well as flags passed to the

- ## linker. 

--soundstretch_LDADD=../SoundTouch/libSoundTouch.la -lm

-+soundstretch_LDADD=../SoundTouch/libSoundTouch.la -lm $(GNUSTL_LIBS)

- 

- ## linker flags. 

- # OP 2011-7-17 Linker flag -s disabled to prevent stripping symbols by default

- #soundstretch_LDFLAGS=-s

- 

- ## additional compiler flags

--soundstretch_CXXFLAGS=-O3 $(AM_CXXFLAGS)

-+soundstretch_CXXFLAGS=-O3 $(AM_CXXFLAGS) $(GNUSTL_CFLAGS

- 

- #clean-local: 

- #	-rm -f additional-files-to-remove-on-make-clean

--- 
-2.11.0
-
diff --git a/recipes/soundtouch/0006-Fix-pkg-config-file.patch b/recipes/soundtouch/0006-Fix-pkg-config-file.patch
deleted file mode 100644
index aa945996..00000000
--- a/recipes/soundtouch/0006-Fix-pkg-config-file.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c5ac748865c6f1e7c9da11dd86d672211fe6d43b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Thu, 25 Oct 2012 11:14:41 +0200
-Subject: [PATCH 6/9] Fix pkg-config file
-
----
- configure.ac         | 2 ++
- soundtouch-1.4.pc.in | 1 +
- soundtouch.pc.in     | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e867430..d4caa5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -217,9 +217,11 @@ AC_ARG_WITH(
-   [with_gnustl=no])
- if test "x$with_gnustl" != "xno"; then
-   PKG_CHECK_MODULES(GNUSTL, gnustl)
-+  STL="gnustl"
- fi
- AC_SUBST(GNUSTL_LIBS)
- AC_SUBST(GNUSTL_CFLAGS)
-+AC_SUBST(STL)
- 
- dnl ############################################################################
- dnl # Internationaliation and Localiation                                    #
-diff --git a/soundtouch-1.4.pc.in b/soundtouch-1.4.pc.in
-index ac6eaec..b9755f7 100644
---- a/soundtouch-1.4.pc.in
-+++ b/soundtouch-1.4.pc.in
-@@ -9,6 +9,7 @@ includedir=@includedir@
- Name: SoundTouch
- Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or files
- Version: @VERSION@
-+Requires: @STL@
- Libs: -L${libdir} -lSoundTouch
- Cflags: -I${includedir}/soundtouch  
- 
-diff --git a/soundtouch.pc.in b/soundtouch.pc.in
-index 03d0360..6b02dc9 100644
---- a/soundtouch.pc.in
-+++ b/soundtouch.pc.in
-@@ -6,6 +6,7 @@ includedir=@includedir@
- Name: SoundTouch
- Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or files
- Version: @VERSION@
-+Requires: @STL@
- Libs: -L${libdir} -lSoundTouch
- Cflags: -I${includedir}/soundtouch  
- 
--- 
-2.1.4
-
diff --git a/recipes/soundtouch/0007-Make-it-compile-on-IOS.patch b/recipes/soundtouch/0007-Make-it-compile-on-IOS.patch
deleted file mode 100644
index 5b3026c4..00000000
--- a/recipes/soundtouch/0007-Make-it-compile-on-IOS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7006e5fade520e79ee795ff7a205452dbaec0f19 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <thibault.saunier@collabora.com>
-Date: Thu, 24 Jan 2013 16:23:32 -0300
-Subject: [PATCH 7/9] Make it compile on IOS
-
-Simply comment AC_FUNC_MALLOC in configure.ac. Explanation here:
-http://nerdland.net/unstumping-the-internet/malloc-has-not-been-declared/
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4caa5d..5053626 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,7 +196,7 @@ AM_CONDITIONAL([HAVE_SSE], [test "x$have_sse_intrinsics" = "xyes"])
- dnl ############################################################################
- dnl # Checks for library functions/classes                                     #
- dnl ############################################################################
--AC_FUNC_MALLOC
-+# AC_FUNC_MALLOC
- AC_TYPE_SIGNAL
- 
- dnl make -lm get added to the LIBS
--- 
-2.1.4
-
diff --git a/recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch b/recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch
deleted file mode 100644
index 4154c36b..00000000
--- a/recipes/soundtouch/0010-Try-harder-to-generate-Win32-DLLs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e3c214cc919a3bb6786b19035bd4002a3c966b9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Sat, 20 Feb 2016 10:42:33 +0200
-Subject: [PATCH] Try harder to generate Win32 DLLs
-
----
- configure.ac                  | 4 +---
- source/SoundTouch/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8eb1203..fb53c8a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,11 +51,9 @@ AC_PROG_INSTALL
- #AC_PROG_LN_S
- AC_PROG_MAKE_SET
- 
-+AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL dnl turn on using libtool
- 
--
--
--
- dnl ############################################################################
- dnl # Checks for header files                                                  #
- dnl ############################################################################
-diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am
-index c9169bb..a9e5251 100644
---- a/source/SoundTouch/Makefile.am
-+++ b/source/SoundTouch/Makefile.am
-@@ -66,7 +66,7 @@ libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS) $(GNUSTL_CFLAGS)
- endif
- 
- # Modify the default 0.0.0 to LIB_SONAME.0.0
--libSoundTouch_la_LDFLAGS=-version-info @LIB_SONAME@
-+libSoundTouch_la_LDFLAGS=-no-undefined -version-info @LIB_SONAME@
- 
- # other linking flags to add
- # noinst_LTLIBRARIES = libSoundTouchOpt.la
--- 
-2.11.0
-