packages (DEVEL): Mesa/Mesa.spec - git master version

arekm arekm at pld-linux.org
Fri May 11 10:10:17 CEST 2012


Author: arekm                        Date: Fri May 11 08:10:17 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- git master version

---- Files affected:
packages/Mesa:
   Mesa.spec (1.263.2.51 -> 1.263.2.52) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.263.2.51 packages/Mesa/Mesa.spec:1.263.2.52
--- packages/Mesa/Mesa.spec:1.263.2.51	Thu May 10 22:49:17 2012
+++ packages/Mesa/Mesa.spec	Fri May 11 10:10:12 2012
@@ -2,19 +2,20 @@
 #
 # TODO:
 # - consider:
-#   --enable-shared-glapi (for libGL; required if the same app uses GL and GLES)
 #   --enable-shared-dricore
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
-# - resurrect static if it's useful
+# - resurrect static if it's useful (using plain xorg target? DRI doesn't support static)
 #
 # Conditional build:
-%bcond_without	egl	# build egl
-%bcond_without	gallium	# don't build gallium
+%bcond_without	egl		# EGL libraries
+%bcond_without	gallium		# gallium drivers
 %bcond_with	gallium_intel	# gallium i915 driver (but doesn't work with AIGLX)
 %bcond_without	gallium_nouveau	# gallium nouveau driver
-%bcond_without	osmesa	# don't build osmesa
-%bcond_without	gbm	# with Graphics Buffer Manager
-%bcond_with	static_libs	# static libraries
+%bcond_without	osmesa		# OSMesa libraries
+%bcond_without	gbm		# Graphics Buffer Manager
+%bcond_without	wayland		# Wayland EGL
+%bcond_without	xa		# XA state tracker (for vmwgfx xorg driver)
+%bcond_with	static_libs	# static libraries [not supported for DRI, thus broken currently]
 #
 # minimal supported xserver version
 %define		xserver_ver	1.5.0
@@ -23,25 +24,28 @@
 # (until they start to be somehow versioned themselves)
 %define		glapi_ver	7.1.0
 #
-%define		libdrm_ver	2.4.30
+%define		libdrm_ver	2.4.34
 %define		dri2proto_ver	2.6
-%define		glproto_ver	1.4.11
+%define		glproto_ver	1.4.14
 #
-%define		snap		20120209
+%define		snap		20120510
 #
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	8.0
-Release:	2
+Version:	8.1.0
+Release:	0.%{snap}.1
 License:	MIT (core), SGI (GLU) and others - see license.html file
 Group:		X11/Libraries
 #Source0:	ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
 Source0:	%{name}Lib-%{snap}.tar.bz2
-# Source0-md5:	8c2f1afb5fcae32ebfd5e3153ed7111b
+# Source0-md5:	8c004dda883dcb4449cf8f33e0d768d0
+#Patch100:	%{name}-git.patch
 Patch0:		%{name}-realclean.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-wayland.patch
 URL:		http://www.mesa3d.org/
-BuildRequires:	autoconf >= 2.59
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	expat-devel
 BuildRequires:	gcc >= 5:3.3
@@ -50,7 +54,7 @@
 BuildRequires:	libstdc++-devel >= 5:3.3.0
 BuildRequires:	libtalloc-devel >= 2:2.0.1
 BuildRequires:	libtool >= 2:1.4d
-BuildRequires:	libvdpau-devel
+BuildRequires:	libvdpau-devel >= 0.4.1
 BuildRequires:	llvm-devel >= 2.9
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
@@ -60,18 +64,21 @@
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
+# wayland-{client,server}
+%{?with_wayland:BuildRequires:	wayland-devel}
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel >= 1.0.5
+BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xorg-lib-libXt-devel
-BuildRequires:	xorg-lib-libXvMC-devel
+BuildRequires:	xorg-lib-libXvMC-devel >= 1.0.6
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
 BuildRequires:	xorg-proto-glproto-devel >= %{glproto_ver}
 BuildRequires:	xorg-util-makedepend
-BuildRequires:	xorg-xserver-server-devel
+BuildRequires:	xorg-xserver-server-devel >= %{xserver_ver}
 %if %{with egl}
 BuildRequires:	libxcb-devel
