[mupen64plus-input-sdl] 17/196: 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 master
in repository mupen64plus-input-sdl.

commit 1b5172337707b46b06732e23a01a373572fa3239
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:21:20 2010 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 07a67ca..912054b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-input-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 32cfd07..2085857 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,17 +4,16 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 82ccb61a9363ed6013fc7ba1a41fe11dbeb4562a..4639945472f96d79c4d9c121447888945c4e5354 100644
+index d269d603e94a4c1cc4607c939a3861fdb5fb56a8..a1a07aaaeec6e06b7df36a2d776a10b143206073 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
 @@ -82,10 +82,10 @@ 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 += -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
+ LDFLAGS += -ldl
  ifneq ($(OS), FREEBSD)
 -  CFLAGS += -pipe -O3
 +  CFLAGS += -pipe

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