From 5b848f0b35a74ea7da0474bac21021a9b69fdbdd Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 1 Nov 2015 20:11:38 +0000
Subject: [PATCH] libaubio: bump version.

---
 ...bio-0.4.1.recipe => libaubio-0.4.2.recipe} |  6 ++--
 ...0.4.1.patchset => libaubio-0.4.2.patchset} | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename media-libs/libaubio/{libaubio-0.4.1.recipe => libaubio-0.4.2.recipe} (91%)
 rename media-libs/libaubio/patches/{libaubio-0.4.1.patchset => libaubio-0.4.2.patchset} (77%)

diff --git a/media-libs/libaubio/libaubio-0.4.1.recipe b/media-libs/libaubio/libaubio-0.4.2.recipe
similarity index 91%
rename from media-libs/libaubio/libaubio-0.4.1.recipe
rename to media-libs/libaubio/libaubio-0.4.2.recipe
index 8e2de8753..47ec17749 100644
--- a/media-libs/libaubio/libaubio-0.4.1.recipe
+++ b/media-libs/libaubio/libaubio-0.4.2.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="2003-2013 Paul Brossier"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="http://aubio.org/pub/aubio-$portVersion.tar.bz2"
-CHECKSUM_SHA256="25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695"
+CHECKSUM_SHA256="1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8f1f"
 SOURCE_DIR="aubio-$portVersion"
 PATCHES="libaubio-$portVersion.patchset"
 
@@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 PROVIDES="
 	libaubio$secondaryArchSuffix = $portVersion compat >= 0
-	lib:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
+	lib:libaubio$secondaryArchSuffix = 4.2.2 compat >= 4
 	"
 if [ -z "$secondaryArchSuffix" ]; then
 PROVIDES="$PROVIDES
@@ -40,7 +40,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libaubio${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
+	devel:libaubio$secondaryArchSuffix = 4.2.2 compat >= 4
 	"
 REQUIRES_devel="
 	libaubio$secondaryArchSuffix == $portVersion base
diff --git a/media-libs/libaubio/patches/libaubio-0.4.1.patchset b/media-libs/libaubio/patches/libaubio-0.4.2.patchset
similarity index 77%
rename from media-libs/libaubio/patches/libaubio-0.4.1.patchset
rename to media-libs/libaubio/patches/libaubio-0.4.2.patchset
index 586bec539..42fa9da4c 100644
--- a/media-libs/libaubio/patches/libaubio-0.4.1.patchset
+++ b/media-libs/libaubio/patches/libaubio-0.4.2.patchset
@@ -1,24 +1,24 @@
-From 0dc450424ce8c66628b22790656fc4f3577f80e7 Mon Sep 17 00:00:00 2001
+From 94f1698e2348f513128bf3e7dc789df498b93c9d Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 May 2014 19:39:09 +0000
 Subject: Haiku has no libm
 
 
 diff --git a/examples/wscript_build b/examples/wscript_build
-index db5fed6..3f573cc 100644
+index 4a1ad39..7ed5b8d 100644
 --- a/examples/wscript_build
 +++ b/examples/wscript_build
-@@ -17,7 +17,7 @@ bld(features = 'c',
+@@ -24,7 +24,7 @@ bld(features = 'c',
  for source_file in programs_source:
      bld(features = 'c cprogram',
              includes = '../src',
 -            lib = 'm',
 +            lib = '',
              use = ['aubio', 'utilsio'],
+             uselib = uselib,
              source = source_file,
-             target = str(source_file).split('.')[0]
 diff --git a/src/wscript_build b/src/wscript_build
-index 94b2062..2b9b60d 100644
+index ba64b25..8fd514c 100644
 --- a/src/wscript_build
 +++ b/src/wscript_build
 @@ -15,7 +15,7 @@ ctx(features = 'c',
@@ -30,20 +30,20 @@ index 94b2062..2b9b60d 100644
          target = 'lib_objects')
  
  # build libaubio.so (cshlib) and/or libaubio.a (cstlib)
-@@ -29,7 +29,7 @@ else: #linux, darwin, android, mingw, ...
- for target in build_features:
+@@ -30,7 +30,7 @@ for target in build_features:
      ctx(features = 'c ' + target,
              use = ['lib_objects'],
+             uselib = uselib,
 -            lib = 'm',
 +            lib = '',
              target = 'aubio',
-             install_path = '${PREFIX}/lib',
              vnum = ctx.env['LIB_VERSION'])
+ 
 diff --git a/tests/wscript_build b/tests/wscript_build
-index 04bbf9a..8a8c625 100644
+index 6aebad6..67b6300 100644
 --- a/tests/wscript_build
 +++ b/tests/wscript_build
-@@ -6,7 +6,7 @@ for target_name in ctx.path.ant_glob('src/**/*.c'):
+@@ -14,7 +14,7 @@ for target_name in ctx.path.ant_glob('src/**/*.c'):
      extra_source = []
  
      bld(features = 'c cprogram test',
@@ -53,17 +53,17 @@ index 04bbf9a..8a8c625 100644
              source = [target_name] + extra_source,
              target = str(target_name).split('.')[0],
 -- 
-1.8.3.4
+2.2.2
 
 
-From 3d07ca19c7c3ec7044417c062553d3ea02375d17 Mon Sep 17 00:00:00 2001
+From 60153b9125cc45f6ba429a8955d74c7fad577deb Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 May 2014 23:15:04 +0000
 Subject: fix headers installation
 
 
 diff --git a/src/wscript_build b/src/wscript_build
-index 2b9b60d..194345d 100644
+index 8fd514c..4b19c0d 100644
 --- a/src/wscript_build
 +++ b/src/wscript_build
 @@ -35,6 +35,6 @@ for target in build_features:
@@ -75,5 +75,5 @@ index 2b9b60d..194345d 100644
          ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
          relative_trick=True)
 -- 
-1.8.3.4
+2.2.2