Merge pull request #7991 from Memphiz/mrmc_backports

Mrmc backports

7 files changed, 5 insertions, 147 deletions

diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile
index 17536f7777..833a91381f 100644
--- a/tools/depends/native/Makefile
+++ b/tools/depends/native/Makefile
@@ -7,9 +7,9 @@ endif
 NATIVE= m4-native gettext-native autoconf-native automake-native \
         libtool-native pkg-config-native yasm-native cmake-native \
         gas-preprocessor-native python26-native zlib-native \
-        pcre-native swig-native rpl-native libsdl_image-native libsquish-native \
+        pcre-native swig-native rpl-native libsquish-native \
         tiff-native libpng-native libjpeg-turbo-native liblzo2-native giflib-native \
-        libsdl-native distribute-native distutilscross-native JsonSchemaBuilder TexturePacker \
+        distribute-native distutilscross-native JsonSchemaBuilder TexturePacker \
         google-breakpad-native
 
 
@@ -33,7 +33,6 @@ libtool-native: automake-native
 libpng-native: zlib-native
 tiff-native: libjpeg-turbo-native
 swig-native: pcre-native
-libsdl_image-native: libsdl-native libpng-native libjpeg-turbo-native tiff-native
 distribute-native: python26-native
 distutilscross-native: python26-native distribute-native
 tar-native: xz-native
diff --git a/tools/depends/native/libsdl-native/01-SDL_SetWidthHeight.patch b/tools/depends/native/libsdl-native/01-SDL_SetWidthHeight.patch
deleted file mode 100644
index 0e26023554..0000000000
--- a/tools/depends/native/libsdl-native/01-SDL_SetWidthHeight.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: include/SDL_video.h
-===================================================================
---- include/SDL_video.h	(revision 4116)
-+++ include/SDL_video.h	(working copy)
-@@ -324,6 +324,11 @@
- extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags);
- 
- /**
-+* Alter the width and height of the current surface to the given sizes.
-+*/
-+extern DECLSPEC void SDLCALL SDL_SetWidthHeight(int width, int height);
-+
-+/**
-  * Set up a video mode with the specified width, height and bits-per-pixel.
-  *
-  * If 'bpp' is 0, it is treated as the current display bits per pixel.
-
-Index: src/video/SDL_video.c
-===================================================================
---- src/video/SDL_video.c	(revision 4116)
-+++ src/video/SDL_video.c	(working copy)
-@@ -1956,3 +1956,11 @@
- 		return(0);
- 	}
- }
-+
-+void SDL_SetWidthHeight(int width, int height)
-+{
-+  if (current_video != NULL && current_video->screen != NULL) {
-+    current_video->screen->w = width;
-+    current_video->screen->h = height;
-+  }
-+}
diff --git a/tools/depends/native/libsdl-native/02-OSX_interpretKeyEvents.patch b/tools/depends/native/libsdl-native/02-OSX_interpretKeyEvents.patch
deleted file mode 100644
index 7c4c8071e2..0000000000
--- a/tools/depends/native/libsdl-native/02-OSX_interpretKeyEvents.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/video/quartz/SDL_QuartzEvents.m	2009-10-13 07:07:14.000000000 +0800
-+++ src/video/quartz/SDL_QuartzEvents.m	2013-08-03 09:12:27.000000000 +0800
-@@ -280,7 +280,11 @@
-         the scancode/keysym.
-     */
-     if (SDL_TranslateUNICODE && state == SDL_PRESSED) {
--        [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
-+        NSResponder *firstResponder = [[NSApp keyWindow] firstResponder];
-+        if ([NSStringFromClass([firstResponder class]) isEqual:@"OSXTextInputResponder"])
-+          [firstResponder interpretKeyEvents:[NSArray arrayWithObject:event]];
-+        else
-+          [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
-         chars = [ event characters ];
-         numChars = [ chars length ];
-         if (numChars > 0)
diff --git a/tools/depends/native/libsdl-native/03-mavericks-compile.patch b/tools/depends/native/libsdl-native/03-mavericks-compile.patch
deleted file mode 100644
index 254b9e2c94..0000000000
--- a/tools/depends/native/libsdl-native/03-mavericks-compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/video/quartz/SDL_QuartzVideo.h.orig	2013-10-27 16:51:48.000000000 +0100
-+++ src/video/quartz/SDL_QuartzVideo.h	2013-10-27 16:52:13.000000000 +0100
-@@ -91,7 +91,9 @@
-     CGDirectDisplayID  display;            /* 0 == main display (only support single display) */
-     const void         *mode;              /* current mode of the display */
-     const void         *save_mode;         /* original mode of the display */
-+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
-     CGDirectPaletteRef palette;            /* palette of an 8-bit display */
-+#endif
-     NSOpenGLContext    *gl_context;        /* OpenGL rendering context */
-     NSGraphicsContext  *nsgfx_context;     /* Cocoa graphics context */
-     Uint32             width, height, bpp; /* frequently used data about the display */
diff --git a/tools/depends/native/libsdl-native/Makefile b/tools/depends/native/libsdl-native/Makefile
deleted file mode 100644
index 12bc560097..0000000000
--- a/tools/depends/native/libsdl-native/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-include ../../Makefile.include
-PREFIX=$(NATIVEPREFIX)
-PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include.in 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch Makefile
-
-# lib name, version
-LIBNAME=SDL
-VERSION=1.2.15
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) \
-  --without-x --disable-video-x11 --disable-video-directfb --enable-nasm=no
-
-LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).a
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p0 < ../01-SDL_SetWidthHeight.patch
-	cd $(PLATFORM); patch -p0 < ../02-OSX_interpretKeyEvents.patch
-	cd $(PLATFORM); patch -p0 < ../03-mavericks-compile.patch
-	cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -j 1 -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM) clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
diff --git a/tools/depends/native/libsdl_image-native/Makefile b/tools/depends/native/libsdl_image-native/Makefile
deleted file mode 100644
index 546bf43d63..0000000000
--- a/tools/depends/native/libsdl_image-native/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-include ../../Makefile.include
-PREFIX=$(NATIVEPREFIX)
-PLATFORM=$(NATIVEPLATFORM)
-DEPS=Makefile ../../Makefile.include.in
-
-# lib name, version
-LIBNAME=SDL_image
-VERSION=1.2.7
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) \
-   --disable-jpg-shared --disable-png-shared --disable-tif-shared --disable-sdltest
-
-LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME).a
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	echo $(PLATFORM) > .gitignore
-	cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM) clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
diff --git a/tools/depends/target/gmp/Makefile b/tools/depends/target/gmp/Makefile
index 11f8dcbd09..47653bd179 100644
--- a/tools/depends/target/gmp/Makefile
+++ b/tools/depends/target/gmp/Makefile
@@ -21,6 +21,9 @@ endif
 ifeq ($(OS),ios)
 CONFIGURE_FLAGS=CC_FOR_BUILD=llvm-gcc CPP_FOR_BUILD="llvm-gcc -E" --disable-assembly
 endif
+ifeq ($(OS),osx)
+CONFIGURE_FLAGS=--with-pic
+endif
 
 # configuration settings
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \