OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL_sound?expand=0&rev=2

SDL_sound-1.0.1-speex.patch

@@ -0,0 +1,33 @@
+--- configure.in
++++ configure.in
+@@ -296,7 +296,7 @@
+ if test x$enable_speex = xyes; then
+   AC_CHECK_HEADER(ogg/ogg.h, have_ogg_hdr=yes)
+   AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg_lib=yes)
+-  AC_CHECK_HEADER(speex.h, have_speex_hdr=yes)
++  AC_CHECK_HEADER(speex/speex.h, have_speex_hdr=yes)
+   AC_CHECK_LIB(speex, speex_bits_init, have_speex_lib=yes)
+   if test "x$have_ogg_hdr" = "xyes" -a "x$have_ogg_lib" = "xyes" -a "x$have_speex_hdr" = "xyes" -a "x$have_speex_lib" = "xyes"; then
+     LIBS="$LIBS -logg -lspeex"
+--- decoders/speex.c
++++ decoders/speex.c
+@@ -51,8 +51,8 @@
+ #include <assert.h>
+ 
+ #include <ogg/ogg.h>
+-#include <speex.h>
+-#include <speex_header.h>
++#include <speex/speex.h>
++#include <speex/speex_header.h>
+ 
+ #include "SDL_sound.h"
+ 
+@@ -135,7 +135,7 @@
+     memcpy(&header, hptr, sizeof (SpeexHeader)); /* move to stack. */
+     free(hptr);  /* lame that this forces you to malloc... */
+ 
+-    BAIL_IF_MACRO(header.mode >= SPEEX_NB_MODES, "SPEEX: Unknown mode", 0);
++    BAIL_IF_MACRO((header.mode < 0 || header.mode >= SPEEX_NB_MODES), "SPEEX: Unknown mode", 0);
+     mode = speex_mode_list[header.mode];
+     BAIL_IF_MACRO(header.speex_version_id > 1, "SPEEX: Unknown version", 0);
+     BAIL_IF_MACRO(mode->bitstream_version < header.mode_bitstream_version,

SDL_sound.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 11 15:44:08 CEST 2008 - prusnak@suse.cz
+
+- fix speex support and insufficient bounds checking in speex decoder
+  (speex.patch) [bnc#379107]
+
 -------------------------------------------------------------------
 Tue Nov  6 15:22:40 CET 2007 - prusnak@suse.cz
 

SDL_sound.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package SDL_sound (Version 1.0.1)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,13 +10,15 @@
 
 # norootforbuild
 
+
 Name:           SDL_sound
 BuildRequires:  SDL-devel flac-devel libmikmod-devel libogg-devel libvorbis-devel physfs-devel speex-devel
 Url:            http://icculus.org/SDL_sound/  
 Summary:        Sound Sample Library for SDL (Simple DirectMedia Layer)
 Version:        1.0.1
-Release:        1
+Release:        46
-Source0:        %{name}-svn536-nompglib.tar.bz2
+Source:         %{name}-%{version}-svn536-nompglib.tar.bz2
+Patch0:         %{name}-%{version}-speex.patch
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -35,6 +37,7 @@ Authors:
     Ryan C. Gordon <icculus at clutteredmind dot org>
 
 %package devel
+License:        LGPL v2.1 or later
 Summary:        Sound Sample Library for SDL (Simple DirectMedia Layer)
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -55,20 +58,19 @@ Authors:
 
 %prep
 %setup -q -n %{name}
+%patch0
 
 %build
 ./bootstrap
-%configure --disable-smpeg --disable-mpglib
+%configure --disable-sdltest --disable-smpeg --disable-mpglib
 make %{?jobs:-j %jobs}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%post
+%post -p /sbin/ldconfig
-/sbin/ldconfig
 
-%postun
+%postun -p /sbin/ldconfig
-/sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +86,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/SDL
 %{_libdir}/*a
 %{_libdir}/lib*.so
+
 %changelog
-* Tue Nov 06 2007 - prusnak@suse.cz
+* Fri Apr 11 2008 prusnak@suse.cz
+- fix speex support and insufficient bounds checking in speex decoder
+  (speex.patch) [bnc#379107]
+* Tue Nov 06 2007 prusnak@suse.cz
 - created package (version 1.0.1)
   sources from SVN - revision 536, stripped internal mpglib sources