[mupen64plus-audio-sdl] 34/163: 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 armhf_test
in repository mupen64plus-audio-sdl.

commit 83f5324d48c1d72e1dced5f2764c3400d4474913
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Nov 24 20:20:43 2010 +0100

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

diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 1b8d83d..e3597b8 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,37 +4,36 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index e8f5bab8b841702006ac984da7accd60bcbc1959..0d951d3789990a9120c86b7db79ed803aecb77a2 100644
+index 7e24a25f67142a7d888aead9c2d5f7fdd3d1a987..6ca972fbbcdf6b92dbfc1ff1778bf27206bb962b 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -83,7 +83,7 @@ ifeq ("$(CPU)","NONE")
+@@ -88,7 +88,7 @@ ifeq ("$(CPU)","NONE")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
 -CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
 +CFLAGS += -fno-strict-aliasing -fvisibility=hidden -I../../src
- LDFLAGS += -ldl
  
  # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
-@@ -104,9 +104,9 @@ endif
+ # On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
+@@ -108,10 +108,10 @@ endif
  ifeq ($(OS), LINUX)
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
 -      CFLAGS += -pipe -O3 -march=athlon64
 +      CFLAGS += -pipe
+       LDFLAGS += -ldl
      else
 -      CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
 +      CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
+       LDFLAGS += -ldl
      endif
    endif
- endif
-@@ -121,9 +121,6 @@ ifeq ($(OS), OSX)
-     endif
+@@ -128,7 +128,6 @@ ifeq ($(OS), OSX)
    endif
  endif
--ifeq ($(CPU), PPC)
+ ifeq ($(CPU), PPC)
 -  CFLAGS += -mcpu=powerpc
--endif
+   LDFLAGS += -ldl
+ endif
  
- # test for presence of SDL
- ifeq ($(shell which sdl-config 2>/dev/null),)
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
index 401aed6..b5ce84c 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 0d951d3789990a9120c86b7db79ed803aecb77a2..de110d6a522bfaff2e1c6d28857f9995be2ae262 100644
+index 6ca972fbbcdf6b92dbfc1ff1778bf27206bb962b..ad2432e1fc613649f3ca9069f5811b62d7ea117e 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -34,6 +34,11 @@ ifeq ("$(UNAME)","linux")
+@@ -39,6 +39,11 @@ ifneq ("$(filter GNU hurd,$(UNAME))","")
    SHARED = -shared
    SO_EXTENSION = so
  endif

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