[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Thursday, June 18, 2015 @ 18:04:22
Author: heftig
Revision: 241013
2.99.917+364+gb24e758
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD| 35 --
git-fixes.patch | 282 --
2 files changed, 22 insertions(+), 295 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-18 15:19:39 UTC (rev 241012)
+++ PKGBUILD2015-06-18 16:04:22 UTC (rev 241013)
@@ -3,8 +3,9 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=xf86-video-intel
-pkgver=2.99.917.20150616
-pkgrel=2
+pkgver=2.99.917+364+gb24e758
+pkgrel=1
+epoch=1
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
@@ -13,9 +14,9 @@
depends=('mesa-dri' 'libxvmc' 'pixman' 'xcb-util=0.3.9')
makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'libx11'
'libxrender'
# additional deps for intel-virtual-output
-'libxrandr' 'libxinerama' 'libxcursor' 'libxtst'
+ 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst'
# additional for git snapshot
-'git')
+ 'git')
optdepends=('libxrandr: for intel-virtual-output'
'libxinerama: for intel-virtual-output'
'libxcursor: for intel-virtual-output'
@@ -25,25 +26,33 @@
conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19'
'X-ABI-VIDEODRV_VERSION=20'
'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810'
'xf86-video-intel-legacy')
groups=('xorg-drivers' 'xorg')
-#source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-#git-fixes.patch)
-source=(${pkgname}-${pkgver}::git+http://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel.git#commit=f1f2e7202854c725293c63293de1552337c717b2)
-sha256sums=(SKIP)
+#source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+source=('git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#commit=b24e758')
+sha256sums=('SKIP')
+pkgver() {
+ cd $pkgname
+ git describe --long | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ NOCONFIGURE=1 ./autogen.sh
+}
+
build() {
- cd ${pkgname}-${pkgver}
- #./configure --prefix=/usr --libexecdir=/usr/lib
- ./autogen.sh --prefix=/usr --libexecdir=/usr/lib
+ cd $pkgname
+ ./configure --prefix=/usr --libexecdir=/usr/lib
make
}
check() {
- cd ${pkgname}-${pkgver}
+ cd $pkgname
make check
}
package() {
- cd ${pkgname}-${pkgver}
+ cd $pkgname
make DESTDIR=${pkgdir} install
Deleted: git-fixes.patch
===
--- git-fixes.patch 2015-06-18 15:19:39 UTC (rev 241012)
+++ git-fixes.patch 2015-06-18 16:04:22 UTC (rev 241013)
@@ -1,282 +0,0 @@
-From 127aae5a72a69df325fed0b63d345e81583d5ca1 Mon Sep 17 00:00:00 2001
-From: Chris Wilson ch...@chris-wilson.co.uk
-Date: Mon, 16 Feb 2015 21:37:35 +
-Subject: tools/intel-virtual-output: Check for DRI3 more carefully
-
-Using xcb, we cannot simply call xcb_dri3_query_version() without it
-terminating the connection if DRI3 is not enabled on the target display.
-Oops.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89172
-Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
-
-diff --git a/tools/virtual.c b/tools/virtual.c
-index 8e2b4a2..3bcd057 100644
a/tools/virtual.c
-+++ b/tools/virtual.c
-@@ -218,6 +218,13 @@ static inline XRRScreenResources
*_XRRGetScreenResourcesCurrent(Display *dpy, Wi
- static int _x_error_occurred;
-
- static int
-+_io_error_handler(Display *display)
-+{
-+ fprintf(stderr, XIO error on display %s\n, DisplayString(display));
-+ abort();
-+}
-+
-+static int
- _check_error_handler(Display *display,
-XErrorEvent *event)
- {
-@@ -320,6 +327,7 @@ can_use_shm(Display *dpy,
- #include X11/Xlib-xcb.h
- #include X11/xshmfence.h
- #include xcb/xcb.h
-+#include xcb/xcbext.h
- #include xcb/dri3.h
- #include xcb/sync.h
- static Pixmap dri3_create_pixmap(Display *dpy,
-@@ -357,6 +365,7 @@ static int dri3_query_version(Display *dpy, int *major,
int *minor)
- {
- xcb_connection_t *c = XGetXCBConnection(dpy);
- xcb_dri3_query_version_reply_t *reply;
-+ xcb_generic_error_t *error;
-
- *major = *minor = -1;
-
-@@ -364,7 +373,8 @@ static int dri3_query_version(Display *dpy, int *major,
int *minor)
-xcb_dri3_query_version(c,
-
XCB_DRI3_MAJOR_VERSION,
-
XCB_DRI3_MINOR_VERSION),
-- NULL);
-+ error);
-+ free(error);
- if (reply == NULL)
- return -1;
-
-@@ -377,8 +387,14 @@ static int dri3_query_version(Display *dpy, int *major,
int
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Monday, June 15, 2015 @ 21:06:21
Author: lcarlier
Revision: 240929
upgpkg: xf86-video-intel 2.99.917-6
fix FS#45310
Modified:
xf86-video-intel/trunk/PKGBUILD
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD|6 +--
git-fixes.patch | 107 ++
2 files changed, 110 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-15 16:07:08 UTC (rev 240928)
+++ PKGBUILD2015-06-15 19:06:21 UTC (rev 240929)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.917
-pkgrel=5
+pkgrel=6
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
@@ -26,11 +26,11 @@
source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.patch)
sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9'
-'3b38b844fbc8088401ebbbafbbf1399d87f077caa5020cbd822487b7d26514e0')
+'d75fe9df074f1dfaa00a804854a2f8c10af9819b1dcf32ee47e330925e041923')
prepare() {
cd ${pkgname}-${pkgver}
- # fix FS#43840, FS#43906
+ # fix FS#43840, FS#43906, FS#45310
patch -Np1 -i ../git-fixes.patch
}
Modified: git-fixes.patch
===
--- git-fixes.patch 2015-06-15 16:07:08 UTC (rev 240928)
+++ git-fixes.patch 2015-06-15 19:06:21 UTC (rev 240929)
@@ -172,4 +172,111 @@
--
2.3.5
+From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Tue, 24 Feb 2015 15:25:40 +
+Subject: sna: udev integration depends on fstat and sys/stat.h
+src/sna/sna_driver.c: In function 'sna_handle_uevents':
+src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat'
[-Werror=implicit-function-declaration]
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 8c0d0b5..bc20ef0 100644
+--- a/src/sna/sna_driver.c
b/src/sna/sna_driver.c
+@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
+ }
+
+ #if HAVE_UDEV
++#include sys/stat.h
++
+ static void
+ sna_handle_uevents(int fd, void *closure)
+ {
+--
+cgit v0.10.2
+From 369ceec0e4910ba2c37736a59c55c0d6c26433bf Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Tue, 24 Feb 2015 15:25:40 +
+Subject: uxa: udev integration depends on fstat and sys/stat.h
+
+src/uxa/intel_driver.c: In function 'I830HandleUEvents':
+src/uxa/intel_driver.c:738:14: error: storage size of 's' isn't known
+src/uxa/intel_driver.c:746:2: error: implicit declaration of function 'fstat'
[-Werror=implicit-function-declaration]
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
+index c554124..6e64b8c 100644
+--- a/src/uxa/intel_driver.c
b/src/uxa/intel_driver.c
+@@ -728,6 +728,8 @@ intel_flush_callback(CallbackListPtr *list,
+ }
+
+ #if HAVE_UDEV
++#include sys/stat.h
++
+ static void
+ I830HandleUEvents(int fd, void *closure)
+ {
+--
+cgit v0.10.2
+From c43617b739e358064396912c7a7a8028ca91d201 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= ville.syrj...@linux.intel.com
+Date: Thu, 16 Apr 2015 20:40:39 +0300
+Subject: gen8: Fix the YUV-RGB shader
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the correct register (Yn_01) with first half of the
+Y samples instead of using the register (Yn_23) with the
+second half twice when computing the green channel.
+
+Also use the Yn_01 register name instead of Yn for the red
+channel as well, just for a bit of extra consistency.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89807
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+Tested-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/render_program/exa_wm_yuv_rgb.g8a
b/src/render_program/exa_wm_yuv_rgb.g8a
+index 7def093..34973ba 100644
+--- a/src/render_program/exa_wm_yuv_rgb.g8a
b/src/render_program/exa_wm_yuv_rgb.g8a
+@@ -76,7 +76,7 @@ add (16)Cbn1F Cb8,8,1F -0.501961F {
compr align1 };
+ /*
+ * R = Y + Cr * 1.596
+ */
+-mov (8)acc01F Yn8,8,1F { compr align1 };
++mov (8)acc01F Yn_018,8,1F { compr align1 };
+ mac.sat(8) src_sample_r_011FCrn_018,8,1F 1.596F { compr
align1 };
+
+ mov (8)acc01F Yn_238,8,1F { compr align1 };
+@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_231F Crn_238,8,1F 1.596F
{ compr align1 };
+ /*
+ * G = Crn * -0.813 + Cbn * -0.392 + Y
+ */
+-mov (8)acc01F Yn_238,8,1F { compr align1 };
++mov (8)acc01F Yn_018,8,1F { compr align1 };
+ mac (8)acc01F Crn_018,8,1F -0.813F
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Tuesday, April 14, 2015 @ 14:04:37
Author: lcarlier
Revision: 236531
upgpkg: xf86-video-intel 2.99.917-5
fix FS#43534
Modified:
xf86-video-intel/trunk/PKGBUILD
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD|4 ++--
git-fixes.patch | 47 +++
2 files changed, 49 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-14 11:30:10 UTC (rev 236530)
+++ PKGBUILD2015-04-14 12:04:37 UTC (rev 236531)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.917
-pkgrel=4
+pkgrel=5
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
@@ -26,7 +26,7 @@
source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.patch)
sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9'
-'9216b69b7e01b6910b4758c4e346d84a43198ee516f6b239bf43c4e172a9c922')
+'3b38b844fbc8088401ebbbafbbf1399d87f077caa5020cbd822487b7d26514e0')
prepare() {
cd ${pkgname}-${pkgver}
Modified: git-fixes.patch
===
--- git-fixes.patch 2015-04-14 11:30:10 UTC (rev 236530)
+++ git-fixes.patch 2015-04-14 12:04:37 UTC (rev 236531)
@@ -125,4 +125,51 @@
if (sna-flags SNA_IS_HOSTED)
--
cgit v0.10.2
+From 9c109f3dc56621215e580e74a6161f00035bdac3 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Sun, 12 Apr 2015 21:15:54 +0100
+Subject: [PATCH] sna: Mark the GPU as available before doing the mode restore
+ on VT enter
+Sometimes we want to render with the GPU when doing a mode switch, e.g.
+if we need to initialise an output surface. To do so, we need to prepare
+the acceleration layer first.
+
+Lots of thanks to Vasily for tracking this one down.
+
+Reported-by: Vasily Khoruzhick anars...@gmail.com
+Bugzilla: https://bugs.archlinux.org/task/43534
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+ src/sna/sna_driver.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 31500e7..488ca9b 100644
+--- a/src/sna/sna_driver.c
b/src/sna/sna_driver.c
+@@ -1213,6 +1213,8 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
+ if (intel_get_master(sna-dev))
+ return FALSE;
+
++ sna_accel_enter(sna);
++
+ if (sna-flags SNA_REPROBE) {
+ DBG((%s: reporting deferred hotplug event\n, __FUNCTION__));
+ sna_mode_discover(sna);
+@@ -1221,11 +1223,11 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
+ sna_mode_check(sna);
+
+ if (!sna_set_desired_mode(sna)) {
++ sna_accel_leave(sna);
+ intel_put_master(sna-dev);
+ return FALSE;
+ }
+
+- sna_accel_enter(sna);
+ return TRUE;
+ }
+
+--
+2.3.5
+
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Wednesday, March 4, 2015 @ 18:38:25
Author: lcarlier
Revision: 232856
upgpkg: xf86-video-intel 2.99.917-4
fix FS#43906
Modified:
xf86-video-intel/trunk/PKGBUILD
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD|6 +++---
git-fixes.patch | 46 ++
2 files changed, 49 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-04 17:33:09 UTC (rev 232855)
+++ PKGBUILD2015-03-04 17:38:25 UTC (rev 232856)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.917
-pkgrel=3
+pkgrel=4
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
@@ -26,11 +26,11 @@
source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.patch)
sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9'
-'201f60bc75d61dd95ae7bc166ef2cb153fe693471b42952e6d61cc0780a51e2e')
+'9216b69b7e01b6910b4758c4e346d84a43198ee516f6b239bf43c4e172a9c922')
prepare() {
cd ${pkgname}-${pkgver}
- # fix FS#43840
+ # fix FS#43840, FS#43906
patch -Np1 -i ../git-fixes.patch
}
Modified: git-fixes.patch
===
--- git-fixes.patch 2015-03-04 17:33:09 UTC (rev 232855)
+++ git-fixes.patch 2015-03-04 17:38:25 UTC (rev 232856)
@@ -79,4 +79,50 @@
if (ret) {
--
cgit v0.10.2
+From db82617464e55432522e6199a88408ff0187f6ff Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed, 4 Mar 2015 17:12:30 +
+Subject: sna: Decouple RandR pointers early in CloseScreen
+RR resources are freed before CloseScreen (as they are a ServerClient
+resource), but on entering our CloseScreen callbacks we are left with a
+set of stale pointers. Decouple those before proceeding so that we are
+not tempted to dereference them.
+
+Bugzilla: https://bugs.archlinux.org/task/43906
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 88db508..fd6c46c 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -6292,9 +6292,26 @@ sna_mode_enable(struct sna *sna)
+ sna-mode.dirty = false;
+ }
+
++static void sna_randr_close(struct sna *sna)
++{
++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna-scrn);
++ int n;
++
++ /* The RR structs are freed early during CloseScreen as they
++ * are tracked as Resources. However, we may be tempted to
++ * access them during shutdown so decouple them now.
++ */
++for (n = 0; n config-num_output; n++)
++config-output[n]-randr_output = NULL;
++
++for (n = 0; n config-num_crtc; n++)
++config-crtc[n]-randr_crtc = NULL;
++}
++
+ void
+ sna_mode_close(struct sna *sna)
+ {
++ sna_randr_close(sna);
+ sna_mode_wakeup(sna);
+
+ if (sna-flags SNA_IS_HOSTED)
+--
+cgit v0.10.2
+
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Monday, February 16, 2015 @ 23:00:07
Author: lcarlier
Revision: 231625
upgpkg: xf86-video-intel 2.99.917-3
fix FS#43840
Added:
xf86-video-intel/trunk/git-fixes.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 14 +++--
git-fixes.patch | 82 ++
2 files changed, 93 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-16 20:53:57 UTC (rev 231624)
+++ PKGBUILD2015-02-16 22:00:07 UTC (rev 231625)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.917
-pkgrel=2
+pkgrel=3
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
@@ -23,9 +23,17 @@
conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19'
'X-ABI-VIDEODRV_VERSION=20'
'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810'
'xf86-video-intel-legacy')
groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9'
+'201f60bc75d61dd95ae7bc166ef2cb153fe693471b42952e6d61cc0780a51e2e')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix FS#43840
+ patch -Np1 -i ../git-fixes.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr --libexecdir=/usr/lib
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2015-02-16 22:00:07 UTC (rev 231625)
@@ -0,0 +1,82 @@
+From 127aae5a72a69df325fed0b63d345e81583d5ca1 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Mon, 16 Feb 2015 21:37:35 +
+Subject: tools/intel-virtual-output: Check for DRI3 more carefully
+
+Using xcb, we cannot simply call xcb_dri3_query_version() without it
+terminating the connection if DRI3 is not enabled on the target display.
+Oops.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89172
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/tools/virtual.c b/tools/virtual.c
+index 8e2b4a2..3bcd057 100644
+--- a/tools/virtual.c
b/tools/virtual.c
+@@ -218,6 +218,13 @@ static inline XRRScreenResources
*_XRRGetScreenResourcesCurrent(Display *dpy, Wi
+ static int _x_error_occurred;
+
+ static int
++_io_error_handler(Display *display)
++{
++ fprintf(stderr, XIO error on display %s\n, DisplayString(display));
++ abort();
++}
++
++static int
+ _check_error_handler(Display *display,
+XErrorEvent *event)
+ {
+@@ -320,6 +327,7 @@ can_use_shm(Display *dpy,
+ #include X11/Xlib-xcb.h
+ #include X11/xshmfence.h
+ #include xcb/xcb.h
++#include xcb/xcbext.h
+ #include xcb/dri3.h
+ #include xcb/sync.h
+ static Pixmap dri3_create_pixmap(Display *dpy,
+@@ -357,6 +365,7 @@ static int dri3_query_version(Display *dpy, int *major,
int *minor)
+ {
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ xcb_dri3_query_version_reply_t *reply;
++ xcb_generic_error_t *error;
+
+ *major = *minor = -1;
+
+@@ -364,7 +373,8 @@ static int dri3_query_version(Display *dpy, int *major,
int *minor)
+xcb_dri3_query_version(c,
+
XCB_DRI3_MAJOR_VERSION,
+
XCB_DRI3_MINOR_VERSION),
+- NULL);
++ error);
++ free(error);
+ if (reply == NULL)
+ return -1;
+
+@@ -377,8 +387,14 @@ static int dri3_query_version(Display *dpy, int *major,
int *minor)
+
+ static int dri3_exists(Display *dpy)
+ {
++ xcb_extension_t dri3 = { DRI3, 0 };
++ const xcb_query_extension_reply_t *ext;
+ int major, minor;
+
++ ext = xcb_get_extension_data(XGetXCBConnection(dpy), dri3);
++ if (ext == NULL || !ext-present)
++ return 0;
++
+ if (dri3_query_version(dpy, major, minor) 0)
+ return 0;
+
+@@ -3228,6 +3244,7 @@ int main(int argc, char **argv)
+ return -ret;
+
+ XSetErrorHandler(_check_error_handler);
++ XSetIOErrorHandler(_io_error_handler);
+
+ ret = add_fd(ctx, display_open(ctx, src_name));
+ if (ret) {
+--
+cgit v0.10.2
+
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Wednesday, August 10, 2011 @ 04:35:25
Author: jgc
Revision: 135088
upgpkg: xf86-video-intel 2.16.0-1
Update to 2.16.0, do not disable SNA for now, as it is experimental and needs
patches for xorg-server that are not accepted upstream yet
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD| 16
git-fixes.patch | 1050 --
2 files changed, 6 insertions(+), 1060 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-10 07:37:14 UTC (rev 135087)
+++ PKGBUILD2011-08-10 08:35:25 UTC (rev 135088)
@@ -2,27 +2,23 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=xf86-video-intel
-pkgver=2.15.0
-pkgrel=2
+pkgver=2.16.0
+pkgrel=1
pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'glproto'
'mesa' 'libxvmc' 'xcb-util')
-conflicts=('xorg-server1.10.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
+makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto'
'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
+conflicts=('xorg-server1.10.99.902' 'xf86-video-i810'
'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git-fixes.patch)
-sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62'
- 'd7a9102e58c1d6c1bcb99ff6836146bd54a18161')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/git-fixes.patch
- autoreconf
./configure --prefix=/usr --enable-dri
make
}
Deleted: git-fixes.patch
===
--- git-fixes.patch 2011-08-10 07:37:14 UTC (rev 135087)
+++ git-fixes.patch 2011-08-10 08:35:25 UTC (rev 135088)
@@ -1,1050 +0,0 @@
-diff --git a/NEWS b/NEWS
-index ea92bcf..61866b0 100644
a/NEWS
-+++ b/NEWS
-@@ -2,9 +2,9 @@ Release 2.15.0 (2011-04-14)
- ==
- We are pleased to announce this major release of the xf86-video-intel
- driver, roughly on schedule at 3 months since 2.14.0. With the many bug
--fixes in this release, we encourage everyone to upgrade to 2.14.
-+fixes in this release, we encourage everyone to upgrade to 2.15.
-
--The priority for this quarter has been simply to unexciting and stabilise
-+The priority for this quarter has been simply to be unexciting and stabilise
- the driver further, seeking to capitalise upon the improvements elsewhere
- in the stack.
-
-diff --git a/configure.ac b/configure.ac
-index fd5a3cf..9449e56 100644
a/configure.ac
-+++ b/configure.ac
-@@ -77,9 +77,7 @@ AC_ARG_WITH(xorg-module-dir,
- [moduledir=$libdir/xorg/modules])
-
- AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-- [Disable DRI support [[default=auto]]]),
-- [DRI=$enableval],
-- [DRI=auto])
-+ [Disable DRI support [[default=auto]]]))
-
- AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
- [Disable XvMC support [[default=yes]]]),
-@@ -106,40 +104,48 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- # Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server = 1.6 xproto fontsproto
$REQUIRED_MODULES])
- PKG_CHECK_MODULES(DRM, [libdrm = 2.4.23])
-+PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess = 0.10])
-
- sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-
--save_CFLAGS=$CFLAGS
--CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
--AC_CHECK_FILE([${sdkdir}/dri.h],
-- [have_dri_h=yes], [have_dri_h=no])
--AC_CHECK_FILE([${sdkdir}/sarea.h],
-- [have_sarea_h=yes], [have_sarea_h=no])
--AC_CHECK_FILE([${sdkdir}/dristruct.h],
-- [have_dristruct_h=yes], [have_dristruct_h=no])
-+if test x$enable_dri != xno; then
-+save_CFLAGS=$CFLAGS
-+save_CPPFLAGS=$CPPFLAGS
-+CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
-+CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
-+AC_CHECK_HEADERS([dri.h sarea.h dristruct.h],, [DRI=no],
-+[/* for dri.h */
-+ #include xf86str.h
-+ /* for dristruct.h */
-+ #include xorg-server.h
-+ #ifdef HAVE_DRI_H
-+
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Monday, May 30, 2011 @ 08:49:55
Author: jgc
Revision: 125851
upgpkg: xf86-video-intel 2.15.0-2
Import latest fixes from git
Added:
xf86-video-intel/trunk/git-fixes.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 11
git-fixes.patch | 1050 ++
2 files changed, 1058 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 12:26:19 UTC (rev 125850)
+++ PKGBUILD2011-05-30 12:49:55 UTC (rev 125851)
@@ -3,7 +3,7 @@
pkgname=xf86-video-intel
pkgver=2.15.0
-pkgrel=1
+pkgrel=2
pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
@@ -13,11 +13,16 @@
conflicts=('xorg-server1.10.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62'
+ 'd7a9102e58c1d6c1bcb99ff6836146bd54a18161')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+
+ autoreconf
./configure --prefix=/usr --enable-dri
make
}
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-05-30 12:49:55 UTC (rev 125851)
@@ -0,0 +1,1050 @@
+diff --git a/NEWS b/NEWS
+index ea92bcf..61866b0 100644
+--- a/NEWS
b/NEWS
+@@ -2,9 +2,9 @@ Release 2.15.0 (2011-04-14)
+ ==
+ We are pleased to announce this major release of the xf86-video-intel
+ driver, roughly on schedule at 3 months since 2.14.0. With the many bug
+-fixes in this release, we encourage everyone to upgrade to 2.14.
++fixes in this release, we encourage everyone to upgrade to 2.15.
+
+-The priority for this quarter has been simply to unexciting and stabilise
++The priority for this quarter has been simply to be unexciting and stabilise
+ the driver further, seeking to capitalise upon the improvements elsewhere
+ in the stack.
+
+diff --git a/configure.ac b/configure.ac
+index fd5a3cf..9449e56 100644
+--- a/configure.ac
b/configure.ac
+@@ -77,9 +77,7 @@ AC_ARG_WITH(xorg-module-dir,
+ [moduledir=$libdir/xorg/modules])
+
+ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
+- [Disable DRI support [[default=auto]]]),
+- [DRI=$enableval],
+- [DRI=auto])
++ [Disable DRI support [[default=auto]]]))
+
+ AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
+ [Disable XvMC support [[default=yes]]]),
+@@ -106,40 +104,48 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server = 1.6 xproto fontsproto
$REQUIRED_MODULES])
+ PKG_CHECK_MODULES(DRM, [libdrm = 2.4.23])
++PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess = 0.10])
+
+ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
+
+-save_CFLAGS=$CFLAGS
+-CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
+-CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
+-AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI != xno; then
+-AC_CHECK_FILE([${sdkdir}/dri.h],
+- [have_dri_h=yes], [have_dri_h=no])
+-AC_CHECK_FILE([${sdkdir}/sarea.h],
+- [have_sarea_h=yes], [have_sarea_h=no])
+-AC_CHECK_FILE([${sdkdir}/dristruct.h],
+- [have_dristruct_h=yes], [have_dristruct_h=no])
++if test x$enable_dri != xno; then
++save_CFLAGS=$CFLAGS
++save_CPPFLAGS=$CPPFLAGS
++CFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
++CPPFLAGS=$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS
++AC_CHECK_HEADERS([dri.h sarea.h dristruct.h],, [DRI=no],
++[/* for dri.h */
++ #include xf86str.h
++ /* for dristruct.h */
++ #include xorg-server.h
++ #ifdef HAVE_DRI_H
++ # include dri.h
++ #endif
++ #ifdef HAVE_SAREA_H
++ # include sarea.h
++ #endif
++])
++CFLAGS=$save_CFLAGS $DEBUGFLAGS
++CPPFLAGS=$save_CPPFLAGS
++else
++DRI=no
+ fi
++
+ AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI = xauto; then
+-if test $have_dri_h = yes -a \
+-$have_sarea_h = yes -a \
+-$have_dristruct_h = yes; then
+-DRI=yes
+-else
+-DRI=no
+-fi
+-fi
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Monday, April 11, 2011 @ 08:45:51
Author: jgc
Revision: 119231
upgpkg: xf86-video-intel 2.14.903-1
Update to 2.14.903
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD|4
git-fixes.patch | 1209 --
2 files changed, 2 insertions(+), 1211 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-11 12:12:20 UTC (rev 119230)
+++ PKGBUILD2011-04-11 12:45:51 UTC (rev 119231)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=xf86-video-intel
-pkgver=2.14.902
+pkgver=2.14.903
pkgrel=1
pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
arch=(i686 x86_64)
@@ -14,7 +14,7 @@
options=('!libtool')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('552d6d1be754c974d140763232a2c17361d9a625')
+sha1sums=('2c2e0f714fbfa1f3aabcfd3fd667f892996680c8')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
Deleted: git-fixes.patch
===
--- git-fixes.patch 2011-04-11 12:12:20 UTC (rev 119230)
+++ git-fixes.patch 2011-04-11 12:45:51 UTC (rev 119231)
@@ -1,1209 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index f4239de..83948ab 100644
a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,7 @@
- # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
- SUBDIRS = uxa src man
- MAINTAINERCLEANFILES = ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index 529a294..5a1baac 100644
a/configure.ac
-+++ b/configure.ac
-@@ -21,18 +21,24 @@
- # Process this file with autoconf to produce a configure script
-
- # Initialize Autoconf
--AC_PREREQ([2.60])
-+AC_PREREQ([2.63])
- AC_INIT([xf86-video-intel],
- [2.14.0],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- [xf86-video-intel])
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
--AC_CONFIG_AUX_DIR(.)
-+AC_CONFIG_AUX_DIR([build-aux])
-+AC_CONFIG_MACRO_DIR([m4])
-
- # Initialize Automake
--AM_INIT_AUTOMAKE([foreign dist-bzip2])
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
-+AM_MAINTAINER_MODE([enable])
-+
-+# Support silent build rules, requires at least automake-1.11. Disable
-+# by either passing --disable-silent-rules to configure or passing V=1
-+# to make
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by
XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
-@@ -50,8 +56,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT],
- depending on your distribution, try package 'xserver-xorg-dev' or
'xorg-x11-server-devel'])])
-
- # Initialize libtool
--AC_DISABLE_STATIC
--AC_PROG_LIBTOOL
-+LT_PREREQ([2.2])
-+LT_INIT([disable-static])
-
- PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm = 1.1], [gen4asm=yes],
[gen4asm=no])
- AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
-@@ -85,6 +91,12 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
- [KMS_ONLY=$enableval],
- [KMS_ONLY=no])
-
-+AC_ARG_ENABLE(debug,
-+AS_HELP_STRING([--enable-debug],
-+ [Enables internal debugging [[default=yes]]]),
-+ [DEBUG=$enableval],
-+ [DEBUG=yes])
-+
- # Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-@@ -138,15 +150,19 @@ fi
- AC_MSG_CHECKING([whether to include XvMC support])
- AC_MSG_RESULT([$XVMC])
- AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
--if test $XVMC = yes; then
-+if test x$XVMC = xyes; then
- AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
- fi
-
- AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes)
--if test $KMS_ONLY = yes; then
-+if test x$KMS_ONLY = xyes; then
- AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
- fi
-
-+if test x$DEBUG = xno; then
-+ AC_DEFINE(NDEBUG,1,[Disable internal debugging])
-+fi
-+
- DRIVER_NAME=intel
- AC_SUBST([DRIVER_NAME])
- AC_SUBST([moduledir])
-diff --git a/src/i915_render.c b/src/i915_render.c
-index 6d844e5..d04e8e1 100644
a/src/i915_render.c
-+++ b/src/i915_render.c
-@@ -302,12 +302,10 @@ static Bool i915_texture_setup(PicturePtr picture,
PixmapPtr pixmap, int unit)
- ScrnInfoPtr scrn = xf86Screens[picture-pDrawable-pScreen-myNum];
- intel_screen_private *intel = intel_get_screen_private(scrn);
- uint32_t format, pitch, filter;
-- int w, h, i;
- uint32_t wrap_mode, tiling_bits;
-+ int i;
-
- pitch = intel_pixmap_pitch(pixmap);
-- w = picture-pDrawable-width;
-- h = picture-pDrawable-height;
-
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Thursday, February 17, 2011 @ 09:29:12
Author: jgc
Revision: 110194
Update to latest git snapshot. No new features, just bugfixes and cleanup
Added:
xf86-video-intel/trunk/git-fixes.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 11
git-fixes.patch | 1209 ++
2 files changed, 1217 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 14:28:04 UTC (rev 110193)
+++ PKGBUILD2011-02-17 14:29:12 UTC (rev 110194)
@@ -3,7 +3,7 @@
pkgname=xf86-video-intel
pkgver=2.14.0
-pkgrel=1
+pkgrel=2
pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
@@ -13,11 +13,16 @@
conflicts=('xorg-server1.9.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('05f187582aeabda57fcd6f2782cfbf8e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('103193a01b9c29d6f71a620ad99c6e1495276e68'
+ '62dc94bd6a45432bdaed85bb0187d7087b88fe29')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ libtoolize --force
+ autoreconf --force --install
./configure --prefix=/usr --enable-dri
make
make DESTDIR=${pkgdir} install
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-02-17 14:29:12 UTC (rev 110194)
@@ -0,0 +1,1209 @@
+diff --git a/Makefile.am b/Makefile.am
+index f4239de..83948ab 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -18,6 +18,7 @@
+ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+ SUBDIRS = uxa src man
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+diff --git a/configure.ac b/configure.ac
+index 529a294..5a1baac 100644
+--- a/configure.ac
b/configure.ac
+@@ -21,18 +21,24 @@
+ # Process this file with autoconf to produce a configure script
+
+ # Initialize Autoconf
+-AC_PREREQ([2.60])
++AC_PREREQ([2.63])
+ AC_INIT([xf86-video-intel],
+ [2.14.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xf86-video-intel])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+-AC_CONFIG_AUX_DIR(.)
++AC_CONFIG_AUX_DIR([build-aux])
++AC_CONFIG_MACRO_DIR([m4])
+
+ # Initialize Automake
+-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
++AM_MAINTAINER_MODE([enable])
++
++# Support silent build rules, requires at least automake-1.11. Disable
++# by either passing --disable-silent-rules to configure or passing V=1
++# to make
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by
XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+@@ -50,8 +56,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT],
+ depending on your distribution, try package 'xserver-xorg-dev' or
'xorg-x11-server-devel'])])
+
+ # Initialize libtool
+-AC_DISABLE_STATIC
+-AC_PROG_LIBTOOL
++LT_PREREQ([2.2])
++LT_INIT([disable-static])
+
+ PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm = 1.1], [gen4asm=yes],
[gen4asm=no])
+ AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+@@ -85,6 +91,12 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
+ [KMS_ONLY=$enableval],
+ [KMS_ONLY=no])
+
++AC_ARG_ENABLE(debug,
++AS_HELP_STRING([--enable-debug],
++ [Enables internal debugging [[default=yes]]]),
++ [DEBUG=$enableval],
++ [DEBUG=yes])
++
+ # Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+@@ -138,15 +150,19 @@ fi
+ AC_MSG_CHECKING([whether to include XvMC support])
+ AC_MSG_RESULT([$XVMC])
+ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+-if test $XVMC = yes; then
++if test x$XVMC = xyes; then
+ AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
+ fi
+
+ AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes)
+-if test $KMS_ONLY = yes; then
++if test x$KMS_ONLY = xyes; then
+ AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
+ fi
+
++if test x$DEBUG = xno; then
++ AC_DEFINE(NDEBUG,1,[Disable internal debugging])
++fi
++
+ DRIVER_NAME=intel
+ AC_SUBST([DRIVER_NAME])
+ AC_SUBST([moduledir])
+diff --git a/src/i915_render.c b/src/i915_render.c
+index 6d844e5..d04e8e1 100644
+--- a/src/i915_render.c
b/src/i915_render.c
+@@ -302,12 +302,10 @@ static Bool i915_texture_setup(PicturePtr picture,
PixmapPtr pixmap, int unit)
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Monday, October 18, 2010 @ 08:47:22
Author: jgc
Revision: 95275
upgpkg: xf86-video-intel 2.13.0-4
Another update. Fixes unresolved symbols in case shadowfb is enabled. Update to
last git snapshot
Modified:
xf86-video-intel/trunk/PKGBUILD
xf86-video-intel/trunk/git-fixes.patch
-+
PKGBUILD|5 +++--
git-fixes.patch | 17 +
2 files changed, 20 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-10-18 09:21:01 UTC (rev 95274)
+++ PKGBUILD2010-10-18 12:47:22 UTC (rev 95275)
@@ -3,7 +3,7 @@
pkgname=xf86-video-intel
pkgver=2.13.0
-pkgrel=3
+pkgrel=4
pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
@@ -17,13 +17,14 @@
git-fixes.patch
8xx-enable-shadow.patch)
md5sums=('de2f8a5836d90c71f3175dcd46d03ec0'
- '4527d56758d7ef07d7dddb9442c9a98f'
+ '2be4bf1558b996ad361ed30ce0633e7a'
'baecc481d73e6fe31dbf6c28b649c5d6')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/git-fixes.patch
patch -Np0 -i ${srcdir}/8xx-enable-shadow.patch
+ autoreconf --install
./configure --prefix=/usr --enable-dri
make
make DESTDIR=${pkgdir} install
Modified: git-fixes.patch
===
--- git-fixes.patch 2010-10-18 09:21:01 UTC (rev 95274)
+++ git-fixes.patch 2010-10-18 12:47:22 UTC (rev 95275)
@@ -356,6 +356,23 @@
static int once;
/* The GPU has hung and unlikely to recover by this
point. */
+diff --git a/src/intel_display.c b/src/intel_display.c
+index 74ce736..d32224e 100644
+--- a/src/intel_display.c
b/src/intel_display.c
+@@ -1161,7 +1161,11 @@ intel_output_set_property(xf86OutputPtr output, Atom
property,
+ }
+ }
+
+- return FALSE;
++ /* We didn't recognise this property, just report success in order
++ * to allow the set to continue, otherwise we break setting of
++ * common properties like EDID.
++ */
++ return TRUE;
+ }
+
+ static Bool
diff --git a/src/intel_dri.c b/src/intel_dri.c
index 9804272..67f7be9 100644
--- a/src/intel_dri.c
