[arch-commits] Commit in xf86-video-intel/trunk (6 files)

Jan de Groot jgc at archlinux.org
Wed May 14 15:30:56 EDT 2008


    Date: Wednesday, May 14, 2008 @ 15:30:52
  Author: jgc
Revision: 1703

upgpkg: xf86-video-intel 2.3.1-1
    Update to latest driver. Assume all patches have been merged upstream as most of them do not apply anymore

Modified:
  xf86-video-intel/trunk/PKGBUILD
Deleted:
  xf86-video-intel/trunk/01_fix_compiz_video.diff
  xf86-video-intel/trunk/03_dell_1535_quirk.diff
  xf86-video-intel/trunk/04_dell_1735_quirk.diff
  xf86-video-intel/trunk/08_945gm_quirk.diff
  xf86-video-intel/trunk/10_hw_overlay.diff

--------------------------+
 01_fix_compiz_video.diff |   34 ---------------
 03_dell_1535_quirk.diff  |   11 -----
 04_dell_1735_quirk.diff  |   11 -----
 08_945gm_quirk.diff      |   13 -----
 10_hw_overlay.diff       |   98 ---------------------------------------------
 PKGBUILD                 |   64 +++--------------------------
 6 files changed, 7 insertions(+), 224 deletions(-)

Deleted: 01_fix_compiz_video.diff
===================================================================
--- 01_fix_compiz_video.diff	2008-05-14 19:14:51 UTC (rev 1702)
+++ 01_fix_compiz_video.diff	2008-05-14 19:30:52 UTC (rev 1703)
@@ -1,34 +0,0 @@
-Index: xserver-xorg-video-intel-2.1.1/src/i810_video.c
-===================================================================
---- xserver-xorg-video-intel-2.1.1.orig/src/i810_video.c	2007-10-12 13:38:10.000000000 +0100
-+++ xserver-xorg-video-intel-2.1.1/src/i810_video.c	2007-10-12 13:38:39.000000000 +0100
-@@ -1087,7 +1087,7 @@
-     if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
- 	REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
- 	/* draw these */
--	xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
-+	xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
-     }
- 
-     I810DisplayVideo(pScrn, id, width, height, dstPitch, 
-@@ -1381,7 +1381,7 @@
- 		     surface->pitches[0], x1, y1, x2, y2, &dstBox,
- 		     src_w, src_h, drw_w, drw_h);
- 
--    xf86XVFillKeyHelper(pScrn->pScreen, pI810Priv->colorKey, clipBoxes);
-+    xf86XVFillKeyHelperDrawable(pScrn->pScreen, pI810Priv->colorKey, clipBoxes);
- 
-     pPriv->isOn = TRUE;
-     /* we've prempted the XvImage stream so set its free timer */
-Index: xserver-xorg-video-intel-2.1.1/src/i830_video.c
-===================================================================
---- xserver-xorg-video-intel-2.1.1.orig/src/i830_video.c	2007-10-12 13:38:10.000000000 +0100
-+++ xserver-xorg-video-intel-2.1.1/src/i830_video.c	2007-10-12 13:39:03.000000000 +0100
-@@ -2504,6 +2509,7 @@
- 	if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
- 	    REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
- 	    i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes);
-+	    xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
- 	}
-     } else if (IS_I965G(pI830)) {
- 	I965DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height,

Deleted: 03_dell_1535_quirk.diff
===================================================================
--- 03_dell_1535_quirk.diff	2008-05-14 19:14:51 UTC (rev 1702)
+++ 03_dell_1535_quirk.diff	2008-05-14 19:30:52 UTC (rev 1703)
@@ -1,11 +0,0 @@
---- xserver-xorg-video-intel-2.2.0+git20080107/src/i830_quirks.c.orig	2008-01-31 15:31:33.000000000 -0800
-+++ xserver-xorg-video-intel-2.2.0+git20080107/src/i830_quirks.c	2008-01-31 15:32:35.000000000 -0800
-@@ -68,6 +68,8 @@ static i830_quirk i830_quirk_list[] = {
-     { PCI_CHIP_I915_GM, 0x1028, 0x01a3, quirk_ignore_tv },
-     /* Dell XPS 1330 */
-     { PCI_CHIP_I965_GM, 0x1028, 0x0209, quirk_ignore_tv },
-+    /* Dell Inspiron 1535 */
-+    { PCI_CHIP_I965_GM, 0x1028, 0x0254, quirk_ignore_tv },
- 
-     /* Lenovo X60s has no TV output */
-     { PCI_CHIP_I945_GM, 0x17aa, 0x201a, quirk_ignore_tv },

Deleted: 04_dell_1735_quirk.diff
===================================================================
--- 04_dell_1735_quirk.diff	2008-05-14 19:14:51 UTC (rev 1702)
+++ 04_dell_1735_quirk.diff	2008-05-14 19:30:52 UTC (rev 1703)
@@ -1,11 +0,0 @@
---- xserver-xorg-video-intel-2.2.0.90-patched/src/i830_quirks.c.orig	2008-02-14 18:05:37.000000000 -0800
-+++ xserver-xorg-video-intel-2.2.0.90-patched/src/i830_quirks.c	2008-02-14 18:06:25.000000000 -0800
-@@ -78,6 +78,8 @@ static i830_quirk i830_quirk_list[] = {
-     { PCI_CHIP_I965_GM, 0x1028, 0x0209, quirk_ignore_tv },
-     /* Dell Inspiron 1535 */
-     { PCI_CHIP_I965_GM, 0x1028, 0x0254, quirk_ignore_tv },
-+    /* Dell Inspiron 1735 */
-+    { PCI_CHIP_I965_GM, 0x1028, 0x0256, quirk_ignore_tv },
- 
-     /* Lenovo X60s has no TV output */
-     { PCI_CHIP_I945_GM, 0x17aa, 0x201a, quirk_ignore_tv },

Deleted: 08_945gm_quirk.diff
===================================================================
--- 08_945gm_quirk.diff	2008-05-14 19:14:51 UTC (rev 1702)
+++ 08_945gm_quirk.diff	2008-05-14 19:30:52 UTC (rev 1703)
@@ -1,13 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.2.0.90-prepatch/src/i830_quirks.c xserver-xorg-video-intel-2.2.0.90-patched/src/i830_quirks.c
---- xserver-xorg-video-intel-2.2.0.90-prepatch/src/i830_quirks.c	2008-02-29 13:18:07.000000000 -0800
-+++ xserver-xorg-video-intel-2.2.0.90-patched/src/i830_quirks.c	2008-02-29 13:22:58.000000000 -0800
-@@ -104,6 +104,9 @@ static i830_quirk i830_quirk_list[] = {
-     /* Dell Inspiron 510m needs pipe A force quirk */
-     { PCI_CHIP_I855_GM, 0x1028, 0x0164, quirk_pipea_force },
- 
-+    /* Intel 945GM hardware (See LP: #152416) */
-+    { PCI_CHIP_I945_GM, 0x1584, 0x9900, quirk_ignore_tv },
-+
-     { 0, 0, 0, NULL },
- };
- 

Deleted: 10_hw_overlay.diff
===================================================================
--- 10_hw_overlay.diff	2008-05-14 19:14:51 UTC (rev 1702)
+++ 10_hw_overlay.diff	2008-05-14 19:30:52 UTC (rev 1703)
@@ -1,98 +0,0 @@
-From maximlevitsky at gmail.com  Fri Feb 29 09:12:56 2008
-From: maximlevitsky at gmail.com (Maxim Levitsky)
-Date: Fri, 29 Feb 2008 19:12:56 +0200
-Subject: [PATCH 1/2] Since G965 class hardware has overlay too, enable it
-In-Reply-To: <200802291911.08259.maximlevitsky at gmail.com>
-References: <200802241815.33057.maximlevitsky at gmail.com>
-	<8a7302370802290600w68c13aa8kb43ae82fe003342a at mail.gmail.com>
-	<200802291911.08259.maximlevitsky at gmail.com>
-Message-ID: <200802291912.56278.maximlevitsky at gmail.com>
-
-From 140320b85c634ad58701243fde3ff41cdcf1863d Mon Sep 17 00:00:00 2001
-From: Maxim Levitsky <maximlevitsky at gmail.com>
-Date: Sun, 24 Feb 2008 17:31:35 +0200
-Subject: [PATCH] Since G965 class hardware has overlay too, enable it
-
-*replace explicit checks for G965 for having no overlay since it has one,
- with general check for future chips that may have no overlay.
-
-*make overlay registers to be mapped correctly for G965
-*remove a check for register bit that isn't present on G965
-"(INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE)"
----
- src/common.h      |    5 ++++-
- src/i830_memory.c |    2 +-
- src/i830_video.c  |   10 ++++------
- 3 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/src/common.h b/src/common.h
-index c0af1ad..f7e47e7 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -440,7 +440,10 @@ extern int I810_DEBUG;
- 
- #define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810) || IS_I965GM(pI810) || IS_IGD_GM(pI810))
- /* mark chipsets for using gfx VM offset for overlay */
--#define OVERLAY_NOPHYSICAL(pI810) (IS_G33CLASS(pI810))
-+#define OVERLAY_NOPHYSICAL(pI810) (IS_G33CLASS(pI810) || IS_I965G(pI810))
-+#define HW_HAS_OVERLAY(pI810) (1)
-+
-+
- /* chipsets require graphics mem for hardware status page */
- #define HWS_NEED_GFX(pI810) (IS_G33CLASS(pI810) || IS_IGD_GM(pI810))
- 
-diff --git a/src/i830_memory.c b/src/i830_memory.c
-index 1861c64..2d8c40f 100644
---- a/src/i830_memory.c
-+++ b/src/i830_memory.c
-@@ -1044,7 +1044,7 @@ i830_allocate_overlay(ScrnInfoPtr pScrn)
-     if (!OVERLAY_NOPHYSICAL(pI830))
- 	flags |= NEED_PHYSICAL_ADDR;
- 
--    if (!IS_I965G(pI830)) {
-+    if (HW_HAS_OVERLAY(pI830)) {
- 	pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers",
- 						   OVERLAY_SIZE, GTT_PAGE_SIZE,
- 						   flags);
-diff --git a/src/i830_video.c b/src/i830_video.c
-index 79e0574..894f55a 100644
---- a/src/i830_video.c
-+++ b/src/i830_video.c
-@@ -352,7 +352,7 @@ i830_overlay_switch_to_crtc (ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
-     I830CrtcPrivatePtr  intel_crtc = crtc->driver_private;
-     int			pipeconf_reg = intel_crtc->pipe == 0 ? PIPEACONF : PIPEBCONF;
- 
--    if (INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE)
-+    if (!IS_I965G(pI830) && (INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE))
- 	pPriv->overlayOK = FALSE;
-     else
- 	pPriv->overlayOK = TRUE;
-@@ -580,7 +580,7 @@ I830InitVideo(ScreenPtr pScreen)
-     }
- 
-     /* Set up overlay video if we can do it at this depth. */
--    if (!IS_I965G(pI830) && pScrn->bitsPerPixel != 8 &&
-+    if (HW_HAS_OVERLAY(pI830) && pScrn->bitsPerPixel != 8 &&
- 	pI830->overlay_regs != NULL)
-     {
- 	overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
-@@ -2563,8 +2563,7 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
-     if (pI830->adaptor == NULL)
-         return;
- 
--    /* No overlay scaler on the 965. */
--    if (IS_I965G(pI830))
-+    if (!HW_HAS_OVERLAY(pI830))
-         return;
- 
-     pPriv = GET_PORT_PRIVATE(pScrn);
-@@ -2846,8 +2845,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on)
-     if (pI830->adaptor == NULL)
- 	return;
- 
--    /* No overlay scaler on the 965. */
--    if (IS_I965G(pI830))
-+    if (!HW_HAS_OVERLAY(pI830))
- 	return;
- 
-     pPriv = GET_PORT_PRIVATE(pScrn);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-05-14 19:14:51 UTC (rev 1702)
+++ PKGBUILD	2008-05-14 19:30:52 UTC (rev 1703)
@@ -1,72 +1,22 @@
 # $Id$
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xf86-video-intel
-pkgver=2.2.1
-pkgrel=4
-_mesaver=7.0.3
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="X.org Intel i810/i830/i915 video drivers"
 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' 'mesa>=7.0.3')
+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')
-conflicts=('xf86-video-i810')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
-	01_fix_compiz_video.diff
-	03_dell_1535_quirk.diff
-	04_dell_1735_quirk.diff
-	05_intel_exa_force_greedy.patch
-	08_945gm_quirk.diff
-	10_hw_overlay.diff)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 
 build() {
-  export CFLAGS="${CLFAGS} -fno-strict-aliasing"
-      
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/01_fix_compiz_video.diff || return 1
-  patch -Np1 -i ${startdir}/src/03_dell_1535_quirk.diff || return 1
-  patch -Np1 -i ${startdir}/src/04_dell_1735_quirk.diff || return 1
-  patch -Np1 -i ${startdir}/src/05_intel_exa_force_greedy.patch || return 1
-  patch -Np1 -i ${startdir}/src/08_945gm_quirk.diff || return 1
-  patch -Np1 -i ${startdir}/src/10_hw_overlay.diff || return 1
-
   ./configure --prefix=/usr \
-              --enable-dri
+              --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=('3334dc5142871b78fc609fd1b3dac3f2'
-         'e6e6379d7793af40a6bc3ce1bace572e'
-         '67c0e2e7d7d5666c584ef9e2c72e48db'
-         'c11277be9520840785fb8604d6cd2b57'
-         '4b231516fe9d04e1332c6c85d6a4672a'
-         '5f6a966d3ab4b1ae9009e9601e7ce9fa'
-         '9ac8addd03f4ddc7446d3e3b58b38314'
-         '50f8c51b82f4ed86e956b7b04775e15a')





More information about the arch-commits mailing list