| 1 |
mr_bones_ 13/10/25 16:03:19 |
| 2 |
|
| 3 |
Modified: libsdl2-2.0.0-static-libs.patch |
| 4 |
libsdl2-2.0.0-threads.patch |
| 5 |
Added: libsdl2-2.0.1-static-libs.patch |
| 6 |
Log: |
| 7 |
version bump (bug #489326) |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.3 media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?rev=1.3&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?rev=1.3&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?r1=1.2&r2=1.3 |
| 17 |
|
| 18 |
Index: libsdl2-2.0.0-static-libs.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch,v |
| 21 |
retrieving revision 1.2 |
| 22 |
retrieving revision 1.3 |
| 23 |
diff -u -r1.2 -r1.3 |
| 24 |
--- libsdl2-2.0.0-static-libs.patch 29 Aug 2013 02:04:23 -0000 1.2 |
| 25 |
+++ libsdl2-2.0.0-static-libs.patch 25 Oct 2013 16:03:19 -0000 1.3 |
| 26 |
@@ -1,6 +1,5 @@ |
| 27 |
-diff -r c1563f514b5b Makefile.in |
| 28 |
---- a/Makefile.in Thu Apr 04 11:35:22 2013 -0400 |
| 29 |
-+++ b/Makefile.in Wed Apr 17 14:17:09 2013 -0400 |
| 30 |
+--- a/Makefile.in |
| 31 |
++++ b/Makefile.in |
| 32 |
@@ -33,10 +33,10 @@ |
| 33 |
OBJECTS = @OBJECTS@ |
| 34 |
VERSION_OBJECTS = @VERSION_OBJECTS@ |
| 35 |
@@ -46,9 +45,8 @@ |
| 36 |
install-data: |
| 37 |
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal |
| 38 |
$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 |
| 39 |
-diff -r c1563f514b5b configure.in |
| 40 |
---- a/configure.in Thu Apr 04 11:35:22 2013 -0400 |
| 41 |
-+++ b/configure.in Wed Apr 17 14:17:09 2013 -0400 |
| 42 |
+--- a/configure.in |
| 43 |
++++ b/configure.in |
| 44 |
@@ -2659,23 +2659,23 @@ |
| 45 |
|
| 46 |
VERSION_OBJECTS=`echo $VERSION_SOURCES` |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.2 media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch?rev=1.2&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch?rev=1.2&content-type=text/plain |
| 54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch?r1=1.1&r2=1.2 |
| 55 |
|
| 56 |
Index: libsdl2-2.0.0-threads.patch |
| 57 |
=================================================================== |
| 58 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch,v |
| 59 |
retrieving revision 1.1 |
| 60 |
retrieving revision 1.2 |
| 61 |
diff -u -r1.1 -r1.2 |
| 62 |
--- libsdl2-2.0.0-threads.patch 5 Sep 2013 18:46:48 -0000 1.1 |
| 63 |
+++ libsdl2-2.0.0-threads.patch 25 Oct 2013 16:03:19 -0000 1.2 |
| 64 |
@@ -10,9 +10,8 @@ |
| 65 |
|
| 66 |
Thread local storage is used to store current window and current opengl context. OpenGL worked before this changeset: 7596 (45e5c263c096) |
| 67 |
|
| 68 |
-diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_systhread.h |
| 69 |
---- a/src/thread/SDL_systhread.h Thu Sep 05 07:02:27 2013 -0700 |
| 70 |
-+++ b/src/thread/SDL_systhread.h Thu Sep 05 07:15:26 2013 -0700 |
| 71 |
+--- a/src/thread/SDL_systhread.h |
| 72 |
++++ b/src/thread/SDL_systhread.h |
| 73 |
@@ -26,6 +26,7 @@ |
| 74 |
#define _SDL_systhread_h |
| 75 |
|
| 76 |
@@ -21,9 +20,8 @@ |
| 77 |
|
| 78 |
/* This function creates a thread, passing args to SDL_RunThread(), |
| 79 |
saves a system-dependent thread id in thread->id, and returns 0 |
| 80 |
-diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread.c |
| 81 |
---- a/src/thread/SDL_thread.c Thu Sep 05 07:02:27 2013 -0700 |
| 82 |
-+++ b/src/thread/SDL_thread.c Thu Sep 05 07:15:26 2013 -0700 |
| 83 |
+--- a/src/thread/SDL_thread.c |
| 84 |
++++ b/src/thread/SDL_thread.c |
| 85 |
@@ -125,6 +125,7 @@ |
| 86 |
SDL_TLSEntry *entry; |
| 87 |
SDL_TLSData *storage = NULL; |
| 88 |
@@ -50,9 +48,8 @@ |
| 89 |
|
| 90 |
return storage; |
| 91 |
} |
| 92 |
-diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread_c.h |
| 93 |
---- a/src/thread/SDL_thread_c.h Thu Sep 05 07:02:27 2013 -0700 |
| 94 |
-+++ b/src/thread/SDL_thread_c.h Thu Sep 05 07:15:26 2013 -0700 |
| 95 |
+--- a/src/thread/SDL_thread_c.h |
| 96 |
++++ b/src/thread/SDL_thread_c.h |
| 97 |
@@ -23,6 +23,8 @@ |
| 98 |
#ifndef _SDL_thread_c_h |
| 99 |
#define _SDL_thread_c_h |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
1.1 media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch |
| 104 |
|
| 105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch?rev=1.1&view=markup |
| 106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch?rev=1.1&content-type=text/plain |
| 107 |
|
| 108 |
Index: libsdl2-2.0.1-static-libs.patch |
| 109 |
=================================================================== |
| 110 |
--- a/Makefile.in |
| 111 |
+++ b/Makefile.in |
| 112 |
@@ -33,10 +33,10 @@ |
| 113 |
OBJECTS = @OBJECTS@ |
| 114 |
VERSION_OBJECTS = @VERSION_OBJECTS@ |
| 115 |
|
| 116 |
-SDLMAIN_TARGET = libSDL2main.a |
| 117 |
+SDLMAIN_TARGET = libSDL2main.la |
| 118 |
SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ |
| 119 |
|
| 120 |
-SDLTEST_TARGET = libSDL2_test.a |
| 121 |
+SDLTEST_TARGET = libSDL2_test.la |
| 122 |
SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ |
| 123 |
|
| 124 |
SRC_DIST = acinclude Android.mk autogen.sh BUGS build-scripts configure configure.in COPYING CREDITS debian include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC WhatsNew Xcode Xcode-iOS |
| 125 |
@@ -122,15 +122,13 @@ |
| 126 |
.PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) |
| 127 |
|
| 128 |
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) |
| 129 |
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 130 |
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 131 |
|
| 132 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 133 |
- $(AR) cru $@ $(SDLMAIN_OBJECTS) |
| 134 |
- $(RANLIB) $@ |
| 135 |
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 136 |
|
| 137 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 138 |
- $(AR) cru $@ $(SDLTEST_OBJECTS) |
| 139 |
- $(RANLIB) $@ |
| 140 |
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 141 |
|
| 142 |
install: all install-bin install-hdrs install-lib install-data |
| 143 |
install-bin: |
| 144 |
@@ -151,10 +149,8 @@ |
| 145 |
install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET) |
| 146 |
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) |
| 147 |
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) |
| 148 |
- $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) |
| 149 |
- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) |
| 150 |
- $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) |
| 151 |
- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) |
| 152 |
+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) |
| 153 |
+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) |
| 154 |
install-data: |
| 155 |
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal |
| 156 |
$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 |
| 157 |
--- a/configure.in |
| 158 |
+++ b/configure.in |
| 159 |
@@ -2659,23 +2659,23 @@ |
| 160 |
|
| 161 |
VERSION_OBJECTS=`echo $VERSION_SOURCES` |
| 162 |
VERSION_DEPENDS=`echo $VERSION_SOURCES` |
| 163 |
-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` |
| 164 |
+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` |
| 165 |
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ |
| 166 |
-\\$(objects)/\\2.o: \\1/\\2.rc\\\\ |
| 167 |
+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ |
| 168 |
\\$(WINDRES) \\$< \\$@,g"` |
| 169 |
|
| 170 |
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
| 171 |
SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` |
| 172 |
-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` |
| 173 |
+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
| 174 |
SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
| 175 |
-\\$(objects)/\\2.o: \\1/\\2.c\\\\ |
| 176 |
+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ |
| 177 |
\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| 178 |
|
| 179 |
SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` |
| 180 |
SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` |
| 181 |
-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` |
| 182 |
+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
| 183 |
SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
| 184 |
-\\$(objects)/\\2.o: \\1/\\2.c\\\\ |
| 185 |
+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ |
| 186 |
\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| 187 |
|
| 188 |
# Set runtime shared library paths as needed |
Archives