|
|
@ -1,27 +1,16 @@ |
|
|
|
|
|
|
|
%global optflags -m64 -O2 |
|
|
|
%define moduledir %(pkg-config xorg-server --variable=moduledir ) |
|
|
|
%define moduledir %(pkg-config xorg-server --variable=moduledir ) |
|
|
|
%define driverdir %{moduledir}/drivers |
|
|
|
%define driverdir %{moduledir}/drivers |
|
|
|
%define gputoolsver 1.9 |
|
|
|
%define gputoolsver 1.9 |
|
|
|
%define gitdate 20180530 |
|
|
|
%define gitdate 20180618 |
|
|
|
%define gitrev .%{gitdate} |
|
|
|
%define gitrev .%{gitdate} |
|
|
|
|
|
|
|
|
|
|
|
%undefine _hardened_build |
|
|
|
%undefine _hardened_build |
|
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} == 7 |
|
|
|
|
|
|
|
%define rhel7 1 |
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel7} || 0%{?fedora} > 17 |
|
|
|
|
|
|
|
%define prime 1 |
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel7} || 0%{?fedora} > 20 |
|
|
|
|
|
|
|
%define kmsonly 1 |
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Summary: Xorg X11 Intel video driver |
|
|
|
Summary: Xorg X11 Intel video driver |
|
|
|
Name: xorg-x11-drv-intel |
|
|
|
Name: xorg-x11-drv-intel |
|
|
|
Version: 2.99.917 |
|
|
|
Version: 2.99.917 |
|
|
|
Release: 28%{?gitrev}%{?dist} |
|
|
|
Release: 37%{?gitrev}%{?dist} |
|
|
|
URL: http://www.x.org |
|
|
|
URL: http://www.x.org |
|
|
|
License: MIT |
|
|
|
License: MIT |
|
|
|
Group: User Interface/X Hardware Support |
|
|
|
Group: User Interface/X Hardware Support |
|
|
@ -29,16 +18,18 @@ Group: User Interface/X Hardware Support |
|
|
|
%if 0%{?gitdate} |
|
|
|
%if 0%{?gitdate} |
|
|
|
Source0: xf86-video-intel-%{gitdate}.tar.bz2 |
|
|
|
Source0: xf86-video-intel-%{gitdate}.tar.bz2 |
|
|
|
%else |
|
|
|
%else |
|
|
|
Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 |
|
|
|
Source0: https://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
Source1: make-intel-gpu-tools-snapshot.sh |
|
|
|
Source1: make-intel-gpu-tools-snapshot.sh |
|
|
|
Source3: http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gputoolsver}.tar.bz2 |
|
|
|
Source3: https://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gputoolsver}.tar.bz2 |
|
|
|
Source4: make-git-snapshot.sh |
|
|
|
Source4: make-git-snapshot.sh |
|
|
|
|
|
|
|
|
|
|
|
Patch0: intel-gcc-pr65873.patch |
|
|
|
Patch0: intel-gcc-pr65873.patch |
|
|
|
Patch1: igt-stat.patch |
|
|
|
Patch1: igt-stat.patch |
|
|
|
# https://bugs.freedesktop.org/show_bug.cgi?id=96255#c11 |
|
|
|
# https://bugs.freedesktop.org/show_bug.cgi?id=96255#c11 |
|
|
|
Patch4: 0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch |
|
|
|
Patch4: 0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch |
|
|
|
|
|
|
|
Patch5: 0001-Fix-build-on-F28-and-later.patch |
|
|
|
|
|
|
|
Patch6: 0001-Fix-build-on-i686.patch |
|
|
|
|
|
|
|
|
|
|
|
ExclusiveArch: %{ix86} x86_64 ia64 |
|
|
|
ExclusiveArch: %{ix86} x86_64 ia64 |
|
|
|
|
|
|
|
|
|
|
@ -55,12 +46,7 @@ BuildRequires: libXrandr-devel |
|
|
|
BuildRequires: libXrender-devel |
|
|
|
BuildRequires: libXrender-devel |
|
|
|
BuildRequires: libXtst-devel |
|
|
|
BuildRequires: libXtst-devel |
|
|
|
BuildRequires: libXvMC-devel |
|
|
|
BuildRequires: libXvMC-devel |
|
|
|
BuildRequires: libxshmfence-devel |
|
|
|
|
|
|
|
%if 0%{?fedora} > 24 || 0%{?rhel7} |
|
|
|
|
|
|
|
BuildRequires: libXfont2-devel |
|
|
|
BuildRequires: libXfont2-devel |
|
|
|
%else |
|
|
|
|
|
|
|
BuildRequires: libXfont-devel |
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
BuildRequires: mesa-libGL-devel >= 6.5-9 |
|
|
|
BuildRequires: mesa-libGL-devel >= 6.5-9 |
|
|
|
BuildRequires: libdrm-devel >= 2.4.25 |
|
|
|
BuildRequires: libdrm-devel >= 2.4.25 |
|
|
|
BuildRequires: kernel-headers >= 2.6.32.3 |
|
|
|
BuildRequires: kernel-headers >= 2.6.32.3 |
|
|
@ -68,7 +54,7 @@ BuildRequires: libudev-devel |
|
|
|
BuildRequires: libxcb-devel >= 1.5 |
|
|
|
BuildRequires: libxcb-devel >= 1.5 |
|
|
|
BuildRequires: xcb-util-devel |
|
|
|
BuildRequires: xcb-util-devel |
|
|
|
BuildRequires: cairo-devel |
|
|
|
BuildRequires: cairo-devel |
|
|
|
BuildRequires: python |
|
|
|
BuildRequires: python3 |
|
|
|
BuildRequires: libXScrnSaver-devel |
|
|
|
BuildRequires: libXScrnSaver-devel |
|
|
|
BuildRequires: libXext-devel |
|
|
|
BuildRequires: libXext-devel |
|
|
|
BuildRequires: pixman-devel |
|
|
|
BuildRequires: pixman-devel |
|
|
@ -106,6 +92,8 @@ Debugging tools for Intel graphics chips |
|
|
|
%setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3 |
|
|
|
%setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3 |
|
|
|
%patch0 -p1 -b .gcc |
|
|
|
%patch0 -p1 -b .gcc |
|
|
|
%patch4 -p1 |
|
|
|
%patch4 -p1 |
|
|
|
|
|
|
|
%patch5 -p1 |
|
|
|
|
|
|
|
%patch6 -p1 |
|
|
|
|
|
|
|
|
|
|
|
pushd ../intel-gpu-tools-%{gputoolsver} |
|
|
|
pushd ../intel-gpu-tools-%{gputoolsver} |
|
|
|
%patch1 -p1 -b .stat |
|
|
|
%patch1 -p1 -b .stat |
|
|
@ -113,19 +101,17 @@ popd |
|
|
|
|
|
|
|
|
|
|
|
%build |
|
|
|
%build |
|
|
|
autoreconf -f -i -v |
|
|
|
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 |
|
|
|
(cat config.log ; exit 1) |
|
|
|
|
|
|
|
make %{?_smp_mflags} V=1 |
|
|
|
make %{?_smp_mflags} V=1 |
|
|
|
|
|
|
|
|
|
|
|
pushd ../intel-gpu-tools-%{gputoolsver} |
|
|
|
pushd ../intel-gpu-tools-%{gputoolsver} |
|
|
|
# this is missing from the tarbal, having it empty is ok |
|
|
|
|
|
|
|
touch lib/check-ndebug.h |
|
|
|
touch lib/check-ndebug.h |
|
|
|
mkdir -p m4 |
|
|
|
mkdir -p m4 |
|
|
|
autoreconf -f -i -v |
|
|
|
autoreconf -f -i -v |
|
|
|
# --disable-dumper: quick_dump is both not recommended for packaging yet, |
|
|
|
# --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 |
|
|
|
# and requires python3 to build; i'd like to keep this spec valid for rhel6 |
|
|
|
# for at least a bit longer |
|
|
|
# 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 |
|
|
|
# some of the sources are in utf-8 and pre-preprocessed by python |
|
|
|
export LANG=en_US.UTF-8 |
|
|
|
export LANG=en_US.UTF-8 |
|
|
|
make %{?_smp_mflags} |
|
|
|
make %{?_smp_mflags} |
|
|
@ -150,11 +136,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so |
|
|
|
|
|
|
|
|
|
|
|
%files |
|
|
|
%files |
|
|
|
%doc COPYING |
|
|
|
%doc COPYING |
|
|
|
%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy |
|
|
|
|
|
|
|
%{driverdir}/intel_drv.so |
|
|
|
%{driverdir}/intel_drv.so |
|
|
|
%if !%{?kmsonly} |
|
|
|
|
|
|
|
%{_libdir}/libI810XvMC.so.1* |
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
%{_libdir}/libIntelXvMC.so.1* |
|
|
|
%{_libdir}/libIntelXvMC.so.1* |
|
|
|
%{_libexecdir}/xf86-video-intel-backlight-helper |
|
|
|
%{_libexecdir}/xf86-video-intel-backlight-helper |
|
|
|
%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy |
|
|
|
%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy |
|
|
@ -175,15 +157,44 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so |
|
|
|
%{_mandir}/man1/intel_*.1* |
|
|
|
%{_mandir}/man1/intel_*.1* |
|
|
|
|
|
|
|
|
|
|
|
%changelog |
|
|
|
%changelog |
|
|
|
* Wed May 30 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-28 |
|
|
|
* Mon Jun 18 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-37 |
|
|
|
- Today's git snapshot (commit 35947721) |
|
|
|
- Today's git snapshot (commit 3d395062) |
|
|
|
|
|
|
|
- Clean up some conditionals |
|
|
|
|
|
|
|
- Build with python3 |
|
|
|
|
|
|
|
|
|
|
|
* Wed May 30 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-27.20160929.1 |
|
|
|
* Wed May 30 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-37 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Apr 02 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-36.20171025 |
|
|
|
- Rebuild for xserver 1.20 |
|
|
|
- Rebuild for xserver 1.20 |
|
|
|
|
|
|
|
|
|
|
|
* Fri Jan 12 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-27 |
|
|
|
* Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.99.917-35.20171025 |
|
|
|
- Re-enable skylake support, as we're now defaulting to modesetting in the |
|
|
|
- Update Python 2 dependency declarations to new packaging standards |
|
|
|
server. |
|
|
|
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Mar 05 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-34 |
|
|
|
|
|
|
|
- Fix build on F28+ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.99.917-33.20171025 |
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Nov 06 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.99.917-32.20171025 |
|
|
|
|
|
|
|
- Cleanup spec file conditionals |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Oct 25 2017 Adam Jackson <ajax@redhat.com> - 2.99.917-31.20171025 |
|
|
|
|
|
|
|
- New git snapshot |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.99.917-30.20160929 |
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.99.917-29.20160929 |
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.99.917-28.20160929 |
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Jan 10 2017 Hans de Goede <hdegoede@redhat.com> - 2.99.917-27 |
|
|
|
|
|
|
|
- Drop the patch to fail probe on skylake and newer, the xserver now |
|
|
|
|
|
|
|
defaults to the modesetting driver for all recent GPUs |
|
|
|
|
|
|
|
|
|
|
|
* Thu Sep 29 2016 Hans de Goede <hdegoede@redhat.com> - 2.99.917-26 |
|
|
|
* Thu Sep 29 2016 Hans de Goede <hdegoede@redhat.com> - 2.99.917-26 |
|
|
|
- Update to latest git master for use with xserver-1.19 |
|
|
|
- Update to latest git master for use with xserver-1.19 |
|
|
|