[mupen64plus-rsp-hle] 18/167: Rebase patches against 1.99.4~hg20100403

[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 c45f62b4b194fcca095ae87a68f16f4a60bbe487
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:23:41 2010 +0200

    Rebase patches against 1.99.4~hg20100403
---
 debian/changelog                           |  2 +-
 debian/patches/default-optimisations.patch | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02d0675..c17ec1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-rsp-hle (1.99.4~hg20100403-1) UNRELEASED; urgency=low
       rice-texturepack-crash.patch, static-binutils-libs.patch,
       system-libbz2.patch, system-liblzma.patch, system-libpng.patch,
       system-zlib.patch, version-string.patch, xdg-basedir.patch, rice_fog.patch
-    - Rebase default-optimisations.patch against 1.99.3
+    - Rebase default-optimisations.patch against 1.99.4~hg20100403
   * Convert to 3.0 (quilt) source format
   * debian/control:
     - Remove unneeded build dependency to quilt
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 0b5a0f8..6dc2b65 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,22 +4,20 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 62b844341ab704d13473d78754267e8cc66e453a..76159db8ee775595f60eed2aeca8b4bf48ab4354 100644
+index 2c07f3b5eb485c9930ea09beb15b6585df18abd6..bd994b49e377a38af317dda17d2b51f899ecc821 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -83,8 +83,8 @@ ifeq ("$(CPU)","NONE")
+@@ -83,7 +83,7 @@ ifeq ("$(CPU)","NONE")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
--LDFLAGS = -ldl
-+CFLAGS += -fno-strict-aliasing -I../../src
-+LDFLAGS +=
+-CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
++CFLAGS += -fno-strict-aliasing -fvisibility=hidden -I../../src
+ CXXFLAGS += -fvisibility-inlines-hidden
  
  # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
- # 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
-@@ -104,9 +104,9 @@ endif
- ifeq ($(OS), LINUX)
+@@ -106,9 +106,9 @@ ifeq ($(OS), LINUX)
+   LDFLAGS += -Wl,-version-script,$(SRCDIR)/rsp_api_export.ver
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
 -      CFLAGS += -pipe -O3 -march=athlon64
@@ -30,7 +28,7 @@ index 62b844341ab704d13473d78754267e8cc66e453a..76159db8ee775595f60eed2aeca8b4bf
      endif
    endif
  endif
-@@ -121,9 +121,6 @@ ifeq ($(OS), OSX)
+@@ -123,9 +123,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif

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