[gentoo-commits] gentoo-x86 commit in media-libs/sdl-mixer/files: sdl-mixer-1.2.12-mikmod-r587.patch sdl-mixer-1.2.12-clang.patch sdl-mixer-1.2.12-mikmod-r588.patch

[gentoo-commits] gentoo-x86 commit in media-libs/sdl-mixer/files: sdl-mixer-1.2.12-mikmod-r587.patch sdl-mixer-1.2.12-clang.patch sdl-mixer-1.2.12-mikmod-r588.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    13/01/02 08:38:39

  Modified:             sdl-mixer-1.2.12-mikmod-r587.patch
                        sdl-mixer-1.2.12-mikmod-r588.patch
  Added:                sdl-mixer-1.2.12-clang.patch
  Log:
  build with clang (bug #448696)
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.2                  media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch?r1=1.1&r2=1.2

Index: sdl-mixer-1.2.12-mikmod-r587.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdl-mixer-1.2.12-mikmod-r587.patch	17 Dec 2012 01:35:51 -0000	1.1
+++ sdl-mixer-1.2.12-mikmod-r587.patch	2 Jan 2013 08:38:39 -0000	1.2
@@ -8,9 +8,8 @@
 # Parent  c92001a2c18f628698c58aa4e05a7335d10d0e9e
 Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver
 
-diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.c
---- a/dynamic_mod.c	Sun Mar 04 21:32:47 2012 +0000
-+++ b/dynamic_mod.c	Sun Jul 22 16:13:27 2012 -0700
+--- a/dynamic_mod.c
++++ b/dynamic_mod.c
 @@ -93,6 +93,13 @@
  			SDL_UnloadObject(mikmod.handle);
  			return -1;
@@ -25,9 +24,8 @@
  		mikmod.Player_Active =
  			(BOOL (*)(void))
  			SDL_LoadFunction(mikmod.handle, "Player_Active");
-diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.h
---- a/dynamic_mod.h	Sun Mar 04 21:32:47 2012 +0000
-+++ b/dynamic_mod.h	Sun Jul 22 16:13:27 2012 -0700
+--- a/dynamic_mod.h
++++ b/dynamic_mod.h
 @@ -35,6 +35,7 @@
  	void (*MikMod_RegisterDriver)(struct MDRIVER*);
  	int* MikMod_errno;
@@ -36,9 +34,8 @@
  	BOOL (*Player_Active)(void);
  	void (*Player_Free)(MODULE*);
  	MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL);
-diff -r c92001a2c18f -r 56cad6484b04 music_mod.c
---- a/music_mod.c	Sun Mar 04 21:32:47 2012 +0000
-+++ b/music_mod.c	Sun Jul 22 16:13:27 2012 -0700
+--- a/music_mod.c
++++ b/music_mod.c
 @@ -109,13 +109,13 @@
  
  	list = mikmod.MikMod_InfoDriver();



1.2                  media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch?r1=1.1&r2=1.2

Index: sdl-mixer-1.2.12-mikmod-r588.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdl-mixer-1.2.12-mikmod-r588.patch	17 Dec 2012 01:35:51 -0000	1.1
+++ sdl-mixer-1.2.12-mikmod-r588.patch	2 Jan 2013 08:38:39 -0000	1.2
@@ -8,9 +8,8 @@
 # Parent  56cad6484b04f83c8d42428c755a046678506436
 Fixed normal linking with libmikmod and linking with earlier versions of libmikmod.
 
-diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c
---- a/dynamic_mod.c	Sun Jul 22 16:13:27 2012 -0700
-+++ b/dynamic_mod.c	Sun Jul 22 16:33:37 2012 -0700
+--- a/dynamic_mod.c
++++ b/dynamic_mod.c
 @@ -97,8 +97,8 @@
  			(void (*)(void*))
  			SDL_LoadFunction(mikmod.handle, "MikMod_free");



1.1                  media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch?rev=1.1&content-type=text/plain

Index: sdl-mixer-1.2.12-clang.patch
===================================================================
--- SDL_mixer-1.2.12.orig/music_mad.c
+++ SDL_mixer-1.2.12/music_mad.c
@@ -224,7 +224,7 @@
   if ((mp3_mad->status & MS_playing) == 0) {
 	/* We're not supposed to be playing, so send silence instead. */
 	memset(stream, 0, len);
-	return;
+	return 0;
   }
 
   out = stream;