[86944] trunk/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Mon Nov 7 05:55:47 PST 2011
Revision: 86944
http://trac.macports.org/changeset/86944
Author: michaelld at macports.org
Date: 2011-11-07 05:55:46 -0800 (Mon, 07 Nov 2011)
Log Message:
-----------
qt4-mac: Patch for Tiger compilation; fixes ticket #31879.
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
Added Paths:
-----------
trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2011-11-07 12:20:24 UTC (rev 86943)
+++ trunk/dports/aqua/qt4-mac/Portfile 2011-11-07 13:55:46 UTC (rev 86944)
@@ -99,6 +99,9 @@
# < http://labs.qt.nokia.com/2011/09/07/ >
patchfiles-append patch-blacklist-diginotar-certs.diff
+# (10) from Qt bugs (#18346), fix shader effect item code.
+patchfiles-append patch-src-imports-shaders-shadereffectitem.cpp.diff
+
# find a way to specify the OS MINOR version.
global MINOR
set MINOR ""
Added: trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src-imports-shaders-shadereffectitem.cpp.diff 2011-11-07 13:55:46 UTC (rev 86944)
@@ -0,0 +1,20 @@
+--- src/imports/shaders/shadereffectitem.cpp.orig
++++ src/imports/shaders/shadereffectitem.cpp
+@@ -509,7 +509,7 @@ void ShaderEffectItem::updateEffectState(const QMatrix4x4 &matrix)
+ m_program.setUniformValue(name.constData(), qvariant_cast<QTransform>(v));
+ break;
+ case QVariant::Int:
+- m_program.setUniformValue(name.constData(), v.toInt());
++ m_program.setUniformValue(name.constData(), GLint(v.toInt()));
+ break;
+ case QVariant::Bool:
+ m_program.setUniformValue(name.constData(), GLint(v.toBool()));
+@@ -852,7 +852,7 @@ void ShaderEffectItem::updateShaderProgram()
+ if (m_program.isLinked()) {
+ m_program.bind();
+ for (int i = 0; i < m_sources.size(); ++i)
+- m_program.setUniformValue(m_sources.at(i).name.constData(), i);
++ m_program.setUniformValue(m_sources.at(i).name.constData(), (GLint) i);
+ }
+
+ m_program_dirty = false;
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111107/b5327249/attachment-0001.html>
More information about the macports-changes
mailing list