* Mon Dec 29 2008 Dave Airlie <airlied@redhat.com> 1.5.99.3-5

- remove unused build options - enable dri2
This commit is contained in:
Dave Airlie 2008-12-29 01:24:34 +00:00
parent 80eb898a60
commit a97fe3662c

View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.5.99.3 Version: 1.5.99.3
Release: 4%{?dist} Release: 5%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -92,7 +92,7 @@ Patch6005: xserver-1.5.99.3-ddx-rules.patch
%define enable_xorg --disable-xorg %define enable_xorg --disable-xorg
%endif %endif
%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-kdrive-vesa %define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx %define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx
BuildRequires: git-core BuildRequires: git-core
@ -297,19 +297,15 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
%configure --enable-maintainer-mode %{xservers} \ %configure --enable-maintainer-mode %{xservers} \
--disable-static \ --disable-static \
--with-pic \ --with-pic \
--disable-{a,c,m}fb \
--with-int10=x86emu \ --with-int10=x86emu \
--with-default-font-path=%{default_font_path} \ --with-default-font-path=%{default_font_path} \
--with-module-dir=%{moduledir} \ --with-module-dir=%{moduledir} \
--with-builderstring="Build ID: %{name} %{version}-%{release}" \ --with-builderstring="Build ID: %{name} %{version}-%{release}" \
--with-xkb-output=%{_localstatedir}/lib/xkb \ --with-xkb-output=%{_localstatedir}/lib/xkb \
--with-rgb-path=%{_datadir}/X11/rgb \ --disable-record \
--disable-xorgcfg \
--disable-record --disable-xtrap \
--enable-install-libxf86config \ --enable-install-libxf86config \
--enable-xselinux \ --enable-xselinux \
--with-dri-driver-path=%{drimoduledir} \ --with-dri-driver-path=%{drimoduledir} \
--disable-dri2 \
${CONFIGURE} ${CONFIGURE}
make %{?_smp_mflags} make %{?_smp_mflags}
@ -495,6 +491,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Dec 29 2008 Dave Airlie <airlied@redhat.com> 1.5.99.3-5
- remove unused build options - enable dri2
* Wed Dec 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-4 * Wed Dec 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-4
- xserver-1.5.99.3-ddx-rules.patch: enable the DDX to set the rules for the - xserver-1.5.99.3-ddx-rules.patch: enable the DDX to set the rules for the
core devices (#477712) core devices (#477712)