From f93d5aaa01dea2785f65f5606320bca294cb3244 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 29 Jan 2015 13:25:21 +0000
Subject: [PATCH] fix building of dependent packages

---
 speexdsp-fixbuilds-774c87d.patch | 36 ++++++++++++++++++++++++++++++++
 speexdsp.spec                    | 13 ++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 speexdsp-fixbuilds-774c87d.patch

diff --git a/speexdsp-fixbuilds-774c87d.patch b/speexdsp-fixbuilds-774c87d.patch
new file mode 100644
index 0000000..c02ee29
--- /dev/null
+++ b/speexdsp-fixbuilds-774c87d.patch
@@ -0,0 +1,36 @@
+diff --git a/configure.ac b/configure.ac
+index 2cd2d1e..1de0c23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -334,6 +334,12 @@ AC_SUBST([USIZE16])
+ AC_SUBST([SIZE32])
+ AC_SUBST([USIZE32])
+ 
++AS_IF([test "$ac_cv_header_stdint_h" = "yes"],    [INCLUDE_STDINT="#include <stdint.h>"],
++      [test "$ac_cv_header_inttypes_h" = "yes"],  [INCLUDE_STDINT="#include <inttypes.h>"],
++      [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"])
++
++AC_SUBST([INCLUDE_STDINT])
++
+ AC_CONFIG_FILES([
+            Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
+            include/Makefile include/speex/Makefile speexdsp.pc
+diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in
+index 02b82fd..5ea7b55 100644
+--- a/include/speex/speexdsp_config_types.h.in
++++ b/include/speex/speexdsp_config_types.h.in
+@@ -1,13 +1,7 @@
+ #ifndef __SPEEX_TYPES_H__
+ #define __SPEEX_TYPES_H__
+ 
+-#if defined HAVE_STDINT_H
+-#  include <stdint.h>
+-#elif defined HAVE_INTTYPES_H
+-#  include <inttypes.h>
+-#elif defined HAVE_SYS_TYPES_H
+-#  include <sys/types.h>
+-#endif
++@INCLUDE_STDINT@
+ 
+ typedef @SIZE16@ spx_int16_t;
+ typedef @USIZE16@ spx_uint16_t;
diff --git a/speexdsp.spec b/speexdsp.spec
index 90a1102..0e3c332 100644
--- a/speexdsp.spec
+++ b/speexdsp.spec
@@ -1,14 +1,19 @@
 Name:           speexdsp
 Version:        1.2
 %global rc_ver  rc3
-Release:        0.4.%{rc_ver}%{?dist}
+Release:        0.5.%{rc_ver}%{?dist}
 Summary:        A voice compression format (DSP)
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.speex.org/
 Source0:        http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz
+# a patch to speex (774c87d) was done usptream to fix this issue but it seems it
+# hasn't been replicated in speexdsp. Issue seen in at least pjproject
+# upstream ML thread http://lists.xiph.org/pipermail/speex-dev/2014-May/008488.html
+Patch0:         speexdsp-fixbuilds-774c87d.patch
 
+BuildRequires: libtool autoconf automake
 # speexdsp was split from speex in 1.2rc2. As speexdsp does not depend on
 # speex, a versioned conflict is required.
 Conflicts: speex <= 1.2-0.21.rc1
@@ -39,9 +44,10 @@ This is the DSP package, see the speex package for the codec part.
 
 %prep
 %setup -q -n %{name}-%{version}%{rc_ver}
-
+%patch0 -p1 -b .inc
 
 %build
+autoreconf -vif
 %configure \
 %ifarch aarch64
 	--disable-neon \
@@ -70,6 +76,9 @@ find %{buildroot} -type f -name "*.la" -delete
 %{_libdir}/libspeexdsp.so
 
 %changelog
+* Thu Jan 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0.5.rc3
+- Add patch similar to what was already done upstream in speex but not dsp
+
 * Thu Jan 15 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0.4.rc3
 - Fix build on aarch64 (disable NEON)