-BuildRequires:	udev-devel >= 150
+BuildRequires:	udev-devel >= 1:150
 %endif
 %if %{with gallium}
 BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
@@ -81,14 +88,20 @@
 
 %if %{without gallium}
 %undefine	with_gallium_intel
+%undefine	with_gallium_nouveau
+%undefine	with_xa
 %endif
 
 %if %{without egl}
 %undefine	with_gbm
+%undefine	with_wayland
 %endif
 
 # _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
-%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libXvMCnouveau.so.1.* libXvMCr300.so.1.*  libXvMCr600.so.1.* libXvMCsoftpipe.so.1.* libvdpau_nouveau.so.1.*
+%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libXvMCnouveau.so.*
+
+# llvm build broken
+%define		filterout_ld    -Wl,--as-needed
 
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -110,13 +123,17 @@
 Summary(pl.UTF-8):	Implementacja Mesa biblioteki interfejsu EGL
 License:	MIT
 Group:		Libraries
+Requires:	%{name}-libglapi = %{version}-%{release}
 # glx driver in libEGL dlopens libGL.so
 Requires:	OpenGL >= 1.2
 Requires:	libdrm >= %{libdrm_ver}
 %if %{with gallium}
 # for egl_gallium.so
-Requires:	Mesa-libOpenVG = %{version}-%{release}
-Requires:	udev-libs >= 150
+Requires:	%{name}-libOpenVG = %{version}-%{release}
+Requires:	udev-libs >= 1:150
+%endif
+%if %{with gbm}
+Requires:	%{name}-libgbm = %{version}-%{release}
 %endif
 Provides:	EGL = 1.4
 
@@ -136,6 +153,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe implementacji Mesa biblioteki EGL
 License:	MIT
 Group:		Development/Libraries
+Requires:	%{name}-khrplatform-devel = %{version}-%{release}
 Requires:	%{name}-libEGL = %{version}-%{release}
 Requires:	libdrm-devel >= %{libdrm_ver}
 Requires:	xorg-lib-libX11-devel
@@ -172,6 +190,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja Mesa3D biblioteki libGL ze standardu OpenGL
 License:	MIT
 Group:		X11/Libraries
+Requires:	%{name}-libglapi = %{version}-%{release}
 Requires:	libdrm >= %{libdrm_ver}
 Provides:	OpenGL = 2.1
 Provides:	OpenGL-GLX = 1.4
@@ -252,8 +271,7 @@
 Summary:	Mesa implementation of GLES (OpenGL ES) libraries
 Summary(pl.UTF-8):	Implementacja Mesa bibliotek GLES (OpenGL ES)
 Group:		Libraries
-# only for libglapi.so.0
-Requires:	%{name}-libEGL = %{version}-%{release}
+Requires:	%{name}-libglapi = %{version}-%{release}
 
 %description libGLES
 This package contains shared libraries of Mesa implementation of GLES
@@ -274,7 +292,8 @@
 Summary:	Header files for Mesa GLES libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Mesa GLES
 Group:		Development/Libraries
-# EGL for libglapi.so, <KHR/khrplatform.h> always required, <EGL/egl.h> for <GLES/egl.h>
+Requires:	%{name}-khrplatform-devel = %{version}-%{release}
+# <EGL/egl.h> for <GLES/egl.h>
 Requires:	%{name}-libEGL-devel = %{version}-%{release}
 Requires:	%{name}-libGLES = %{version}-%{release}
 
@@ -339,7 +358,6 @@
 Summary(pl.UTF-8):	Biblioteka OSMesa (renderująca bitmapy w pamięci)
 License:	MIT
 Group:		Libraries
-# doesn't require base
 
 %description libOSMesa
 OSMesa (off-screen renderer) library.
@@ -383,7 +401,6 @@
 Summary(pl.UTF-8):	Implementacja Mesa API OpenVG (akceleracji grafiki wektorowej)
 License:	MIT
 Group:		Libraries
-# doesn't require base
 
 %description libOpenVG
 This package contains Mesa implementation of OpenVG - cross-platform
