Bug#754452: libfishsound: autoreconf and couple of other minor fixes to fix FTBFS on ppc64le arch

[ravi]

Package: libfishsound1
Version: 1.0.0-1.1
Severity: normal
File: libfishsound
Tags: patch
User: debian-devel at lists.debian.org
Usertags: autoreconf

Dear Maintainer,

In Ubuntu, the attached patches were applied to avoid FTBFS on ppc64le arch.
We have also verified building "libfishsound" source package on ppc64le 
arch using the attached patches.

Thanks for considering the patch.

-Ravindran.

-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: ppc64el (ppc64le)

Kernel: Linux 3.13-1-powerpc64le (SMP w/1 CPU core)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libfishsound1 depends on:
ii libc6 2.19-1
ii libflac8 1.3.0-2
ii libogg0 1.3.1-1
ii libspeex1 1.2~rc1.1-1
ii libvorbis0a 1.3.2-1.3
ii libvorbisenc2 1.3.2-1.3

libfishsound1 recommends no packages.

libfishsound1 suggests no packages.

-- no debconf information

--===============6404679406397277473==
Content-Type: text/x-diff; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="0001-autoreconf.debpatch"

 >From 166403fc6d2e2297b2079efad3b4c64a90a17ff0 Mon Sep 17 00:00:00 2001
From: Ravindran Arani <ravi at linux.vnet.ibm.com>
Date: Fri, 11 Jul 2014 08:46:51 +0000
Subject: [PATCH] autoreconf

---
debian/control | 2 +-
debian/rules | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 5113f43..bd885d4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
Priority: optional
Maintainer: Debian Xiph.org Maintainers 
<pkg-xiph-maint at lists.alioth.debian.org>
Uploaders: John Francesco Ferlito <johnf at inodes.org>
-Build-Depends: debhelper (>= 7.0.50~), libspeex-dev, libvorbis-dev, 
libflac-dev, autotools-dev
+Build-Depends: debhelper (>= 7.0.50~), libspeex-dev, libvorbis-dev, 
libflac-dev, dh-autoreconf
Standards-Version: 3.8.3

Package: libfishsound1
diff --git a/debian/rules b/debian/rules
index c72e797..08755bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,10 @@
#!/usr/bin/make -f

%:
- dh $@
+ dh $@ --with autoreconf

override_dh_strip:
dh_strip --dbg-package=libfishsound1-dbg

-
-# Put config.sub rules in until 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559098 is fixed
override_dh_auto_configure:
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
-
-override_dh_auto_clean:
- dh_auto_clean
- rm -f config.sub config.guess
-- 
1.8.5.3


--===============6404679406397277473==
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/x-diff; charset="utf-8"
Content-Disposition: attachment;
filename="0001-flac-set-vendor_string.length-0.patch"

 >From 9201079c5155c7b27db98de6543b05631362364d Mon Sep 17 00:00:00 2001
From: Conrad Parker <conrad at metadecks.org>
Date: Tue, 20 Apr 2010 07:13:53 +0900
Subject: [PATCH] flac: set vendor_string.length = 0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Avoids debug crash with libFLAC 1.2.1; tested on Windows (x64)

Reported-by: Денис Кулаков <kulakov_denis at mail.ru>
---
src/libfishsound/flac.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/libfishsound/flac.c b/src/libfishsound/flac.c
index b42ea78..930c77b 100644
--- a/src/libfishsound/flac.c
+++ b/src/libfishsound/flac.c
@@ -541,6 +541,7 @@ fs_flac_encode_vorbiscomments (FishSound * fsound)
metadata->is_last = true;
metadata->length = total_length;
/* Don't bother setting the vendor_string, as libFLAC ignores it */
+ metadata->data.vorbis_comment.vendor_string.length = 0;
metadata->data.vorbis_comment.num_comments = length;
metadata->data.vorbis_comment.comments = comments;

-- 
1.8.5.2

--===============6404679406397277473==
Content-Type: text/x-diff; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="macro-dir.patch"

Description: Patch configure.ac to specify config macro dir.
Author: Dimitri John Ledkov <xnox at ubuntu.com>

--- libfishsound-1.0.0.orig/configure.ac
+++ libfishsound-1.0.0/configure.ac
@@ -40,6 +40,7 @@ AC_C_CONST
AC_C_BIGENDIAN

dnl Add parameters for aclocal
+AC_CONFIG_MACRO_DIR([m4])
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")

# Checks for header files.

--===============6404679406397277473==--