xorg-x11-drv-intel-2.99.917-5.20180218

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11500 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xorg-x11-drv-intel/xorg-x11-drv-intel-vl.spec

@@ -1,12 +1,11 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gputoolsdate1 20130611
-%define gputoolsdate2 20110817
+
+%define gitdate 20180218
 
 %if "%{?_dist_release}" >= "vl7"
 %define accel sna
-#%define gputoolsdate 20130611
-%define gputoolsdate 1.14
+%define gputoolsdate 20180218
 %else
 %define accel sna
 %define gputoolsdate 20110817
@@ -17,25 +16,36 @@ Summary(ja):   Xorg X11 Intel ビデオドライバ
 Name:      xorg-x11-drv-intel
 Epoch:     1
 Version:   2.99.917
-Release:   4%{?_dist_release}
+Release:   5.%{gitdate}%{?_dist_release}
 URL:       http://intellinuxgraphics.org/
 License:   MIT
 Group:     User Interface/X Hardware Support
 
-Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
+#Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
+Source0:   xf86-video-intel-%{gitdate}.tar.bz2
 Source2:   intel.xinf
 Source3:   intel-gpu-tools-%{gputoolsdate}.tar.bz2
 
-# vine patch
-Patch0:    xf86-video-intel-2.99.917-git20171025.patch.xz
-Patch10:   0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
+Patch0:     intel-gcc-pr65873.patch
+Patch1:     igt-stat.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=96255#c11
+Patch4:     0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, automake, libtool
 BuildRequires: xorg-x11-server-sdk >= 1.7.99
 BuildRequires: libXvMC-devel
-BuildRequires: libXfont-devel
+BuildRequires: libXfont2-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXtst-devel
+BuildRequires: libXext-devel
+BuildRequires: libXrender-devel
+BuildRequires: pixman-devel
 BuildRequires: libGL-devel >= 7.10
 BuildRequires: libdrm-devel >= 2.4.25
 BuildRequires: kernel-headers >= 2.6.33
@@ -43,6 +53,12 @@ BuildRequires: eudev-libudev-devel
 BuildRequires: libxcb-devel >= 1.5
 BuildRequires: xcb-util-devel
 BuildRequires: cairo-devel
+BuildRequires: kmod-devel
+BuildRequires: procps-devel
+BuildRequires: libunwind-devel
+
+# for only autoreconf
+BuildRequires: gtk-doc
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg
@@ -79,9 +95,15 @@ Debugging tools for Intel graphics chips
 
 
 %prep
-%setup -q -n xf86-video-intel-%{version} -b3
-%patch0 -p1
-%patch10 -p1
+%setup -q -n xf86-video-intel-%{gitdate} -b3
+
+%patch0 -p1 -b .gcc
+%patch4 -p1
+
+pushd ../intel-gpu-tools-%{gputoolsdate}
+%patch1 -p1 -b .stat
+touch lib/check-ndebug.h
+popd
 
 %build
 autoreconf -vi
@@ -92,20 +114,25 @@ export CFLAGS="-I/usr/include/X11/dri"
 
 %configure \
   --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
+  --enable-tools \
   --enable-dri --enable-xvmc \
   --enable-sna --enable-uxa \
   --with-default-accel=%{accel} \
   --enable-xaa=no
-make
+
+make %{_smp_mflags} V=1
 
 pushd ../intel-gpu-tools-%{gputoolsdate}
-#autoreconf -v --install
+mkdir -p m4
+cp /usr/share/gtk-doc/data/gtk-doc.make ./
+autoreconf -f -i -v
 %configure \
 	--disable-nouveau \
 	--disable-dumper \
-	--disable-gtkdoc \
-	--without-libunwind
-make
+	--disable-gtkdoc
+
+export LANG=en_US.UTF-8
+make %{_smp_mflags} V=1
 popd
 
 
@@ -156,10 +183,13 @@ fi ||:
 %{_libdir}/intel_aubdump.so
 %{_libexecdir}/intel-gpu-tools/
 %{_datadir}/intel-gpu-tools/
-%{_mandir}/man1/intel_*.1*
+#{_mandir}/man1/intel_*.1*
 
 
 %changelog
+* Sun Feb 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.99.917-5.20180218
+- updated Source0 and Source3 to git HEAD(2018-02-18).
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.99.917-4
 - rebuild with xorg 1.19.6
 - update patch0 (based on fc28)