From 65c6f1336d5f8fdaaecb4a60e76b15229be18f0a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 24 Nov 2015 18:16:40 +0000
Subject: [PATCH] libsndfile: bump version.

* building requires flac 1.3.1.
---
 ...1.0.25.recipe => libsndfile-1.0.26.recipe} |  6 ++++--
 ...25.patchset => libsndfile-1.0.26.patchset} | 20 +++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)
 rename media-libs/libsndfile/{libsndfile-1.0.25.recipe => libsndfile-1.0.26.recipe} (93%)
 rename media-libs/libsndfile/patches/{libsndfile-1.0.25.patchset => libsndfile-1.0.26.patchset} (64%)

diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.26.recipe
similarity index 93%
rename from media-libs/libsndfile/libsndfile-1.0.25.recipe
rename to media-libs/libsndfile/libsndfile-1.0.26.recipe
index 74d3e075e..1c411ccf5 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.26.recipe
@@ -4,9 +4,9 @@ files containing sampled audio data."
 HOMEPAGE="http://www.mega-nerd.com/libsndfile"
 COPYRIGHT="1999-2011 Erik de Castro Lopo"
 LICENSE="GNU LGPL v2.1"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz"
-CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
+CHECKSUM_SHA256="cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092"
 PATCHES="libsndfile-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -49,6 +49,8 @@ BUILD_REQUIRES="
 	devel:libflac$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
+	# libsndfile requires flac 1.3.1 but the soname is the same as 1.3.0...
+	flac${secondaryArchSuffix}_devel >= 1.3.1
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset b/media-libs/libsndfile/patches/libsndfile-1.0.26.patchset
similarity index 64%
rename from media-libs/libsndfile/patches/libsndfile-1.0.25.patchset
rename to media-libs/libsndfile/patches/libsndfile-1.0.26.patchset
index 988ce3ea4..6e13d09e1 100644
--- a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset
+++ b/media-libs/libsndfile/patches/libsndfile-1.0.26.patchset
@@ -1,11 +1,11 @@
-From df98cdcd4887d72c46f78e7e63f7328189427476 Mon Sep 17 00:00:00 2001
+From 0dbcc82d33d7ea41b14dadec906ce0d0081c2c2d Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 20 May 2014 16:43:24 +0000
 Subject: haiku patch
 
 
 diff --git a/src/sndfile.h.in b/src/sndfile.h.in
-index 8926fc6..ef9636b 100644
+index 985cc7d..ecb3d16 100644
 --- a/src/sndfile.h.in
 +++ b/src/sndfile.h.in
 @@ -29,6 +29,7 @@
@@ -14,25 +14,25 @@ index 8926fc6..ef9636b 100644
  
 +#include <stdint.h>
  #include <stdio.h>
+ #include <stdint.h>
  #include <sys/types.h>
- 
 -- 
-1.8.3.4
+2.2.2
 
 
-From aa846ae9c25ea6a88138edda20eec82e96639a3e Mon Sep 17 00:00:00 2001
+From 16d8db8eb7e838b393d6e518c014985466fa4a60 Mon Sep 17 00:00:00 2001
 From: Kacper Kasper <kacperkasper@gmail.com>
 Date: Sun, 8 Jun 2014 17:05:44 +0200
 Subject: Fix documentation path
 
 
 diff --git a/configure.ac b/configure.ac
-index 20ba55a..9604249 100644
+index ef14780..daf76cc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -484,6 +484,10 @@ else
- 	htmldocdir=$prefix/share/doc/libsndfile1-dev/html
- 	fi
+@@ -482,6 +482,10 @@ if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then
+ #====================================================================================
+ # Settings for the HTML documentation.
  
 +if test $host_os = "haiku" ; then
 +	htmldocdir=$prefix/documentation/packages/libsndfile
@@ -42,5 +42,5 @@ index 20ba55a..9604249 100644
  	HTML_BGCOLOUR="white"
  	HTML_FGCOLOUR="black"
 -- 
-1.8.3.4
+2.2.2