[mupen64plus-input-sdl] 34/196: Rebase patches against 1.99.4

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 06ab4c294a8e66e794cf910c85415d2bfe0c824a
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Nov 24 20:33:03 2010 +0100

    Rebase patches against 1.99.4
---
 debian/patches/default-optimisations.patch | 13 +++++++------
 debian/patches/hurd_os.patch               |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 2085857..49ac9e6 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,35 +4,36 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index d269d603e94a4c1cc4607c939a3861fdb5fb56a8..a1a07aaaeec6e06b7df36a2d776a10b143206073 100644
+index 0a0d7abae1363bdabc972f4fe116b89fae210529..5ba155b637c4eabc009b54b95cb36dd4dcb8a1ea 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -82,10 +82,10 @@ ifeq ("$(CPU)","NONE")
+@@ -87,9 +87,10 @@ ifeq ("$(CPU)","NONE")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
 -CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
 +CFLAGS += -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
- LDFLAGS += -ldl
++LDFLAGS += -ldl
  ifneq ($(OS), FREEBSD)
 -  CFLAGS += -pipe -O3
 +  CFLAGS += -pipe
  endif
  
  # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
-@@ -108,9 +108,9 @@ endif
+@@ -112,10 +113,10 @@ endif
  ifeq ($(OS), LINUX)
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
 -      CFLAGS += -march=athlon64
 +      CFLAGS +=
+       LDFLAGS += -ldl
      else
 -      CFLAGS += -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
 +      CFLAGS += -mmmx -msse -fomit-frame-pointer
+       LDFLAGS += -ldl
      endif
    endif
- endif
-@@ -124,9 +124,6 @@ ifeq ($(OS), OSX)
+@@ -131,9 +132,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
index 555bb0c..41e31db 100644
--- a/debian/patches/hurd_os.patch
+++ b/debian/patches/hurd_os.patch
@@ -3,10 +3,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index a1a07aaaeec6e06b7df36a2d776a10b143206073..2eeb1aee5fe56a71bb183f360780746c7be0476d 100644
+index 5ba155b637c4eabc009b54b95cb36dd4dcb8a1ea..e55115ac16431c1be6c7b7c063c04f060a8f9d72 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -33,6 +33,11 @@ ifeq ("$(UNAME)","linux")
+@@ -38,6 +38,11 @@ ifneq ("$(filter GNU hurd,$(UNAME))","")
    SO_EXTENSION = so
    SHARED = -shared
  endif

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