[mupen64plus-core] 22/310: 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-core.

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

    Rebase patches against 1.99.4~hg20100403
---
 debian/changelog                           |  3 ++-
 debian/patches/default-optimisations.patch | 22 ++++++++++++----------
 debian/patches/dejavu-font.patch           |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60011ed..6de2111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,8 @@ mupen64plus-core (1.99.4~hg20100403-1) UNRELEASED; urgency=low
       rice-texturepack-crash.patch, system-libbz2.patch, system-liblzma.patch,
       system-libpng.patch, system-zlib.patch, version-string.patch,
       xdg-basedir.patch, static-binutils-libs.patch, rice_fog.patch
-    - Rebase default-optimisations.patch and dejavu-font.patch against 1.99.3
+    - Rebase default-optimisations.patch and dejavu-font.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 207b8c1..a2fbe80 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,28 +4,30 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 480252a7ce912669279e209fa101722b7b27c71e..fb75706f771586cc66619f2b1f260d81ec3dd02e 100644
+index 6f9487ffc6c4bf60dcca4af8dc4fa950243f688e..960441e9fadbb42aa8e4c1ede4610fe9f9e01fbc 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -74,14 +74,10 @@ ifeq ("$(CPU)","NONE")
+@@ -74,15 +74,12 @@ ifeq ("$(CPU)","NONE")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
-+CFLAGS += -Wall -fno-strict-aliasing -I../../src
- LIBS = -ldl -lpng -lz -lm -lfreetype
+-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
+ LIBS += -ldl -lpng -lz -lm -lfreetype
  
 -# 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
 -ifeq ($(ARCH_DETECTED), 64BITS)
--  CFLAGS += -fPIC -DPIC -fvisibility=hidden
+-  CFLAGS += -fPIC -DPIC
 -endif
-+CFLAGS += -fPIC -DPIC -fvisibility=hidden
++CFLAGS += -fPIC -DPIC
++
  # tweak flags for 32-bit build on 64-bit system
  ifeq ($(ARCH_DETECTED), 64BITS_32)
    ifeq ($(OS), FREEBSD)
-@@ -105,9 +101,9 @@ ifeq ($(OS), LINUX)
-   LIBS += -L/usr/X11R6/lib -lGL -lGLU
+@@ -108,9 +105,9 @@ ifeq ($(OS), LINUX)
+   LDFLAGS += -Wl,-version-script,$(SRCDIR)/api/api_export.ver
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
 -      CFLAGS += -pipe -O3 -march=athlon64
@@ -36,7 +38,7 @@ index 480252a7ce912669279e209fa101722b7b27c71e..fb75706f771586cc66619f2b1f260d81
        ifneq ($(PROFILE), 1)
          CFLAGS += -fomit-frame-pointer
        endif
-@@ -131,9 +127,6 @@ ifeq ($(OS), OSX)
+@@ -134,9 +131,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index dc49740..4fce6b0 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de> Please enter the commit message f
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index fb75706f771586cc66619f2b1f260d81ec3dd02e..8bdc808e030eaae142020012061fdd6a98ea5f60 100644
+index 960441e9fadbb42aa8e4c1ede4610fe9f9e01fbc..ddcf56543fc3a4f1f565309e1c6be620cd2f8ba5 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -358,7 +358,7 @@ install: $(TARGET)
+@@ -360,7 +360,7 @@ install: $(TARGET)
  	$(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)"

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