[mupen64plus-ui-console] 145/172: Remove upstream merged patches

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit b210b34be1ab7f9aa8edb30250226f9374eb3f8f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 10:09:27 2013 +0200

    Remove upstream merged patches
---
 debian/changelog              |  3 --
 debian/patches/sdl_main.patch | 70 -------------------------------------------
 debian/patches/series         |  1 -
 3 files changed, 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c1b183..28d8520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,6 @@ mupen64plus-ui-console (2.0-1) UNRELEASED; urgency=low
 
   * New Upstream Version
   * Upload to unstable
-  * debian/patches:
-    - Add sdl_main.patch, Avoid crash caused by missing initial subsystem
-      startup
   * debian/control:
     - Depend on libsdl2-dev for new SDLmain function
     - Build-Depend on debhelper 9.20130604 for support of parameters when
diff --git a/debian/patches/sdl_main.patch b/debian/patches/sdl_main.patch
deleted file mode 100644
index 3eb91ef..0000000
--- a/debian/patches/sdl_main.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Avoid crash caused by missing initial subsystem startup
- SDL needs to overwrite the main function to initialize the subsystems on
- some operations systems. Doing not so will cause crashes
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index b6ee4944ce11945a9f7ba4c0b77a8210f7b9d41b..848a3aeb051ec103d355d7468ae349daaefbd5c6 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -128,18 +128,6 @@ ifeq ($(OS), OSX)
-     OSX_SYSROOT := /Developer/SDKs
-   endif
- 
--  # The mac version of SDL requires inclusion of SDL_main in the executable
--  ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined)
--    SDL_CONFIG = $(CROSS_COMPILE)sdl-config
--    ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),)
--      $(error No SDL development libraries found!)
--    endif
--    SDL_CFLAGS  += $(shell $(SDL_CONFIG) --cflags)
--    SDL_LDLIBS += $(shell $(SDL_CONFIG) --libs)
--  endif
--  CFLAGS += $(SDL_CFLAGS)
--  LDLIBS += $(SDL_LDLIBS)
--
-   ifeq ($(CPU), X86)
-     ifeq ($(ARCH_DETECTED), 64BITS)
-       CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
-@@ -149,11 +137,20 @@ ifeq ($(OS), OSX)
-   endif
- endif
- 
-+# test for presence of SDL
-+ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined)
-+  SDL_CONFIG = $(CROSS_COMPILE)sdl-config
-+  ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),)
-+    $(error No SDL development libraries found!)
-+  endif
-+  SDL_CFLAGS  += $(shell $(SDL_CONFIG) --cflags)
-+  SDL_LDLIBS += $(shell $(SDL_CONFIG) --libs)
-+endif
-+CFLAGS += $(SDL_CFLAGS)
-+LDLIBS += $(SDL_LDLIBS)
-+
- ifeq ($(OS), MINGW)
--  # Do NOT include SDL_main for Windows; we are building a console app!
--  # NO -mwindows either!  (it will still be a valid 32-bit Windows program)
--  CFLAGS += -I/usr/local/include/SDL -D_GNU_SOURCE=1
--  LDLIBS += -L/usr/local/lib -lmingw32 -lSDL
-+  LDLIBS += -mconsole
- endif
- 
- ifeq ($(BIG_ENDIAN), 1)
-diff --git a/src/main.c b/src/main.c
-index c7f20e23a390a83c9508e8800449b06d93910910..ea47d866b6b157b225053906491549206725480d 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,10 +30,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- 
--// The mac version of SDL requires inclusion of SDL_main in the executable
--#ifdef __APPLE__
--	 #include <SDL_main.h>
--#endif
-+#include <SDL_main.h>
- 
- #include "cheat.h"
- #include "main.h"
diff --git a/debian/patches/series b/debian/patches/series
index fb0033b..5a5a78d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 printf_fixup.patch
-sdl_main.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git