rpms/SDL_mixer/F-7 SDL_mixer-1.2.7-reopen.patch, NONE, 1.1 SDL_mixer.spec, 1.15, 1.16

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Sun Jul 15 00:31:32 UTC 2007


Author: bpepple

Update of /cvs/pkgs/rpms/SDL_mixer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.7-reopen.patch 
Log Message:
* Sat Jul 14 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-3
- Add patch fix reopening issue. (#248253)


SDL_mixer-1.2.7-reopen.patch:

--- NEW FILE SDL_mixer-1.2.7-reopen.patch ---
--- trunk/SDL_mixer/timidity/common.c	2006/05/14 04:36:31	2420
+++ trunk/SDL_mixer/timidity/common.c	2006/11/28 19:07:27	2916
@@ -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;
 }


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_mixer/F-7/SDL_mixer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SDL_mixer.spec	31 Aug 2006 21:56:08 -0000	1.15
+++ SDL_mixer.spec	15 Jul 2007 00:30:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch1:		%{name}-%{version}-bad-code.patch
 Patch2:		%{name}-%{version}-volume.patch
 Patch3:		%{name}-%{version}-fix-path-timidity.patch
+Patch4:		%{name}-%{version}-reopen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL-devel >= 1.2.4-1 
@@ -42,6 +43,7 @@
 %patch1 -p1 -b .bad_code
 %patch2 -p1 -b .volume
 %patch3 -p1 -b .timidity
+%patch4 -p2 -b .reopen
 
 
 %build
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Sat Jul 14 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-3
+- Add patch fix reopening issue. (#248253)
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-2
 - Rebuild for FC6.
 




More information about the scm-commits mailing list