| 1 |
mr_bones_ 13/01/02 08:38:39 |
| 2 |
|
| 3 |
Modified: sdl-mixer-1.2.12-mikmod-r587.patch |
| 4 |
sdl-mixer-1.2.12-mikmod-r588.patch |
| 5 |
Added: sdl-mixer-1.2.12-clang.patch |
| 6 |
Log: |
| 7 |
build with clang (bug #448696) |
| 8 |
|
| 9 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch |
| 13 |
|
| 14 |
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 |
| 15 |
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 |
| 16 |
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 |
| 17 |
|
| 18 |
Index: sdl-mixer-1.2.12-mikmod-r587.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- sdl-mixer-1.2.12-mikmod-r587.patch 17 Dec 2012 01:35:51 -0000 1.1 |
| 25 |
+++ sdl-mixer-1.2.12-mikmod-r587.patch 2 Jan 2013 08:38:39 -0000 1.2 |
| 26 |
@@ -8,9 +8,8 @@ |
| 27 |
# Parent c92001a2c18f628698c58aa4e05a7335d10d0e9e |
| 28 |
Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver |
| 29 |
|
| 30 |
-diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.c |
| 31 |
---- a/dynamic_mod.c Sun Mar 04 21:32:47 2012 +0000 |
| 32 |
-+++ b/dynamic_mod.c Sun Jul 22 16:13:27 2012 -0700 |
| 33 |
+--- a/dynamic_mod.c |
| 34 |
++++ b/dynamic_mod.c |
| 35 |
@@ -93,6 +93,13 @@ |
| 36 |
SDL_UnloadObject(mikmod.handle); |
| 37 |
return -1; |
| 38 |
@@ -25,9 +24,8 @@ |
| 39 |
mikmod.Player_Active = |
| 40 |
(BOOL (*)(void)) |
| 41 |
SDL_LoadFunction(mikmod.handle, "Player_Active"); |
| 42 |
-diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.h |
| 43 |
---- a/dynamic_mod.h Sun Mar 04 21:32:47 2012 +0000 |
| 44 |
-+++ b/dynamic_mod.h Sun Jul 22 16:13:27 2012 -0700 |
| 45 |
+--- a/dynamic_mod.h |
| 46 |
++++ b/dynamic_mod.h |
| 47 |
@@ -35,6 +35,7 @@ |
| 48 |
void (*MikMod_RegisterDriver)(struct MDRIVER*); |
| 49 |
int* MikMod_errno; |
| 50 |
@@ -36,9 +34,8 @@ |
| 51 |
BOOL (*Player_Active)(void); |
| 52 |
void (*Player_Free)(MODULE*); |
| 53 |
MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL); |
| 54 |
-diff -r c92001a2c18f -r 56cad6484b04 music_mod.c |
| 55 |
---- a/music_mod.c Sun Mar 04 21:32:47 2012 +0000 |
| 56 |
-+++ b/music_mod.c Sun Jul 22 16:13:27 2012 -0700 |
| 57 |
+--- a/music_mod.c |
| 58 |
++++ b/music_mod.c |
| 59 |
@@ -109,13 +109,13 @@ |
| 60 |
|
| 61 |
list = mikmod.MikMod_InfoDriver(); |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.2 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch |
| 66 |
|
| 67 |
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 |
| 68 |
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 |
| 69 |
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 |
| 70 |
|
| 71 |
Index: sdl-mixer-1.2.12-mikmod-r588.patch |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch,v |
| 74 |
retrieving revision 1.1 |
| 75 |
retrieving revision 1.2 |
| 76 |
diff -u -r1.1 -r1.2 |
| 77 |
--- sdl-mixer-1.2.12-mikmod-r588.patch 17 Dec 2012 01:35:51 -0000 1.1 |
| 78 |
+++ sdl-mixer-1.2.12-mikmod-r588.patch 2 Jan 2013 08:38:39 -0000 1.2 |
| 79 |
@@ -8,9 +8,8 @@ |
| 80 |
# Parent 56cad6484b04f83c8d42428c755a046678506436 |
| 81 |
Fixed normal linking with libmikmod and linking with earlier versions of libmikmod. |
| 82 |
|
| 83 |
-diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c |
| 84 |
---- a/dynamic_mod.c Sun Jul 22 16:13:27 2012 -0700 |
| 85 |
-+++ b/dynamic_mod.c Sun Jul 22 16:33:37 2012 -0700 |
| 86 |
+--- a/dynamic_mod.c |
| 87 |
++++ b/dynamic_mod.c |
| 88 |
@@ -97,8 +97,8 @@ |
| 89 |
(void (*)(void*)) |
| 90 |
SDL_LoadFunction(mikmod.handle, "MikMod_free"); |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.1 media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch |
| 95 |
|
| 96 |
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 |
| 97 |
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 |
| 98 |
|
| 99 |
Index: sdl-mixer-1.2.12-clang.patch |
| 100 |
=================================================================== |
| 101 |
--- SDL_mixer-1.2.12.orig/music_mad.c |
| 102 |
+++ SDL_mixer-1.2.12/music_mad.c |
| 103 |
@@ -224,7 +224,7 @@ |
| 104 |
if ((mp3_mad->status & MS_playing) == 0) { |
| 105 |
/* We're not supposed to be playing, so send silence instead. */ |
| 106 |
memset(stream, 0, len); |
| 107 |
- return; |
| 108 |
+ return 0; |
| 109 |
} |
| 110 |
|
| 111 |
out = stream; |
Archives