Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2422b62262f1d2eec72320fd865a6fb505d31ce7
commit 2422b62262f1d2eec72320fd865a6fb505d31ce7 Author: crazy <[email protected]> Date: Tue Oct 20 15:16:33 2015 +0200 xf86-video-intel-2.99.917-2-x86_64 * well kind version bump :) * use git code since old released code is broken diff --git a/source/x11/xf86-video-intel/FrugalBuild b/source/x11/xf86-video-intel/FrugalBuild index 1979ef4..9e1030d 100644 --- a/source/x11/xf86-video-intel/FrugalBuild +++ b/source/x11/xf86-video-intel/FrugalBuild @@ -5,20 +5,23 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=xf86-video-intel pkgver=2.99.917 -Fuse $USE_DEVEL && pkgver=2.7.99.1.55.g66ceedc -pkgrel=1 +Fuse $USE_DEVEL && pkgver=2.99.99.999.gef859c8 +pkgrel=2 pkgdesc="X.Org driver for Intel cards (opensource)" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') depends=('xorg-server>=1.17.1' 'libxvmc>=1.0.4-3' 'xcb-util') -makedepends=('util-macros>=1.2.1') -Finclude xorg +makedepends=('util-macros' 'randrproto' 'renderproto' 'inputproto' 'kbproto' \ + 'scrnsaverproto' 'resourceproto' 'xf86driproto' 'glproto' 'dri2proto' \ + 'dri3proto' 'presentproto' 'xineramaproto' 'libpthread-stubs') replaces=('xf86-video-i810') conflicts=('xf86-video-i810') provides=('xf86-video-i810') -source=(${source[@]} git-fixes.patch) -sha1sums=('9af9ded7a29026c211e5eb50a547e3e33976301d' \ - 'e289d6f1e9a573cb42b71229461dc1314ffc4b76') +Finclude xorg +## use tarball generated from git ef859c807a4bfad7c8a01a1d63f354f3ef310db5 +## since they didn't bumped ver in git distchek still generates 2.99.917 tarball +source=("ftp://ftp.frugalware.org/pub/other/sources/x11/${pkgname}-${pkgver}-git.tar.bz2";) +sha1sums=('2c78e19fb886bd7378d5e4774d66efe1c68fa41f') if Fuse $USE_DEVEL; then unset source sha1sums @@ -32,9 +35,7 @@ build() if Fuse $USE_DEVEL; then Funpack_scm fi - Fpatchall - Fmake --enable-xvmc --enable-glamor - Fmakeinstall + Fbuild --enable-xvmc } # optimization OK diff --git a/source/x11/xf86-video-intel/git-fixes.patch b/source/x11/xf86-video-intel/git-fixes.patch deleted file mode 100644 index 2accadf..0000000 --- a/source/x11/xf86-video-intel/git-fixes.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 127aae5a72a69df325fed0b63d345e81583d5ca1 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <[email protected]> -Date: Mon, 16 Feb 2015 21:37:35 +0000 -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 <[email protected]> - -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 -From db82617464e55432522e6199a88408ff0187f6ff Mon Sep 17 00:00:00 2001 -From: Chris Wilson <[email protected]> -Date: Wed, 4 Mar 2015 17:12:30 +0000 -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 <[email protected]> - -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 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
