[mupen64plus-rsp-hle] 39/167: 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-rsp-hle.

commit e99b635004b186740a990e1dd05e97bfc94147a5
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Nov 24 20:40:28 2010 +0100

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

diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 6dc2b65..4788de0 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 2c07f3b5eb485c9930ea09beb15b6585df18abd6..bd994b49e377a38af317dda17d2b51f899ecc821 100644
+index d7b6a1ce850e9cb6dac4ef8f5d3952d1eb2d99f0..7d3be633676369092a750e8c6db4a569d8592eba 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
@@ -16,7 +16,7 @@ index 2c07f3b5eb485c9930ea09beb15b6585df18abd6..bd994b49e377a38af317dda17d2b51f8
  CXXFLAGS += -fvisibility-inlines-hidden
  
  # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
-@@ -106,9 +106,9 @@ ifeq ($(OS), LINUX)
+@@ -111,9 +111,9 @@ ifeq ($(OS), LINUX)
    LDFLAGS += -Wl,-version-script,$(SRCDIR)/rsp_api_export.ver
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
@@ -28,7 +28,7 @@ index 2c07f3b5eb485c9930ea09beb15b6585df18abd6..bd994b49e377a38af317dda17d2b51f8
      endif
    endif
  endif
-@@ -123,9 +123,6 @@ ifeq ($(OS), OSX)
+@@ -128,9 +128,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
index 6b66a4f..6ff11b3 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 bd994b49e377a38af317dda17d2b51f899ecc821..7d3be633676369092a750e8c6db4a569d8592eba 100644
+index 7d3be633676369092a750e8c6db4a569d8592eba..59a51052f427ff0a58e75f63c8fd0f2c0668d76b 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))","")
    SO_EXTENSION = so
    SHARED = -shared
  endif

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