From 63d5e70f9da895089469d8612838cedaef4c7840c1cb7e80f82d86aab5063d09 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 23 Apr 2008 00:05:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL_sound?expand=0&rev=2 --- SDL_sound-1.0.1-speex.patch | 33 +++++++++++++++++++ ...=> SDL_sound-1.0.1-svn536-nompglib.tar.bz2 | 0 SDL_sound.changes | 6 ++++ SDL_sound.spec | 24 +++++++++----- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 SDL_sound-1.0.1-speex.patch rename SDL_sound-svn536-nompglib.tar.bz2 => SDL_sound-1.0.1-svn536-nompglib.tar.bz2 (100%) diff --git a/SDL_sound-1.0.1-speex.patch b/SDL_sound-1.0.1-speex.patch new file mode 100644 index 0000000..70d7e70 --- /dev/null +++ b/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 + + #include +-#include +-#include ++#include ++#include + + #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, diff --git a/SDL_sound-svn536-nompglib.tar.bz2 b/SDL_sound-1.0.1-svn536-nompglib.tar.bz2 similarity index 100% rename from SDL_sound-svn536-nompglib.tar.bz2 rename to SDL_sound-1.0.1-svn536-nompglib.tar.bz2 diff --git a/SDL_sound.changes b/SDL_sound.changes index 4437e93..d8dde69 100644 --- a/SDL_sound.changes +++ b/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 diff --git a/SDL_sound.spec b/SDL_sound.spec index 82a94e5..3414eae 100644 --- a/SDL_sound.spec +++ b/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 -Source0: %{name}-svn536-nompglib.tar.bz2 +Release: 46 +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 %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 -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /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