[mmapper] Added patch to fix mirrored textures with Qt >= 4.6

Kalev Lember kalev at fedoraproject.org
Thu Jan 6 00:25:47 UTC 2011


commit 3a883e5cd6edbf9acebe45fae8fe5c51a7b27724
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Jan 6 02:12:56 2011 +0200

    Added patch to fix mirrored textures with Qt >= 4.6

 mmapper-2.1.0-mirrored_textures.patch |   29 +++++++++++++++++++++++++++++
 mmapper.spec                          |    9 +++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/mmapper-2.1.0-mirrored_textures.patch b/mmapper-2.1.0-mirrored_textures.patch
new file mode 100644
index 0000000..e93f99c
--- /dev/null
+++ b/mmapper-2.1.0-mirrored_textures.patch
@@ -0,0 +1,29 @@
+Index: src/display/mapcanvas.cpp
+===================================================================
+--- src/display/mapcanvas.cpp	(revision 202)
++++ src/display/mapcanvas.cpp	(revision 203)
+@@ -2706,6 +2706,7 @@
+     m_room_gllist = glGenLists(1);
+     glNewList(m_room_gllist, GL_COMPILE);
+     glBegin(GL_QUADS);
++#if QT_VERSION < 0x040600
+     glTexCoord2d(0, 1);
+     glVertex3d(0.0, 0.0, 0.0);
+     glTexCoord2d(0, 0);
+@@ -2714,6 +2715,16 @@
+     glVertex3d(1.0, 1.0, 0.0);
+     glTexCoord2d(1, 1);
+     glVertex3d(1.0, 0.0, 0.0);
++#else
++    glTexCoord2d(0, 1);
++    glVertex3d(0.0, 1.0, 0.0);
++    glTexCoord2d(0, 0);
++    glVertex3d(0.0, 0.0, 0.0);
++    glTexCoord2d(1, 0);
++    glVertex3d(1.0, 0.0, 0.0);
++    glTexCoord2d(1, 1);
++    glVertex3d(1.0, 1.0, 0.0);
++#endif
+     glEnd();
+     glEndList();
+ 
diff --git a/mmapper.spec b/mmapper.spec
index 23b34fa..c816a08 100644
--- a/mmapper.spec
+++ b/mmapper.spec
@@ -1,14 +1,15 @@
 Name:           mmapper
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical MUME mapper
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/mmapper
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz
-# Backported patch from upstream svn
+# Backported patches from upstream svn
 Patch0:         mmapper-2.1.0-system_qtiocompressor.patch
+Patch1:         mmapper-2.1.0-mirrored_textures.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -28,6 +29,7 @@ data in real time and show player's position in a map.
 %prep
 %setup -q -n %{name}-%{version}-source
 %patch0 -p1 -b .system_qtiocompressor
+%patch1 -p0 -b .mirrored_textures
 
 # remove bundled copy of qtiocompressor
 rm -rf src/3rdparty
@@ -78,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jan 06 2011 Kalev Lember <kalev at smartlink.ee> - 2.1.0-2
+- Added patch to fix mirrored textures with Qt >= 4.6
+
 * Mon Aug 23 2010 Kalev Lember <kalev at smartlink.ee> - 2.1.0-1
 - Update to 2.1.0
 - Dropped upstreamed patches


More information about the scm-commits mailing list