@@ -405,8 +422,7 @@
 Summary(pl.UTF-8):	Plik nagłówkowy biblioteki Mesa OpenVG
 License:	MIT
 Group:		Development/Libraries
-# EGL headers for <KHR/khrplatform.h>
-Requires:	%{name}-libEGL-devel = %{version}-%{release}
+Requires:	%{name}-khrplatform-devel = %{version}-%{release}
 Requires:	%{name}-libOpenVG = %{version}-%{release}
 
 %description libOpenVG-devel
@@ -415,18 +431,246 @@
 %description libOpenVG-devel -l pl.UTF-8
 Plik nagłówkowy biblioteki Mesa OpenVG.
 
-%package libXvMC
-Summary:	XvMC implementations
-Summary(pl.UTF-8):	Implementacje API XvMC
+%package libXvMC-nouveau
+Summary:	Mesa implementation of XvMC API for NVidia adapters
+Summary(pl.UTF-8):	Implementacja Mesa API XvMC dla kart NVidia
 License:	MIT
 Group:		Libraries
-# doesn't require base
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	xorg-lib-libXvMC >= 1.0.6
+Conflicts:	Mesa-libXvMC
+
+%description libXvMC-nouveau
+Mesa implementation of XvMC API for NVidia adapters (NV40-NV96, NVa0).
+
+%description libXvMC-nouveau -l pl.UTF-8
+Implementacja Mesa API XvMC dla kart NVidia (NV40-NV96, NVa0).
+
+%package libXvMC-r300
+Summary:	Mesa implementation of XvMC API for ATI Radeon R300 series adapters
+Summary(pl.UTF-8):	Implementacja Mesa API XvMC dla kart ATI Radeon z serii R300
+License:	MIT
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	xorg-lib-libXvMC >= 1.0.6
+Conflicts:	Mesa-libXvMC
+
+%description libXvMC-r300
+Mesa implementation of XvMC API for ATI Radeon adapters based on
+R300/R400/RS690/R500 chips.
+
+%description libXvMC-r300 -l pl.UTF-8
+Implementacja Mesa API XvMC dla kart ATI Radeon opartych na układach
+R300/R400/RS690/R500.
+
+%package libXvMC-r600
+Summary:	Mesa implementation of XvMC API for ATI Radeon R600 series adapters
+Summary(pl.UTF-8):	Implementacja Mesa API XvMC dla kart ATI Radeon z serii R600
+License:	MIT
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	xorg-lib-libXvMC >= 1.0.6
+Conflicts:	Mesa-libXvMC
+
+%description libXvMC-r600
+Mesa implementation of XvMC API for ATI Radeon adapters based on
+R600/R700 chips.
+
+%description libXvMC-r600 -l pl.UTF-8
+Implementacja Mesa API XvMC dla kart ATI Radeon opartych na układach
+R600/R700.
+
+%package libXvMC-softpipe
+Summary:	Mesa softpipe implementation of XvMC API
+Summary(pl.UTF-8):	Implementacja Mesa softpipe API XvMC
+License:	MIT
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	xorg-lib-libXvMC >= 1.0.6
+Conflicts:	Mesa-libXvMC
+
+%description libXvMC-softpipe
+Mesa softpipe implementation of XvMC API.
+
+%description libXvMC-softpipe -l pl.UTF-8
+Implementacja Mesa softpipe API XvMC.
+
+%package libgbm
+Summary:	Mesa Graphics Buffer Manager library
+Summary(pl.UTF-8):	Biblioteka Mesa Graphics Buffer Manager
+Group:		Libraries
+Requires:	udev-libs >= 1:150
+Conflicts:	Mesa-libEGL < 8.0.1-2
+
+%description libgbm
+Mesa Graphics Buffer Manager library.
+
+%description libgbm -l pl.UTF-8
+Biblioteka Mesa Graphics Buffer Manager (zarządcy bufora graficznego).
+
+%package libgbm-devel
+Summary:	Header file for Mesa Graphics Buffer Manager library
+Summary(pl.UTF-8):	Plik nagłówkowy biblioteki Mesa Graphics Buffer Manager
+Group:		Development/Libraries
+Requires:	%{name}-libgbm = %{version}-%{release}
+Requires:	udev-devel >= 1:150
+
+%description libgbm-devel
+Header file for Mesa Graphics Buffer Manager library.
+
+%description libgbm-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki Mesa Graphics Buffer Manager (zarządcy
+bufora graficznego).
+
+%package gbm-driver-i915
+Summary:	i915 driver for Mesa GBM framework
+Summary(pl.UTF-8):	Sterownik i915 dla szkieletu Mesa GBM
+Group:		Libraries
+Requires:	%{name}-libgbm = %{version}-%{release}
+
+%description gbm-driver-i915
+i915 driver for Mesa Graphics Buffer Manager. It supports Intel
+915/945/G33/Q33/Q35/Pineview chips.
+
+%description gbm-driver-i915 -l pl.UTF-8
+Sterownik i915 dla szkieletu Mesa Graphics Buffer Manager (zarządcy
+bufora graficznego). Obsługuje układy Intela z serii
+915/945/G33/Q33/Q35/Pineview.
+
+%package gbm-driver-nouveau
+Summary:	nouveau driver for Mesa GBM framework
+Summary(pl.UTF-8):	Sterownik nouveau dla szkieletu Mesa GBM
+Group:		Libraries
+Requires:	%{name}-libgbm = %{version}-%{release}
+
+%description gbm-driver-nouveau
+nouveau driver for Mesa Graphics Buffer Manager. It supports NVidia
+adapters.
+
+%description gbm-driver-nouveau -l pl.UTF-8
+Sterownik nouveau dla szkieletu Mesa Graphics Buffer Manager (zarządcy
+bufora graficznego). Obsługuje karty graficzne firmy NVidia.
+
+%package gbm-driver-r300
+Summary:	r300 driver for Mesa GBM framework
+Summary(pl.UTF-8):	Sterownik r300 dla szkieletu Mesa GBM
+Group:		Libraries
+Requires:	%{name}-libgbm = %{version}-%{release}
+
+%description gbm-driver-r300
+r300 driver for Mesa Graphics Buffer Manager. It supports ATI Radeon
+adapters based on R300/R400/RS690/R500 chips.
+
+%description gbm-driver-r300 -l pl.UTF-8
+Sterownik r300 dla szkieletu Mesa Graphics Buffer Manager (zarządcy
+bufora graficznego). Obsługuje karty graficzne ATI Radeon oparte na
+układach R300/R400/RS690/R500.
+
+%package gbm-driver-r600
+Summary:	r600 driver for Mesa GBM framework
+Summary(pl.UTF-8):	Sterownik r600 dla szkieletu Mesa GBM
+Group:		Libraries
+Requires:	%{name}-libgbm = %{version}-%{release}
+
+%description gbm-driver-r600
+r600 driver for Mesa Graphics Buffer Manager. It supports ATI Radeon
+adapters based on R600/R700 chips.
+
+%description gbm-driver-r600 -l pl.UTF-8
+Sterownik r600 dla szkieletu Mesa Graphics Buffer Manager (zarządcy
+bufora graficznego). Obsługuje karty graficzne ATI Radeon oparte na
+układach R600/R700.
+
+%package gbm-driver-vmwgfx
+Summary:	vmwgfx driver for Mesa GBM framework
+Summary(pl.UTF-8):	Sterownik vmwgfx dla szkieletu Mesa GBM
+Group:		Libraries
+Requires:	%{name}-libgbm = %{version}-%{release}
+
+%description gbm-driver-vmwgfx
+vmwgfx driver for Mesa Graphics Buffer Manager. It supports VMware
+virtual video adapter.
+
+%description gbm-driver-vmwgfx -l pl.UTF-8
+Sterownik vmwgfx dla szkieletu Mesa Graphics Buffer Manager (zarządcy
+bufora graficznego). Obsługuje wirtualną kartę graficzną VMware.
+
+%package libglapi
+Summary:	Mesa GL API shared library
+Summary(pl.UTF-8):	Biblioteka współdzielona Mesa GL API
+Group:		Libraries
+Conflicts:	Mesa-libEGL < 8.0.1-2
+
+%description libglapi
+Mesa GL API shared library, common for various APIs (EGL, GL, GLES).
+
+%description libglapi -l pl.UTF-8
+Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
+GL, GLES).
+
+%package libwayland-egl
+Summary:	Wayland EGL library
+Summary(pl.UTF-8):	Biblioteka Wayland EGL
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+
+%description libwayland-egl
+Wayland EGL platform library.
+
+%description libwayland-egl -l pl.UTF-8
+Biblioteka platformy EGL Wayland.
+
+%package libwayland-egl-devel
+Summary:	Development files for Wayland EGL library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki Wayland EGL
+Group:		Development/Libraries
+Requires:	%{name}-libwayland-egl = %{version}-%{release}
+Requires:	libdrm-devel >= %{libdrm_ver}
+Requires:	wayland-devel
+
+%description libwayland-egl-devel
+Development files for Wayland EGL platform library.
+
+%description libwayland-egl-devel -l pl.UTF-8
+Pliki programistyczne biblioteki platformy EGL Wayland.
+
+%package libxatracker
+Summary:	Xorg Gallium3D accelleration library
+Summary(pl.UTF-8):	Biblioteka akceleracji Gallium3D dla Xorg
+Group:		X11/Libraries
+Requires:	libdrm >= %{libdrm_ver}
+
+%description libxatracker
+Xorg Gallium3D accelleration library (used by new vmwgfx driver).
+
+%description libxatracker -l pl.UTF-8
+Biblioteka akceleracji Gallium3D dla Xorg (używana przez nowy
+sterownik vmwgfx).
+
+%package libxatracker-devel
+Summary:	Header files for Xorg Gallium3D accelleration library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg
+Group:		X11/Development/Libraries
+Requires:	%{name}-libxatracker = %{version}-%{release}
+Requires:	libdrm-devel >= %{libdrm_ver}
+
+%description libxatracker-devel
+Header files for Xorg Gallium3D accelleration library.
+
+%description libxatracker-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg.
+
+%package khrplatform-devel
+Summary:	Khronos platform header file
+Summary(pl.UTF-8):	Plik nagłówkowy platformy Khronos
+Group:		Development/Libraries
+Conflicts:	Mesa-libEGL-devel < 8.0.1-2
 
