Disable DRI1

This commit is contained in:
Adam Jackson 2011-11-17 20:52:07 -05:00
parent e09a7afc41
commit c9ff459b38

View File

@ -52,7 +52,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.11.99.1 Version: 1.11.99.1
Release: 5%{?gitdate:.%{gitdate}}%{dist} Release: 6%{?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
@ -356,9 +356,9 @@ test `getminor extension` == %{extension_minor}
%define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins" %define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
%if %{with_hw_servers} %if %{with_hw_servers}
%define dri_flags --with-dri-driver-path=%{drimoduledir} %define dri_flags --disable-dri --enable-dri2 --with-dri-driver-path=%{drimoduledir}
%else %else
%define dri_flags --disable-dri %define dri_flags --disable-dri --disable-dri2
%endif %endif
%if 0%{?fedora} %if 0%{?fedora}
@ -367,7 +367,7 @@ test `getminor extension` == %{extension_minor}
# --with-pie ? # --with-pie ?
autoreconf -v --install || exit 1 autoreconf -v --install || exit 1
export CFLAGS="${RPM_OPT_FLAGS} -fno-omit-frame-pointer" # export CFLAGS="${RPM_OPT_FLAGS}"
%configure --enable-maintainer-mode %{xservers} \ %configure --enable-maintainer-mode %{xservers} \
--disable-static \ --disable-static \
--with-pic \ --with-pic \
@ -492,7 +492,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions %dir %{_libdir}/xorg/modules/extensions
%{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libglx.so
%{_libdir}/xorg/modules/extensions/libdri.so
%{_libdir}/xorg/modules/extensions/libdri2.so %{_libdir}/xorg/modules/extensions/libdri2.so
%{_libdir}/xorg/modules/extensions/libdbe.so %{_libdir}/xorg/modules/extensions/libdbe.so
%{_libdir}/xorg/modules/extensions/libextmod.so %{_libdir}/xorg/modules/extensions/libextmod.so
@ -578,6 +577,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Thu Nov 17 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-6
- Disable DRI1
* Wed Nov 16 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-5 * Wed Nov 16 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-5
- Obsolete some dead input drivers. - Obsolete some dead input drivers.