[mupen64plus-video-rice] 18/191: 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-video-rice.

commit d5e00c0e42332e4443cdd59c92439da9453763ac
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 22:57:48 2010 +0200

    Rebase patches against 1.99.4~hg20100403
---
 debian/changelog                           |  2 +-
 debian/patches/default-optimisations.patch | 20 +++++++++----------
 debian/patches/long_glinfostring.patch     | 31 ------------------------------
 debian/patches/series                      |  1 -
 4 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4dc02d..d99a20a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mupen64plus-video-rice (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 0f70345..011966e 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 231b89a25537d24cd80ca3d077ade8084f88489e..54e393e9ba2ef87d04b873a73b64115921c21adb 100644
+index 84febf78ca47e59b4dc8369bd9bc30f77aba2744..1758f9db0c1a9ad5cd127b347838e4415d2b37d5 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -84,8 +84,8 @@ ifeq ("$(CPU)","NONE")
+@@ -84,7 +84,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
-+CFLAGS += -Wall -fno-strict-aliasing -I../../src
-+LDFLAGS += -ldl -lpng
+-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 -lpng
  
- # 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
-@@ -109,9 +109,9 @@ ifeq ($(OS), LINUX)
-   LDFLAGS += -lGL
+@@ -112,9 +112,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 231b89a25537d24cd80ca3d077ade8084f88489e..54e393e9ba2ef87d04b873a73b641159
      endif
    endif
  endif
-@@ -126,9 +126,6 @@ ifeq ($(OS), OSX)
+@@ -129,9 +129,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/long_glinfostring.patch b/debian/patches/long_glinfostring.patch
deleted file mode 100644
index b12d49c..0000000
--- a/debian/patches/long_glinfostring.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix buffer overflow due to long strings from glGetString
-origin: upstream, http://bitbucket.org/richard42/mupen64plus-video-rice/changeset/382f8fe748f3/
-Author: Richard Goedeken
-
----
-diff --git a/src/GraphicsContext.h b/src/GraphicsContext.h
-index 0dfc78632910907e71cb66ccbb38a9ddf29cf1c3..38032b203c12e9a8508d59060e7b61ddef4cb4bd 100644
---- a/src/GraphicsContext.h
-+++ b/src/GraphicsContext.h
-@@ -89,7 +89,7 @@ protected:
-     bool                m_bWindowed;
-     RECT                m_rcWindowBounds;
- 
--    char                m_strDeviceStats[90];
-+    char                m_strDeviceStats[256];
- 
-     virtual ~CGraphicsContext();
-     CGraphicsContext();
-diff --git a/src/OGLGraphicsContext.cpp b/src/OGLGraphicsContext.cpp
-index e7cf982ec3d8faeb0243a47c9faadc9cfe927daa..f004fb52bf088b7866e9d1d1b9ee6d87faccb0d7 100644
---- a/src/OGLGraphicsContext.cpp
-+++ b/src/OGLGraphicsContext.cpp
-@@ -109,7 +109,7 @@ bool COGLGraphicsContext::Initialize(uint32 dwWidth, uint32 dwHeight, BOOL bWind
- 
-     InitState();
-     InitOGLExtension();
--    sprintf(m_strDeviceStats, "%s - %s : %s", m_pVendorStr, m_pRenderStr, m_pVersionStr);
-+    sprintf(m_strDeviceStats, "%.60s - %.128s : %.60s", m_pVendorStr, m_pRenderStr, m_pVersionStr);
-     TRACE0(m_strDeviceStats);
-     DebugMessage(M64MSG_INFO, "Using OpenGL: %s", m_strDeviceStats);
- 
diff --git a/debian/patches/series b/debian/patches/series
index f271197..e164d80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 default-optimisations.patch
-long_glinfostring.patch

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