rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore DRI1 for now

Browse Source
This commit is contained in:
Adam Jackson 2016-06-13 11:19:45 -04:00
parent e0b45619ef
commit b97fc3764a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xorg-x11-server.spec
View File

@ -45,7 +45,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.18.3 Version: 1.18.3
Release: 4%{?gitdate:.%{gitdate}}%{dist} Release: 5%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -77,8 +77,6 @@ Source31: xserver-sdk-abi-requires.git
# maintainer convenience script # maintainer convenience script
Source40: driver-abi-rebuild.sh Source40: driver-abi-rebuild.sh
Patch1000: 0001-dri-BC-hack-for-ati-and-openchrome.patch
# Trivial things to never merge upstream ever: # Trivial things to never merge upstream ever:
# This really could be done prettier. # This really could be done prettier.
Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5002: xserver-1.4.99-ssh-isnt-local.patch
@ -414,9 +412,9 @@ test `getminor extension` == %{extension_minor}
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins" %global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
%if %{with_hw_servers} %if %{with_hw_servers}
%global dri_flags --enable-dri2 %{?!rhel:--enable-dri3} --enable-suid-wrapper --enable-glamor %global dri_flags --enable-dri --enable-dri2 %{?!rhel:--enable-dri3} --enable-suid-wrapper --enable-glamor
%else %else
%global dri_flags --disable-dri2 %global dri_flags --disable-dri --disable-dri2
%endif %endif
%if 0%{?fedora} %if 0%{?fedora}
@ -454,7 +452,6 @@ autoreconf -f -v --install || exit 1
--enable-config-udev \ --enable-config-udev \
--disable-unit-tests \ --disable-unit-tests \
--enable-dmx \ --enable-dmx \
--disable-dri \
%{?wayland} \ %{?wayland} \
%{dri_flags} %{?bodhi_flags} \ %{dri_flags} %{?bodhi_flags} \
${CONFIGURE} ${CONFIGURE}
@ -643,6 +640,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%changelog %changelog
* Mon Jun 13 2016 Adam Jackson <ajax@redhat.com> - 1.18.3-5
- Restore DRI1 for now
* Mon May 09 2016 Adam Jackson <ajax@redhat.com> - 1.18.3-4 * Mon May 09 2016 Adam Jackson <ajax@redhat.com> - 1.18.3-4
- Move a symbol from DRI1 to DRI2 code to fix ati/openchrome - Move a symbol from DRI1 to DRI2 code to fix ati/openchrome