Merge branch 'MESA_12_0'

diff --cc Mesa.spec
index fdee15374a1df40ee291107705d4c79d8b2ad113,777da548afbc955d87d1d3b0298c638415726da6..80471eabeeabf57ad2c99d8aaf32f0fd2b54c013
--- 1/Mesa.spec
--- 2/Mesa.spec
+++ b/Mesa.spec
@@@ -523,15 -521,57 +522,57 @@@ R600/R700
  
  %package -n libva-driver-gallium
  Summary:      VA driver for Gallium State Tracker
- Summary(pl.UTF-8):    Sterownik VA do Gallium
+ Summary(pl.UTF-8):    Sterowniki VA do Gallium
  Group:                Libraries
- Requires:     libva >= 1.6.0
+ %if %{with gallium_radeon}
+ Requires:     libva-driver-r600
+ Requires:     libva-driver-radeonsi
+ %endif
+ %if %{with gallium_nouveau}
+ Requires:     libva-driver-nouveau
+ %endif
  
  %description -n libva-driver-gallium
- VA driver for Gallium State Tracker.
+ VA drivers for Gallium State Tracker (r600, radeonsi & nouveau).
  
  %description -n libva-driver-gallium -l pl.UTF-8
- Sterownik VA do Gallium.
+ Sterowniki VA do Gallium (r600, radeonsi & nouveau).
+ 
+ %package -n libva-driver-r600
+ Summary:      VA driver for ATI Radeon R600 series adapters
+ Summary(pl.UTF-8):    Sterownik VA dla kart ATI Radeon z serii R600
+ Group:                Libraries
 -Requires:     libva >= 1.3.0
++Requires:     libva >= 1.6.0
+ 
+ %description -n libva-driver-r600
+ VA driver for ATI Radeon R600 series adapters.
+ 
+ %description -n libva-driver-r600 -l pl.UTF-8
+ Sterownik VA dla kart ATI Radeon z serii R600.
+ 
+ %package -n libva-driver-radeonsi
+ Summary:      VA driver for ATI Radeon SI adapters
+ Summary(pl.UTF-8):    Sterownik VA dla kart ATI Radeon SI
+ Group:                Libraries
 -Requires:     libva >= 1.3.0
++Requires:     libva >= 1.6.0
+ 
+ %description -n libva-driver-radeonsi
+ VA driver for ATI Radeon adapters based on Southern Islands chips.
+ 
+ %description -n libva-driver-radeonsi -l pl.UTF-8
+ Sterownik VA dla kart ATI Radeon opartych na układach Southern Islands.
+ 
+ %package -n libva-driver-nouveau
+ Summary:      VA driver for NVidia adapters
+ Summary(pl.UTF-8):    Sterownik VA dla kart NVidia
+ Group:                Libraries
 -Requires:     libva >= 1.3.0
++Requires:     libva >= 1.6.0
+ 
+ %description -n libva-driver-nouveau
+ VA driver for NVidia adapters.
+ 
+ %description -n libva-driver-nouveau -l pl.UTF-8
+ Sterownik VA dla kart NVidia.
  
  %package libgbm
  Summary:      Mesa Graphics Buffer Manager library