/[packages]/cauldron/mesa/current/SPECS/mesa.spec
ViewVC logotype

Diff of /cauldron/mesa/current/SPECS/mesa.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1339690 by akien, Mon Dec 10 10:37:01 2018 UTC revision 1340049 by akien, Mon Dec 10 21:49:20 2018 UTC
# Line 13  Line 13 
13  # define version, RC & release  # define version, RC & release
14  %define main_version            18.3.0  %define main_version            18.3.0
15  #define relc                    1  #define relc                    1
16  %define rel                     3  %define rel                     4
17    
18  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}
19    
# Line 37  Line 37 
37  %define gbmname                 gbm  %define gbmname                 gbm
38  %define waylandeglname          wayland-egl  %define waylandeglname          wayland-egl
39  %define xaname                  xatracker  %define xaname                  xatracker
40  %define vulkanname              vulkan  %define vulkanname              mesavulkan
41    
42  %define d3dmajor                1  %define d3dmajor                1
43  %define eglmajor                1  %define eglmajor                1
# Line 62  Line 62 
62  %define libwaylandeglname       %mklibname %{waylandeglname} %{waylandeglmajor}  %define libwaylandeglname       %mklibname %{waylandeglname} %{waylandeglmajor}
63  %define libosmesaname           %mklibname osmesa %{osmesamajor}  %define libosmesaname           %mklibname osmesa %{osmesamajor}
64  %define libxaname               %mklibname %{xaname} %{xamajor}  %define libxaname               %mklibname %{xaname} %{xamajor}
 %define libvulkanname           %mklibname %{vulkanname}  
65    
66  %define dridrivers              %mklibname dri-drivers  %define dridrivers              %mklibname dri-drivers
67    
68    %define vulkandrivers   %mklibname %{vulkanname}-drivers
69    %define vulkandevel             %mklibname %{vulkanname} -d
70    
71  %define khrdevel                %mklibname mesakhr -d  %define khrdevel                %mklibname mesakhr -d
72  %define osmesadevel             %mklibname osmesa -d  %define osmesadevel             %mklibname osmesa -d
73    
# Line 85  Line 87 
87    
88  %define with_vaapi 1  %define with_vaapi 1
89    
 # (akien) Not adding on arm as it would break the build there  
 %define enable_vulkan   0  
90  %ifarch %{ix86} x86_64  %ifarch %{ix86} x86_64
91  %define enable_vulkan   1  %define vulkan_drivers  --with-vulkan-drivers=intel,radeon
92    %else
93    %define vulkan_drivers  --with-vulkan-drivers=radeon
94  %endif  %endif
95    
96    
# Line 151  BuildRequires:  pkgconfig(vdpau) Line 153  BuildRequires:  pkgconfig(vdpau)
153  BuildRequires: pkgconfig(wayland-client)  BuildRequires: pkgconfig(wayland-client)
154  BuildRequires: pkgconfig(wayland-server)  BuildRequires: pkgconfig(wayland-server)
155  BuildRequires: pkgconfig(wayland-protocols)  BuildRequires: pkgconfig(wayland-protocols)
 %if %{enable_vulkan}  
156  BuildRequires:  libgcrypt-devel  BuildRequires:  libgcrypt-devel
 %endif  
157  BuildRequires:  pkgconfig(wayland-protocols) >= 1.8  BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
158    
159  URL:            http://www.mesa3d.org  URL:            http://www.mesa3d.org
# Line 363  Requires:      %{libxaname_virt} = %{version} Line 363  Requires:      %{libxaname_virt} = %{version}
363  Provides:       lib%{xaname}-devel  Provides:       lib%{xaname}-devel
364  Provides:       %{libxaname}-devel  Provides:       %{libxaname}-devel
365    
366  %if %{enable_vulkan}  %package -n %{vulkandrivers}
367  %package -n %{libvulkanname}_intel  Summary:        Mesa Vulkan driver for Intel and Radeon GPUs
 Summary:        Mesa vulkan driver for Intel GPU  
 Group:          System/Libraries  
   
 %package -n %{libvulkanname}_radeon  
 Summary:        Mesa vulkan driver for Radeon GPU  
