[packages/Mesa] - build both classic-dri and gallium nouveau drivers - they support different hardware (classic no

[qboosh]

commit 5b103bd49c818b513a9d1c455d155660dd74569d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 10 18:44:07 2012 +0200

    - build both classic-dri and gallium nouveau drivers - they support different hardware
      (classic nouveau_vieux driver supports NV01/NV04/NV10/NV20, gallium nouveau driver supports NV30/NV40/NV50/NVc0)

 Mesa.spec | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/Mesa.spec b/Mesa.spec
index b7030ca..ee40ad2 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -7,8 +7,7 @@
 # Conditional build:
 %bcond_without	gallium		# gallium drivers
 %bcond_with	gallium_intel	# gallium i915 driver (instead of plain dri; doesn't work with AIGLX)
-%bcond_without	gallium_nouveau	# gallium nouveau driver (instead of plain dri)
-%bcond_without	dri_nouveau	# nouveau DRI driver (any kind)
+%bcond_without	gallium_nouveau	# gallium nouveau driver
 %bcond_without	egl		# EGL libraries
 %bcond_without	gbm		# Graphics Buffer Manager
 %bcond_without	wayland		# Wayland EGL
@@ -85,10 +84,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %undefine	with_xa
 %endif
 
-%if %{without dri_nouveau}
-%undefine	with_gallium_nouveau
-%endif
-
 %if %{without egl}
 %undefine	with_gbm
 %undefine	with_wayland
@@ -798,9 +793,7 @@ Summary:	X.org DRI driver for NVIDIA card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart NVIDIA
 License:	MIT
 Group:		X11/Libraries
-%if %{without gallium_nouveau}
 Requires:	%{name}-dri-core = %{version}-%{release}
-%endif
 Requires:	xorg-driver-video-nouveau
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
@@ -939,9 +932,7 @@ dri_drivers="r200 radeon \
 i915 \
 %endif
 i965
-%if %{with dri_nouveau} && %{without gallium_nouveau}
 nouveau
-%endif
 %ifarch sparc sparcv9 sparc64
 ffb \
 %endif
@@ -1315,9 +1306,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/i965_dri.so
 
-%if %{with dri_nouveau}
 %files dri-driver-nouveau
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_vieux_dri.so
+%if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/5b103bd49c818b513a9d1c455d155660dd74569d