-%description libXvMC
-libXvMC implementations.
+%description khrplatform-devel
+Khronos platform header file.
 
-%description libXvMC -l pl.UTF-8
-Implementacje API libXvMC.
+%description khrplatform-devel -l pl.UTF-8
+Plik nagłówkowy platformy Khronos.
 
 %package dri-driver-ati-radeon-R100
 Summary:	X.org DRI driver for ATI R100 card family
@@ -471,10 +715,10 @@
 Obsoletes:	X11-driver-radeon-dri < 1:7.0.0
 
 %description dri-driver-ati-radeon-R300
-X.org DRI driver for ATI R300 card family.
+X.org DRI driver for ATI R300/R400/RS690/R500 card family.
 
 %description dri-driver-ati-radeon-R300 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI R300.
+Sterownik X.org DRI dla rodziny kart ATI R300/R400/RS690/R500.
 
 %package dri-driver-ati-radeon-R600
 Summary:	X.org DRI driver for ATI R600 card family
@@ -487,41 +731,10 @@
 Requires:	xorg-xserver-server >= %{xserver_ver}
 
 %description dri-driver-ati-radeon-R600
-X.org DRI driver for ATI R600 card family.
+X.org DRI driver for ATI R600/R700 card family.
 
 %description dri-driver-ati-radeon-R600 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI R600.
