[packages/Mesa: 10/10] Merge branch 'MESA_12_0'

[jajcus]

commit 59b29c4c5ada1c94d1b433a9bef1d90987230f44
Merge: 0e8d684 a888e99
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Fri Jul 8 22:50:18 2016 +0200

    Merge branch 'MESA_12_0'

 Mesa.spec          | 126 +++++++++++++++++++++++++++++++++++++++++++++++------
 missing-type.patch |  12 -----
 2 files changed, 112 insertions(+), 26 deletions(-)
---
diff --cc Mesa.spec
index fdee153,777da54..80471ea
--- a/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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/59b29c4c5ada1c94d1b433a9bef1d90987230f44