ajax pushed to xorg-x11-drv-intel (f22). "Today's git snap"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Jun 3 19:50:19 UTC 2015


From caf1d74188533507deb1b2176a27cc90ab1821bd Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 3 Jun 2015 15:50:01 -0400
Subject: Today's git snap


diff --git a/.gitignore b/.gitignore
index 4955fc5..d501b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@ xf86-video-intel-2.10.0.tar.bz2
 /xf86-video-intel-20150211.tar.bz2
 /xf86-video-intel-20150520.tar.bz2
 /xf86-video-intel-20150526.tar.bz2
+/xf86-video-intel-20150603.tar.bz2
diff --git a/igt-stat.patch b/igt-stat.patch
new file mode 100644
index 0000000..1465f62
--- /dev/null
+++ b/igt-stat.patch
@@ -0,0 +1,11 @@
+diff -up intel-gpu-tools-1.9/tests/testdisplay_hotplug.c.jx intel-gpu-tools-1.9/tests/testdisplay_hotplug.c
+--- intel-gpu-tools-1.9/tests/testdisplay_hotplug.c.jx	2014-12-12 11:08:14.000000000 -0500
++++ intel-gpu-tools-1.9/tests/testdisplay_hotplug.c	2015-06-03 15:43:55.127775543 -0400
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/stat.h>
+ 
+ #include "testdisplay.h"
+ #ifdef HAVE_CONFIG_H
diff --git a/sources b/sources
index 31f461a..efbda7f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 1e768f2b1edc8613911b1d33bb361a7f  intel-gpu-tools-1.9.tar.bz2
-a8aec3b439b3e9ded9d78c8000cc8786  xf86-video-intel-20150520.tar.bz2
-787e1f310a39929464f405e8b33c31a0  xf86-video-intel-20150526.tar.bz2
+9b1121fb3e0f94a62c5ba2f79eb7837a  xf86-video-intel-20150603.tar.bz2
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 69c11f8..6d8a018 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -1,7 +1,7 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsver 1.9
-%define gitdate 20150526
+%define gitdate 20150603
 %define gitrev .%{gitdate}
 
 %undefine _hardened_build
@@ -28,7 +28,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.99.917
-Release:   10%{?gitrev}%{?dist}
+Release:   11%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -43,6 +43,7 @@ Source3:    http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%
 Source4:    make-git-snapshot.sh
 
 Patch0:	    intel-gcc-pr65873.patch
+Patch1:	    igt-stat.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -101,6 +102,10 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch0 -p1 -b .gcc
 
+pushd ../intel-gpu-tools-%{gputoolsver}
+%patch1 -p1 -b .stat
+popd
+
 %build
 autoreconf -f -i -v
 %configure %{?kmsonly:--enable-kms-only} --enable-tools
@@ -161,6 +166,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed Jun 03 2015 Adam Jackson <ajax at redhat.com> 2.99.917-11
+- Today's git snap
+
 * Tue May 26 2015 Dave Airlie <airlied at redhat.com> 2.99.917-10
 - update git snap
 - fixes uninitialised properties crash
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-intel.git/commit/?h=f22&id=caf1d74188533507deb1b2176a27cc90ab1821bd


More information about the scm-commits mailing list