Accepting request 307740 from home:pluskalm:branches:multimedia:libs

- Fix incorrect includes (boo#929450)

OBS-URL: https://build.opensuse.org/request/show/307740
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/speexdsp?expand=0&rev=10

speexdsp-fixbuilds-774c87d.patch

@@ -0,0 +1,36 @@
+Index: speexdsp-1.2rc3/configure.ac
+===================================================================
+--- speexdsp-1.2rc3.orig/configure.ac
++++ speexdsp-1.2rc3/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
+Index: speexdsp-1.2rc3/include/speex/speexdsp_config_types.h.in
+===================================================================
+--- speexdsp-1.2rc3.orig/include/speex/speexdsp_config_types.h.in
++++ speexdsp-1.2rc3/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;

speexdsp.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 18 10:30:00 UTC 2015 - mpluskal@suse.com
+
+- Fix incorrect includes (boo#929450)
+
 -------------------------------------------------------------------
 Sun Apr  5 00:55:44 UTC 2015 - dmueller@suse.com
 

speexdsp.spec

@@ -23,10 +23,15 @@ Version:        1.2~rc3
 Release:        0
 Summary:        An Open Source, Patent Free Speech Codec
 License:        BSD-3-Clause
-Group:          Productivity/Multimedia/Sound/Editors and Convertors 
+Group:          Productivity/Multimedia/Sound/Editors and Convertors
 Url:            http://www.speex.org/
-Source:         http://downloads.xiph.org/releases/speex/%{name}-%{package_version}.tar.gz
+Source0:        http://downloads.xiph.org/releases/speex/%{name}-%{package_version}.tar.gz
 Source2:        baselibs.conf
+# taken from upstream boo#929450
+Patch0:         speexdsp-fixbuilds-774c87d.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(ogg)
 Conflicts:      speex <= 1.1.999_1.2rc1
@@ -60,6 +65,8 @@ SpeeX library.
 
 %prep
 %setup -q -n %{name}-%{package_version}
+%patch0 -p1
+autoreconf -fi
 
 %build
 # Disable NEON since it doesn't check for availability of the NEON