368  Group:          System/Libraries  Group:          System/Libraries
369    %ifarch %{ix86} x86_64
370    Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
371    Provides:       %{_lib}vulkan_intel = %{version}-%{release}
372    %endif
373    Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
374    Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
375    
376  %package -n %{libvulkanname}-devel  %package -n %{vulkandevel}
377  Summary:        Mesa's Vulkan development files  Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
378  Group:          Development/C  Group:          Development/C
379  Requires:       %{libvulkanname}_intel = %{version}-%{release}  Requires:       %{vulkandrivers} = %{version}-%{release}
380  Provides:       libvulkan-devel  Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
381  Provides:       libvulkan_intel-devel  Provides:   %{vulkanname}-devel = %{version}-%{release}
 %endif  
382    
383  %package        common-devel  %package        common-devel
384  Summary:        Meta package for mesa devel  Summary:        Meta package for mesa devel
# Line 504  with the r600 driver. Line 504  with the r600 driver.
504  This packages provides a VPDAU plugin to enable video acceleration  This packages provides a VPDAU plugin to enable video acceleration
505  with the radeonsi driver.  with the radeonsi driver.
506    
507  %if %{enable_vulkan}  %description -n %{vulkandrivers}
508  %description -n %{libvulkanname}_intel  This package contains the Vulkan parts for Mesa's Intel and Radeon drivers.
 This package contains the Vulkan parts for Mesa's Intel driver.  
   
 %description -n %{libvulkanname}_radeon  
 This package contains the Vulkan parts for Mesa's Radeon driver.  
509    
510  %description -n %{libvulkanname}-devel  %description -n %{vulkandevel}
511  This package contains the development files for Mesa's Vulkan implementation.  This package contains the development files for Mesa's Vulkan implementation.
 %endif  
512    
513  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
514    
# Line 528  autoreconf -vfi Line 523  autoreconf -vfi
523  automake --add-missing  automake --add-missing
524    
525  %configure2_5x \  %configure2_5x \
 %if %{enable_vulkan}  
                 --with-vulkan-drivers=intel,radeon \  
 %endif  
526                  --enable-gallium-osmesa \                  --enable-gallium-osmesa \
527                  --with-dri-driverdir=%{_libdir}/dri \                  --with-dri-driverdir=%{_libdir}/dri \
528                  --enable-egl \                  --enable-egl \
# Line 550  automake --add-missing Line 542  automake --add-missing
542                  --enable-xa \                  --enable-xa \
543                  --enable-nine \                  --enable-nine \
544                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
545            %{?vulkan_drivers} \
546          %{?dri_drivers}          %{?dri_drivers}
547                  # end of configure options                  # end of configure options
548    
# Line 712  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 705  rm -f %{buildroot}%{_libdir}/pkgconfig/w
705  %files -n %{_lib}vdpau-driver-radeonsi  %files -n %{_lib}vdpau-driver-radeonsi
706  %{_libdir}/vdpau/libvdpau_radeonsi.so.*  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
707    
708  %if %{enable_vulkan}  %files -n %{vulkandrivers}
 %files -n %{libvulkanname}_intel  
709  %dir %{_datadir}/vulkan  %dir %{_datadir}/vulkan
710  %dir %{_datadir}/vulkan/icd.d  %dir %{_datadir}/vulkan/icd.d
711    %ifarch %{ix86} x86_64
712  %{_datadir}/vulkan/icd.d/intel_icd*.json  %{_datadir}/vulkan/icd.d/intel_icd*.json
 # (akien) No lib major?  
713  %{_libdir}/libvulkan_intel.so  %{_libdir}/libvulkan_intel.so
714    %endif
 %files -n %{libvulkanname}_radeon  
 %dir %{_datadir}/vulkan  
 %dir %{_datadir}/vulkan/icd.d  
715  %{_datadir}/vulkan/icd.d/radeon_icd*.json  %{_datadir}/vulkan/icd.d/radeon_icd*.json
 # (akien) No lib major?  
716  %{_libdir}/libvulkan_radeon.so  %{_libdir}/libvulkan_radeon.so
717    
718  %files -n %{libvulkanname}-devel  %files -n %{vulkandevel}
719  %{_includedir}/vulkan/  %dir %{_includedir}/vulkan
720  %endif  %{_includedir}/vulkan/vulkan_intel.h

Legend:
Removed from v.1339690  
changed lines
  Added in v.1340049

  ViewVC Help
Powered by ViewVC 1.1.26