[arch-commits] Commit in xf86-video-i810/trunk (PKGBUILD mergedfb-checks.patch)

[Jan de Groot]

    Date: Wednesday, May 14, 2008 @ 15:37:29
  Author: jgc
Revision: 1708

upgpkg: xf86-video-i810 1.7.4-10
    Remove patch, this is a HW limitation. Depend on intel-dri so this package is parallel installable with the intel driver

Modified:
  xf86-video-i810/trunk/PKGBUILD
Deleted:
  xf86-video-i810/trunk/mergedfb-checks.patch

-----------------------+
 PKGBUILD              |   39 +++++----------------------------------
 mergedfb-checks.patch |   28 ----------------------------
 2 files changed, 5 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-05-14 19:34:39 UTC (rev 1707)
+++ PKGBUILD	2008-05-14 19:37:29 UTC (rev 1708)
@@ -3,51 +3,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-i810
 pkgver=1.7.4
-pkgrel=8
+pkgrel=10
 pkgdesc="X.org Intel i810/i830/i915 video drivers"
-_mesaver="7.0.3-rc3"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libdrm>=2.3.0' 'expat>=2.0')
-makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'imake' 'xf86driproto'
-             'libxvmc' 'glproto' 'mesa>=7.0.3rc3')
+depends=('intel-dri' 'libdrm')
+makedepends=('pkgconfig' 'xorg-server>=1.4.0.90' 'xorg-util-macros' 'xf86driproto' 'glproto' 'mesa>=7.0.3')
 options=(!libtool)
 groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	http://www.mesa3d.org/beta/MesaLib-${_mesaver}.tar.gz
-	mergedfb-checks.patch)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('744a6ee1ebfe1c74e3b170b8d7ef8395')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -R -i ${startdir}/src/mergedfb-checks.patch || return 1
   ./configure --prefix=/usr \
               --enable-dri || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
-  cd ${startdir}/src/Mesa-${_mesaver}
-  cd configs
-
-  CONFIG="linux-dri-x86"
-  [ "$CARCH" = "x86_64" ] && CONFIG="linux-dri-x86-64"
-  echo "EXTRA_LIB_PATH =" >> ${CONFIG}
-  echo "OPT_FLAGS = ${CFLAGS}" >> ${CONFIG}
-  echo "SRC_DIRS = glx/x11 mesa" >> ${CONFIG}
-  echo "USING_EGL = 0" >> ${CONFIG}
-  echo "PROGRAM_DIRS =" >> ${CONFIG}
-  echo "MKDEP = makedepend" >> ${CONFIG}
-  echo "DRI_DIRS = i810 i915 i915tex i965" >> ${CONFIG}
-  echo "DRI_DRIVER_SEARCH_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG}
-  echo "DRI_DRIVER_INSTALL_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG}
-  echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${CONFIG}
-  echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${CONFIG}
-
-  ln -s ${CONFIG} current
-  cd ${startdir}/src/Mesa-${_mesaver}/src/mesa
-  make linux-solo || return 1
-  cd drivers/dri
-  make DESTDIR=${startdir}/pkg install || return 1
 }
-md5sums=('744a6ee1ebfe1c74e3b170b8d7ef8395'
-         '8caf88712f76f28ed36aa0cedad6d7cb'
-         '529511b1e0c2c2f7c5c03aa98178b1ae')

Deleted: mergedfb-checks.patch
===================================================================
--- mergedfb-checks.patch	2008-05-14 19:34:39 UTC (rev 1707)
+++ mergedfb-checks.patch	2008-05-14 19:37:29 UTC (rev 1708)
@@ -1,28 +0,0 @@
-From: Alan Hourihane <alanh at fairlite.demon.co.uk>
-Date: Mon, 23 Oct 2006 16:29:17 +0000 (+0100)
-Subject: Add some MergedFB checks for accelerator limitations
-X-Git-Tag: xf86-video-intel-1.7.3 / xf86-video-i810-1.7.3
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=7d67324fa3a5b5cf0227550316c366752fe4abfb
-
-Add some MergedFB checks for accelerator limitations
----
-
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -5468,6 +5468,16 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
- #endif
-       pI830->disableTiling = TRUE; /* no DRI - so disableTiling */
- 
-+   if (pScrn->displayWidth >= 4096) {
-+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot support > 1024x768 in leftof/rightof configurations. disabling DRI.\n");
-+      pI830->directRenderingDisabled = TRUE;
-+   }
-+
-+   if (pScrn->virtualY > 2048) {
-+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot support > 2048 vertical lines. disabling acceleration.\n");
-+      pI830->noAccel = TRUE;
-+   }
-+
-    pI830->displayWidth = pScrn->displayWidth;
- 
-    SetPipeAccess(pScrn);