[mupen64plus-audio-sdl] 17/163: 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-audio-sdl.

commit 085386aaff5395af1495feca126516bd8f0b1c98
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:13:32 2010 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 72f1b86..3a804ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-audio-sdl (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 cd2bd81..1b8d83d 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,20 +4,18 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 640407e2f6ef5f0d0e32c0461b8b5467fa09ff4b..95f8c6d5320322dd171580f5c93c543e2dbac45e 100644
+index e8f5bab8b841702006ac984da7accd60bcbc1959..0d951d3789990a9120c86b7db79ed803aecb77a2 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 += -ldl
+-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.
- # 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)
    ifeq ($(CPU), X86)

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