[arch-commits] Commit in qt/trunk (PKGBUILD fix-multisampling-with-ati-card.patch)

[Andrea Scarpino]

    Date: Sunday, October 10, 2010 @ 10:30:15
  Author: andrea
Revision: 94734

fix multisampling with ATI card (FS#20930); set doc,example and demos dir (this fix FS#21164)

Added:
  qt/trunk/fix-multisampling-with-ati-card.patch
Modified:
  qt/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   12 +++++++++---
 fix-multisampling-with-ati-card.patch |   25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-10 14:05:37 UTC (rev 94733)
+++ PKGBUILD	2010-10-10 14:30:15 UTC (rev 94734)
@@ -4,7 +4,7 @@
 
 pkgname=qt
 pkgver=4.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
@@ -24,13 +24,15 @@
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
-	'fix-scroll-when-last-item-is-removed.patch')
+        'fix-scroll-when-last-item-is-removed.patch'
+        'fix-multisampling-with-ati-card.patch')
 md5sums=('3a2f25b9b115037277f4fb759194a7a5'
          'a445c6917086d80f1cfc1e40cb6b0132'
          'd457f0a0ad68a3861c3cadefe3b42ded'
          '668331d9798a0e2b94381efb7be4c513'
          'c29f2993d6a0f73d756d2fa36e130e1c'
-         'ef20c34afc5be5ed62f2935be66d9402')
+         'ef20c34afc5be5ed62f2935be66d9402'
+         'b2e0f134bbb848ebef41134a45a36ee9')
 
 build() {
 	unset QMAKESPEC
@@ -42,6 +44,7 @@
 
 	# Already fixed in 4.7.1
 	patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch
+	patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch
 
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
@@ -49,11 +52,14 @@
 
 	./configure -confirm-license -opensource \
 		-prefix /usr \
+		-docdir /usr/share/doc/qt \
 		-plugindir /usr/lib/qt/plugins \
 		-importdir /usr/lib/qt/imports \
 		-datadir /usr/share/qt \
 		-translationdir /usr/share/qt/translations \
 		-sysconfdir /etc \
+		-examplesdir /usr/share/doc/qt/examples \
+		-demosdir /usr/share/doc/qt/demos \
 		-largefile \
 		-plugin-sql-{psql,mysql,sqlite,odbc} \
 		-system-sqlite \

Added: fix-multisampling-with-ati-card.patch
===================================================================
--- fix-multisampling-with-ati-card.patch	                        (rev 0)
+++ fix-multisampling-with-ati-card.patch	2010-10-10 14:30:15 UTC (rev 94734)
@@ -0,0 +1,25 @@
+From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147 at gmail.com>
+Date: Wed, 25 Aug 2010 14:07:40 +1000
+Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers
+
+---
+ src/opengl/qgl_win.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
+index 5ab944a..8eb6177 100644
+--- a/src/opengl/qgl_win.cpp
++++ b/src/opengl/qgl_win.cpp
+@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc)
+         iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB;
+         iAttributes[i++] = TRUE;
+         iAttributes[i++] = WGL_COLOR_BITS_ARB;
+-        iAttributes[i++] = 32;
++        iAttributes[i++] = 24;
+         iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB;
+         iAttributes[i++] = d->glFormat.doubleBuffer();
+         if (d->glFormat.stereo()) {
+-- 
+1.7.2.1
+