-
-%package dri-driver-ffb
-Summary:	X.org DRI driver for Sun FFB card family
-Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart Sun FFB
-License:	MIT
-Group:		X11/Libraries
-Requires:	xorg-driver-video-sunffb
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
-
-%description dri-driver-ffb
-X.org DRI driver for SUN Creator3D and Elite3D card family.
-
-%description dri-driver-ffb -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart SUN Creator3D i Elite3D.
-
-%package dri-driver-glint
-Summary:	X.org DRI driver for GLINT/Permedia card family
-Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart GLINT/Permedia
-License:	MIT
-Group:		X11/Libraries
-Requires:	xorg-driver-video-glint
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
-Obsoletes:	X11-driver-glint-dri < 1:7.0.0
-
-%description dri-driver-glint
-X.org DRI driver for GLINT/Permedia card family.
-
-%description dri-driver-glint -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart GLINT/Permedia.
+Sterownik X.org DRI dla rodziny kart ATI R600/R700.
 
 %package dri-driver-intel-i915
 Summary:	X.org DRI driver for Intel i915 card family
@@ -535,10 +748,12 @@
 Obsoletes:	X11-driver-i810-dri < 1:7.0.0
 
 %description dri-driver-intel-i915
-X.org DRI driver for Intel i915 card family.
+X.org DRI driver for Intel i915 card family (915, 945, G33, Q33, Q35,
+Pineview).
 
 %description dri-driver-intel-i915 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart Intel i915.
