[arch-commits] Commit in xf86-video-intel/repos (3 files)

[Jan de Groot]

    Date: Wednesday, May 14, 2008 @ 15:34:02
  Author: jgc
Revision: 1706

Merged revisions 1704-1705 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-intel/trunk

........
  r1705 | jgc | 2008-05-14 19:33:48 +0000 (Wed, 14 May 2008) | 2 lines
  
  upgpkg: xf86-video-intel 2.3.1-1
      Add md5sums, remove another patch and remove file conflicts with i810. Users should have upgraded their config by now
........

Modified:
  xf86-video-intel/repos/extra-x86_64/	(properties)
  xf86-video-intel/repos/extra-x86_64/PKGBUILD
Deleted:
  xf86-video-intel/repos/extra-x86_64/05_intel_exa_force_greedy.patch

---------------------------------+
 05_intel_exa_force_greedy.patch |   16 ----------------
 PKGBUILD                        |    3 +++
 2 files changed, 3 insertions(+), 16 deletions(-)


Property changes on: xf86-video-intel/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-intel/trunk:1-1703
   + /xf86-video-intel/trunk:1-1705

Deleted: extra-x86_64/05_intel_exa_force_greedy.patch
===================================================================
--- extra-x86_64/05_intel_exa_force_greedy.patch	2008-05-14 19:33:48 UTC (rev 1705)
+++ extra-x86_64/05_intel_exa_force_greedy.patch	2008-05-14 19:34:02 UTC (rev 1706)
@@ -1,16 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.2.0.90.patched/src/i830_exa.c xserver-xorg-video-intel-2.2.0.90.working/src/i830_exa.c
---- xserver-xorg-video-intel-2.2.0.90.patched/src/i830_exa.c	2008-02-19 10:59:47.000000000 -0800
-+++ xserver-xorg-video-intel-2.2.0.90.working/src/i830_exa.c	2008-02-19 10:57:54.000000000 -0800
-@@ -541,6 +541,12 @@ I830EXAInit(ScreenPtr pScreen)
- 	pI830->EXADriverPtr->pixmapPitchAlign = 16;
- 	pI830->EXADriverPtr->maxX = 8192;
- 	pI830->EXADriverPtr->maxY = 8192;
-+#if defined(EXA_MIGRATION_GREEDY)
-+        /* Force use of Option "MigrationHeuristic" "greedy" here for 965 with EXA (LP: #177492) */
-+        pI830->EXADriverPtr->flags |= EXA_MIGRATION_GREEDY;
-+        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-+                   "EXA greedy mode enabled for i965 migration.\n");
-+#endif
-     } else {
- 	pI830->EXADriverPtr->pixmapOffsetAlign = 4;
- 	pI830->EXADriverPtr->pixmapPitchAlign = 16;

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-14 19:33:48 UTC (rev 1705)
+++ extra-x86_64/PKGBUILD	2008-05-14 19:34:02 UTC (rev 1706)
@@ -12,6 +12,7 @@
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('327504252480008b8df8530222c1ac7f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -19,4 +20,6 @@
               --enable-dri || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
+  rm -f ${startdir}/pkg/usr/lib/xorg/modules/drivers/i810_drv.so
+  rm -f ${startdir}/pkg/usr/share/man/man4/i810.4*
 }