[mupen64plus-video-z64] 09/161: 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-video-z64.

commit 9b8086be4a7508ce3ede47b85f9bd4b3ad60b895
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:59:31 2010 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 0b80596..0b1b33c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-video-z64 (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 4887e1e..a544aa7 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 b3c2a1152894089bce79afc74c232a838c30612e..537e3716711dc1ebdf6a77735f446760352d4e8b 100644
+index cee356aa824bd61368adf383e0b274e440a8728c..7eebe440b233664933be2505e66750e8b8ac12a4 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -80,8 +80,8 @@ ifeq ("$(CPU)","NONE")
+@@ -85,7 +85,7 @@ ifeq ("$(CPU)","NONE")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
--LDFLAGS = -ldl -lpng -lGLEW
-+CFLAGS += -Wall -fno-strict-aliasing -I../../src
-+LDFLAGS += -ldl -lpng -lGLEW
+-CFLAGS += -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
++CFLAGS += -Wall -fno-strict-aliasing -fvisibility=hidden -I../../src
+ CXXFLAGS += -fvisibility-inlines-hidden
+ LDFLAGS += -ldl -lGLEW
  
- # 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
-@@ -105,9 +105,9 @@ ifeq ($(OS), LINUX)
-   LDFLAGS += -lGL
+@@ -113,9 +113,9 @@ ifeq ($(OS), LINUX)
+   LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
 -      CFLAGS += -pipe -O3 -march=athlon64
@@ -30,7 +28,7 @@ index b3c2a1152894089bce79afc74c232a838c30612e..537e3716711dc1ebdf6a77735f446760
      endif
    endif
  endif
-@@ -122,9 +122,6 @@ ifeq ($(OS), OSX)
+@@ -130,9 +130,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif

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