From df45b5af0751840d754e096721a8e1efe7e0db966251f76ad6aef2437f2fa626 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 18 Jan 2007 18:37:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/SDL_mixer?expand=0&rev=2

---
 SDL_mixer-timidity-crash.patch | 28 ++++++++++++++++++++++++++++
 SDL_mixer.changes              |  5 +++++
 SDL_mixer.spec                 | 10 +++++++---
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 SDL_mixer-timidity-crash.patch

diff --git a/SDL_mixer-timidity-crash.patch b/SDL_mixer-timidity-crash.patch
new file mode 100644
index 0000000..8c0b7aa
--- /dev/null
+++ b/SDL_mixer-timidity-crash.patch
@@ -0,0 +1,28 @@
+--- timidity/common.c
++++ timidity/common.c
+@@ -104,7 +104,6 @@
+   FILE *fp;
+   PathList *plp;
+   int l;
+-  static int firsttime=1;
+ 
+   if (!name || !(*name))
+     {
+@@ -113,10 +112,9 @@
+     }
+ 
+ #ifdef DEFAULT_PATH
+-  if (firsttime && (pathlist==NULL)) {
++  if (pathlist==NULL) {
+     /* Generate path list */
+     add_to_pathlist(DEFAULT_PATH);
+-    firsttime=0;
+   }
+ #endif
+ 
+@@ -244,4 +242,5 @@
+     free(plp);
+     plp = next_plp;
+   }
++  pathlist = NULL;
+ }
diff --git a/SDL_mixer.changes b/SDL_mixer.changes
index b2fea8a..3c63522 100644
--- a/SDL_mixer.changes
+++ b/SDL_mixer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 18 17:38:07 CET 2007 - prusnak@suse.cz
+
+- fixed crash in timidity (timidity-crash.patch) [#235376]
+
 -------------------------------------------------------------------
 Thu Sep 14 14:52:41 CEST 2006 - nadvornik@suse.cz
 
diff --git a/SDL_mixer.spec b/SDL_mixer.spec
index 342a28e..51d1f82 100644
--- a/SDL_mixer.spec
+++ b/SDL_mixer.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package SDL_mixer (Version 1.2.7)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 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.
 #
@@ -15,14 +15,15 @@ BuildRequires:  SDL-devel libmikmod libogg-devel libvorbis-devel xorg-x11
 Summary:        Sample Mixer Library for SDL
 Obsoletes:      sdlmixer
 Version:        1.2.7
-Release:        1
-License:        LGPL
+Release:        34
+License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.bz2
 Patch:          %{name}-timidity_cfg.patch
 Patch1:         SDL_mixer-64bit-fix.dif
 Patch2:         SDL_mixer-warn.dif
 Patch3:         SDL_mixer-libmikmod.patch
+Patch4:         SDL_mixer-timidity-crash.patch
 URL:            http://www.libsdl.org/projects/SDL_mixer/index.html
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %package devel
@@ -51,6 +52,7 @@ Timidity MIDI, and SMPEG MP3 libraries.
 %patch1
 %patch2
 %patch3
+%patch4
 
 %build
 ./autogen.sh
@@ -91,6 +93,8 @@ rm -rf %buildroot
 %{_includedir}/SDL/*
 
 %changelog -n SDL_mixer
+* Thu Jan 18 2007 - prusnak@suse.cz
+- fixed crash in timidity (timidity-crash.patch) [#235376]
 * Thu Sep 14 2006 - nadvornik@suse.cz
 - updated to 1.2.7:
   * Added support for dynamically loading Ogg Vorbis library