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

commit cfb53330d8c9dbb0130de628bec0812a15991ea8
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:52:10 2010 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 5a0d7ae..a67beda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-video-arachnoid (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 074ae99..faf9d04 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,15 +4,15 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 60332be07c58f4ed5731fb60c9f3d96281e0ef28..f41cf52c19fd470a1ba4bd07522aca68fc4b3832 100644
+index f452fd6eb0dd2d2be7b7cd91e5bb49050dcc4f6d..e4b5ecdd731e6edaab8bb902d0ff904824bd78f0 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -69,12 +69,12 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
+@@ -74,12 +74,12 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src \
-+CFLAGS += -ffast-math -fno-strict-aliasing -I../../src \
+-CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src \
++CFLAGS += -fno-strict-aliasing -fvisibility=hidden -I../../src \
  		 -I../../src/hash -I../../src/ucodes -I../../src/GBI -I../../src/RDP -I../../src/utils \
  		 -I../../src/log -I../../src/RSP -I../../src/framebuffer -I../../src/math -I../../src/renderer \
  		 -I../../src/Assembler -I../../src/texture -I../../src/config -I../../src/Combiner 
@@ -20,9 +20,9 @@ index 60332be07c58f4ed5731fb60c9f3d96281e0ef28..f41cf52c19fd470a1ba4bd07522aca68
 -  CFLAGS += -pipe -O3
 +  CFLAGS += -pipe
  endif
+ CXXFLAGS += -fvisibility-inlines-hidden
  
- # On OS X, add a few extra flags to elegantly support cross-compilation and backward
-@@ -123,9 +123,9 @@ endif
+@@ -133,9 +133,9 @@ endif
  ifneq ($(OS), FREEBSD)
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
@@ -34,7 +34,7 @@ index 60332be07c58f4ed5731fb60c9f3d96281e0ef28..f41cf52c19fd470a1ba4bd07522aca68
      endif
      # tweak flags for 32-bit build on 64-bit system
      ifeq ($(ARCH_DETECTED), 64BITS_32)
-@@ -138,9 +138,6 @@ else
+@@ -148,9 +148,6 @@ else
      $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
    endif
  endif
@@ -44,7 +44,7 @@ index 60332be07c58f4ed5731fb60c9f3d96281e0ef28..f41cf52c19fd470a1ba4bd07522aca68
  
  # set shell function names
  # set shell function names
-@@ -157,7 +154,7 @@ endif
+@@ -166,7 +163,7 @@ endif
  
  # set special flags for given Makefile parameters
  ifeq ($(DEBUG),1)

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