update sdl and sdl-image

be sure to link sdl-image to provided libpng, otherwise
TexturePacker in XBMC build will silently fail to pack the
png icons.

6 files changed, 3 insertions, 94 deletions

diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index 20e56771b..249d5a05e 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		sdl
-PKG_VERSION:=		1.2.14
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		e52086d1b508fa0b76c52ee30b55bec4
+PKG_VERSION:=		1.2.15
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9d96df8417572a2afb781a7c4c811a85
 PKG_DESCR:=		simple directmedia layer
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libusb alsa-lib libpthread libx11 libxext
diff --git a/package/sdl/patches/patch-build-scripts_ltmain_sh b/package/sdl/patches/patch-build-scripts_ltmain_sh
deleted file mode 100644
index c2f950420..000000000
--- a/package/sdl/patches/patch-build-scripts_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- SDL-1.2.14.orig/build-scripts/ltmain.sh	2009-10-13 01:07:12.000000000 +0200
-+++ SDL-1.2.14/build-scripts/ltmain.sh	2011-01-14 23:31:20.000000000 +0100
-@@ -4766,7 +4766,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/sdl/patches/patch-sdl-config_in b/package/sdl/patches/patch-sdl-config_in
deleted file mode 100644
index 4d3de58ed..000000000
--- a/package/sdl/patches/patch-sdl-config_in
+++ /dev/null
@@ -1,16 +0,0 @@
---- SDL-1.2.14.orig/sdl-config.in	2009-10-13 01:07:20.000000000 +0200
-+++ SDL-1.2.14/sdl-config.in	2011-01-12 21:46:41.000000000 +0100
-@@ -45,11 +45,11 @@ while test $# -gt 0; do
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      echo @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
--@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo @SDL_STATIC_LIBS@
- @ENABLE_STATIC_TRUE@      ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/package/sdl/patches/patch-sdl_pc_in b/package/sdl/patches/patch-sdl_pc_in
deleted file mode 100644
index fd0ae8d52..000000000
--- a/package/sdl/patches/patch-sdl_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- SDL-1.2.14.orig/sdl.pc.in	2009-10-13 01:07:20.000000000 +0200
-+++ SDL-1.2.14/sdl.pc.in	2011-01-12 21:54:44.000000000 +0100
-@@ -10,6 +10,6 @@ Description: Simple DirectMedia Layer is
- Version: @SDL_VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
-+Libs: @SDL_LIBS@
- Libs.private: @SDL_STATIC_LIBS@
- Cflags: -I${includedir}/SDL @SDL_CFLAGS@
diff --git a/package/sdl/patches/patch-src_video_x11_SDL_x11dyn_c b/package/sdl/patches/patch-src_video_x11_SDL_x11dyn_c
deleted file mode 100644
index ed389a110..000000000
--- a/package/sdl/patches/patch-src_video_x11_SDL_x11dyn_c
+++ /dev/null
@@ -1,39 +0,0 @@
---- SDL-1.2.14.orig/src/video/x11/SDL_x11dyn.c	2009-10-13 01:07:15.000000000 +0200
-+++ SDL-1.2.14/src/video/x11/SDL_x11dyn.c	2013-07-12 12:15:17.000000000 +0200
-@@ -108,6 +108,20 @@ char *(*pXGetICValues)(XIC, ...) = NULL;
- #undef SDL_X11_MODULE
- #undef SDL_X11_SYM
- 
-+static void *SDL_XGetRequest_workaround(Display* dpy, CARD8 type, size_t len)
-+{
-+	xReq *req;
-+	WORD64ALIGN
-+	if (dpy->bufptr + len > dpy->bufmax)
-+		_XFlush(dpy);
-+	dpy->last_req = dpy->bufptr;
-+	req = (xReq*)dpy->bufptr;
-+	req->reqType = type;
-+	req->length = len / 4;
-+	dpy->bufptr += len;
-+	dpy->request++;
-+	return req;
-+}
- 
- static int x11_load_refcount = 0;
- 
-@@ -168,6 +182,15 @@ int SDL_X11_LoadSymbols(void)
- 		X11_GetSym("XGetICValues",&SDL_X11_HAVE_UTF8,(void **)&pXGetICValues);
- 		#endif
- 
-+		/*
-+		 * In case we're built with newer Xlib headers, we need to make sure
-+		 *  that _XGetRequest() is available, even on older systems.
-+		 *  Otherwise, various Xlib macros we use will call a NULL pointer.
-+		 */
-+		if (!SDL_X11_HAVE_XGETREQUEST) {
-+			p_XGetRequest = SDL_XGetRequest_workaround;
-+		}
-+
- 		if (SDL_X11_HAVE_BASEXLIB) {  /* all required symbols loaded. */
- 			SDL_ClearError();
- 		} else {
diff --git a/package/sdl/patches/patch-src_video_x11_SDL_x11sym_h b/package/sdl/patches/patch-src_video_x11_SDL_x11sym_h
deleted file mode 100644
index 45f3de058..000000000
--- a/package/sdl/patches/patch-src_video_x11_SDL_x11sym_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- SDL-1.2.14.orig/src/video/x11/SDL_x11sym.h	2009-10-13 01:07:15.000000000 +0200
-+++ SDL-1.2.14/src/video/x11/SDL_x11sym.h	2013-07-12 12:16:08.000000000 +0200
-@@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,
- #endif
- 
- /*
-+ * libX11 1.4.99.1 added _XGetRequest, and macros use it behind the scenes.
-+ */
-+SDL_X11_MODULE(XGETREQUEST)
-+SDL_X11_SYM(void *,_XGetRequest,(Display* a,CARD8 b,size_t c),(a,b,c),return)
-+
-+/*
-  * These only show up on some variants of Unix.
-  */
- #if defined(__osf__)