+Sterownik X.org DRI dla rodziny kart Intel i915 (915, 945, G33, Q33,
+Q35, Pineview).
 
 %package dri-driver-intel-i965
 Summary:	X.org DRI driver for Intel i965 card family
@@ -552,10 +767,12 @@
 Obsoletes:	X11-driver-i810-dri < 1:7.0.0
 
 %description dri-driver-intel-i965
-X.org DRI driver for Intel i965 card family.
+X.org DRI driver for Intel i965 card family (946GZ, 965G, 965Q, 965GM,
+965GME, GM45, G41, B43, Q45, G45);
 
 %description dri-driver-intel-i965 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart Intel i965.
+Sterownik X.org DRI dla rodziny kart Intel i965 (946GZ, 965G, 965Q,
+965GM, 965GME, GM45, G41, B43, Q45, G45).
 
 %package dri-driver-nouveau
 Summary:	X.org DRI driver for NVIDIA card family
@@ -591,6 +808,7 @@
 Summary(pl.UTF-8):	Sterownik X.org DRI dla VMware
 License:	MIT
 Group:		X11/Libraries
+Requires:	xorg-driver-video-vmware
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
 
@@ -600,28 +818,82 @@
 %description dri-driver-vmwgfx -l pl.UTF-8
 Sterownik X.org DRI dla VMware.
 
-%package -n libvdpau-driver-mesa
-Summary:	Mesa driver for the vdpau API
-Summary(pl.UTF-8):	Sterownik Mesa dla API vdpau
+%package -n libvdpau-driver-mesa-nouveau
+Summary:	Mesa nouveau driver for the vdpau API
+Summary(pl.UTF-8):	Sterownik Mesa nouveau dla API vdpau
 License:	MIT
 Group:		X11/Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libvdpau >= 0.4.1
+Conflicts:	libvdpau-driver-mesa
 
-%description -n libvdpau-driver-mesa
-Mesa driver for the vdpau API.
+%description -n libvdpau-driver-mesa-nouveau
+Mesa nouveau driver for the vdpau API. It supports NVidia adapters
+(NV40-NV96, NVa0).
+
+%description -n libvdpau-driver-mesa-nouveau -l pl.UTF-8
+Sterownik Mesa nouveau dla API vdpau. Obsługuje karty NVidia
+(NV40-NV96, NVa0).
+
+%package -n libvdpau-driver-mesa-r300
+Summary:	Mesa r300 driver for the vdpau API
+Summary(pl.UTF-8):	Sterownik Mesa r300 dla API vdpau
+License:	MIT
+Group:		X11/Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libvdpau >= 0.4.1
+Conflicts:	libvdpau-driver-mesa
 
-%description -n libvdpau-driver-mesa -l pl.UTF-8
-Sterownik Mesa dla API vdpau.
+%description -n libvdpau-driver-mesa-r300
+Mesa r300 driver for the vdpau API. It supports ATI Radeon adapters
+based on R300/R400/RS690/R500 chips.
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/packages/Mesa/Mesa.spec?r1=1.263.2.51&r2=1.263.2.52



More information about the pld-cvs-commit mailing list