The package rpms/xorg-x11-drv-intel.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xorg-x11-drv-intel.git/commit/?id....
Change:
-%ifnarch %{ix86}
Thanks.
Full change:
============
commit 89b3f184f64e459544ac1f77eb58d41eec3bd94e
Author: Adam Jackson <ajax(a)redhat.com>
Date: Mon Jun 18 12:31:17 2018 -0400
Today's git snapshot (commit 3d395062)
Clean up some conditionals
Build with python3
diff --git a/.gitignore b/.gitignore
index 25a361b..f53a76e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@ xf86-video-intel-2.10.0.tar.bz2
/xf86-video-intel-20160712.tar.bz2
/xf86-video-intel-20160929.tar.bz2
/xf86-video-intel-20171025.tar.bz2
+/xf86-video-intel-20180530.tar.bz2
+/xf86-video-intel-20180618.tar.bz2
diff --git a/sources b/sources
index f8cde9b..4d75789 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (xf86-video-intel-20171025.tar.bz2) =
cc847dd958cfe84379923eed1ea174436ebe9e6d2bd7d44c4a1a3f13bc86c15ae14cc75223c9fe808beb52ca3013d83ff14e375bfaddffe7f8a5568bfa38559a
SHA512 (intel-gpu-tools-1.9.tar.bz2) =
642b18ef705f3c8853b89920287ae8da23af54cdf277665a1f4d348029e001d314e7a0f701ed12ffe7ed88626934e2b7b0a76e9aaf4e61367de3f3548e5162ea
+SHA512 (xf86-video-intel-20180618.tar.bz2) =
50d7f8ec10db8200700c2de804c21987c903b347615c004e9f5334c1f2b189fafdc049469e1491d651bbcd8df2968c1247d0f4d2a3dc6c7d885a40ad577a5101
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 52ccb9b..a5384d1 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -1,27 +1,15 @@
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
%define gputoolsver 1.9
-%define gitdate 20171025
+%define gitdate 20180618
%define gitrev .%{gitdate}
%undefine _hardened_build
-%if 0%{?rhel} >=7 || 0%{?fedora} > 17
-%define prime 1
-%endif
-
-%if 0%{?rhel} >=7 || 0%{?fedora} > 20
-%define kmsonly 1
-%else
-%ifnarch %{ix86}
-%define kmsonly 1
-%endif
-%endif
-
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.99.917
-Release: 36%{?gitrev}%{?dist}
+Release: 37%{?gitrev}%{?dist}
URL:
http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -29,14 +17,13 @@ Group: User Interface/X Hardware Support
%if 0%{?gitdate}
Source0: xf86-video-intel-%{gitdate}.tar.bz2
%else
-Source0:
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{...
+Source0:
https://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%...
%endif
Source1: make-intel-gpu-tools-snapshot.sh
-Source3:
http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gput...
+Source3:
https://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gpu...
Source4: make-git-snapshot.sh
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
Patch5: 0001-Fix-build-on-F28-and-later.patch
@@ -57,11 +44,7 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libXvMC-devel
-%if 0%{?fedora} > 24 || 0%{?rhel} > 7
BuildRequires: libXfont2-devel
-%else
-BuildRequires: libXfont-devel
-%endif
BuildRequires: mesa-libGL-devel >= 6.5-9
BuildRequires: libdrm-devel >= 2.4.25
BuildRequires: kernel-headers >= 2.6.32.3
@@ -69,7 +52,7 @@ BuildRequires: libudev-devel
BuildRequires: libxcb-devel >= 1.5
BuildRequires: xcb-util-devel
BuildRequires: cairo-devel
-BuildRequires: python2
+BuildRequires: python3
BuildRequires: libXScrnSaver-devel
BuildRequires: libXext-devel
BuildRequires: pixman-devel
@@ -110,24 +93,17 @@ Debugging tools for Intel graphics chips
%patch5 -p1
%patch6 -p1
-pushd ../intel-gpu-tools-%{gputoolsver}
-%patch1 -p1 -b .stat
-popd
-
%build
autoreconf -f -i -v
-%configure %{?kmsonly:--enable-kms-only} --with-default-dri=3 --enable-tools
+%configure --enable-kms-only --with-default-dri=3 --enable-tools
make %{?_smp_mflags} V=1
pushd ../intel-gpu-tools-%{gputoolsver}
-# this is missing from the tarbal, having it empty is ok
-touch lib/check-ndebug.h
-mkdir -p m4
-autoreconf -f -i -v
+%global _configure ./autogen.sh
# --disable-dumper: quick_dump is both not recommended for packaging yet,
# and requires python3 to build; i'd like to keep this spec valid for rhel6
# for at least a bit longer
-%configure %{!?prime:--disable-nouveau} --disable-dumper
+%configure --disable-dumper
# some of the sources are in utf-8 and pre-preprocessed by python
export LANG=en_US.UTF-8
make %{?_smp_mflags}
@@ -153,9 +129,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
%files
%doc COPYING
%{driverdir}/intel_drv.so
-%if !0%{?kmsonly}
-%{_libdir}/libI810XvMC.so.1*
-%endif
%{_libdir}/libIntelXvMC.so.1*
%{_libexecdir}/xf86-video-intel-backlight-helper
%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy
@@ -176,6 +149,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
%{_mandir}/man1/intel_*.1*
%changelog
+* Mon Jun 18 2018 Adam Jackson <ajax(a)redhat.com> - 2.99.917-37
+- Today's git snapshot (commit 3d395062)
+- Clean up some conditionals
+- Build with python3
+
+* Wed May 30 2018 Adam Jackson <ajax(a)redhat.com> - 2.99.917-37
+
* Mon Apr 02 2018 Adam Jackson <ajax(a)redhat.com> - 2.99.917-36.20171025
- Rebuild for xserver 1.20