[packages/xorg-driver-video-intel] - Updated to compile with xserver-1.8.0.

lmasko lmasko at pld-linux.org
Thu Nov 19 16:17:08 CET 2015


commit 60f048fe68eaeac90287c68e6bfe8b496390b2e7
Author: Łukasz Maśko <lmasko at pld-linux.org>
Date:   Thu Nov 19 16:16:19 2015 +0100

    - Updated to compile with xserver-1.8.0.

 xorg-driver-video-intel-xserver_1_8_0.patch | 32 +++++++++++++++++++++++++++++
 xorg-driver-video-intel.spec                |  2 ++
 2 files changed, 34 insertions(+)
---
diff --git a/xorg-driver-video-intel.spec b/xorg-driver-video-intel.spec
index 420b2b1..a633560 100644
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -20,6 +20,7 @@ Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
 # Source0-md5:	fa196a66e52c0c624fe5d350af7a5e7b
 URL:		http://xorg.freedesktop.org/
+Patch0:		%{name}-xserver_1_8_0.patch
 BuildRequires:	Mesa-libGL-devel
 #BuildRequires:	autoconf >= 2.63
 #BuildRequires:	automake >= 1:1.10.2-2
@@ -90,6 +91,7 @@ Wymaga aktywnego Kernel Mode Setting (KMS).
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
+%patch0 -p1
 
 %build
 %configure \
diff --git a/xorg-driver-video-intel-xserver_1_8_0.patch b/xorg-driver-video-intel-xserver_1_8_0.patch
new file mode 100644
index 0000000..1a8cc76
--- /dev/null
+++ b/xorg-driver-video-intel-xserver_1_8_0.patch
@@ -0,0 +1,32 @@
+diff --git a/src/compat-api.h b/src/compat-api.h
+index aa93bee..1ca4380 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap)
+ #endif
+ 
+ #endif
++
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,17,99,0,0)
++#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
++#endif
+--- xf86-video-intel-2.99.917/src/sna/sna_driver.c~	2014-12-11 14:52:11.000000000 +0100
++++ xf86-video-intel-2.99.917/src/sna/sna_driver.c	2015-11-19 14:43:22.857017010 +0100
+@@ -60,6 +60,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/fcntl.h>
+ #include <sys/poll.h>
++#include <sys/stat.h>
+ #include "i915_drm.h"
+ 
+ #ifdef HAVE_VALGRIND
+--- xf86-video-intel-2.99.917/src/uxa/intel_driver.c~	2015-11-19 16:08:20.073982082 +0100
++++ xf86-video-intel-2.99.917/src/uxa/intel_driver.c	2015-11-19 16:10:07.683783673 +0100
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-intel.git/commitdiff/60f048fe68eaeac90287c68e6bfe8b496390b2e7



More information about the pld-cvs-commit mailing list