/[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 1339667 by akien, Mon Dec 10 09:14:31 2018 UTC revision 1362043 by tv, Thu Jan 31 05:56:14 2019 UTC
# Line 11  Line 11 
11  %define opengl_ver 4.5  %define opengl_ver 4.5
12    
13  # define version, RC & release  # define version, RC & release
14  %define main_version            18.3.0  %define main_version            19.0.0
15  #define relc                    1  %define relc                    1
16  %define rel                     2  %define rel                     1
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 170  Patch000:      fix-linking.patch Line 170  Patch000:      fix-linking.patch
170    
171  # mesa staging/18.3 branch from 1  # mesa staging/18.3 branch from 1
172    
173  # mesa master branch from 101  # mesa master branch from 201
 Patch101:       mesa-pci_ids-add-new-vega10-pci-ids.patch  
 Patch102:       mesa-pci_ids-add-new-vega20-pci-id.patch  
   
174    
175  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
176    
# Line 363  Requires:      %{libxaname_virt} = %{version} Line 360  Requires:      %{libxaname_virt} = %{version}
360  Provides:       lib%{xaname}-devel  Provides:       lib%{xaname}-devel
361  Provides:       %{libxaname}-devel  Provides:       %{libxaname}-devel
362    
363  %if %{enable_vulkan}  %package -n %{vulkandrivers}
364  %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  
365  Group:          System/Libraries  Group:          System/Libraries
366    %ifarch %{ix86} x86_64
367    Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
368    Provides:       %{_lib}vulkan_intel = %{version}-%{release}
369    %endif
370    Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
371    Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
372    
373  %package -n %{libvulkanname}-devel  %package -n %{vulkandevel}
374  Summary:        Mesa's Vulkan development files  Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
375  Group:          Development/C  Group:          Development/C
376  Requires:       %{libvulkanname}_intel = %{version}-%{release}  Requires:       %{vulkandrivers} = %{version}-%{release}
377  Provides:       libvulkan-devel  Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
378  Provides:       libvulkan_intel-devel  Provides:   %{vulkanname}-devel = %{version}-%{release}
 %endif  
379    
380  %package        common-devel  %package        common-devel
381  Summary:        Meta package for mesa devel  Summary:        Meta package for mesa devel
# Line 504  with the r600 driver. Line 501  with the r600 driver.
501  This packages provides a VPDAU plugin to enable video acceleration  This packages provides a VPDAU plugin to enable video acceleration
502  with the radeonsi driver.  with the radeonsi driver.
503    
504  %if %{enable_vulkan}  %description -n %{vulkandrivers}
505  %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.  
506    
507  %description -n %{libvulkanname}-devel  %description -n %{vulkandevel}
508  This package contains the development files for Mesa's Vulkan implementation.  This package contains the development files for Mesa's Vulkan implementation.
 %endif  
509    
510  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
511    
# Line 528  autoreconf -vfi Line 520  autoreconf -vfi
520  automake --add-missing  automake --add-missing
521    
522  %configure2_5x \  %configure2_5x \
 %if %{enable_vulkan}  
                 --with-vulkan-drivers=intel,radeon \  
 %endif  
523                  --enable-gallium-osmesa \                  --enable-gallium-osmesa \
524                  --with-dri-driverdir=%{_libdir}/dri \                  --with-dri-driverdir=%{_libdir}/dri \
525                  --enable-egl \                  --enable-egl \
# Line 550  automake --add-missing Line 539  automake --add-missing
539                  --enable-xa \                  --enable-xa \
540                  --enable-nine \                  --enable-nine \
541                  --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} \
542            %{?vulkan_drivers} \
543          %{?dri_drivers}          %{?dri_drivers}
544                  # end of configure options                  # end of configure options
545    
# Line 586  rm -f %{buildroot}%{_libdir}/libwayland- Line 576  rm -f %{buildroot}%{_libdir}/libwayland-
576  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
577  %endif  %endif
578    
579    %ifnarch %{ix86} x86_64
580    # To have something to package for mesavulkan-devel on arm/aarch64 for now
581    mkdir %{buildroot}%{_includedir}/vulkan
582    %endif
583    
584  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
585    
586  %files  %files
# Line 712  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 707  rm -f %{buildroot}%{_libdir}/pkgconfig/w
707  %files -n %{_lib}vdpau-driver-radeonsi  %files -n %{_lib}vdpau-driver-radeonsi
708  %{_libdir}/vdpau/libvdpau_radeonsi.so.*  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
709    
710  %if %{enable_vulkan}  %files -n %{vulkandrivers}
 %files -n %{libvulkanname}_intel  
711  %dir %{_datadir}/vulkan  %dir %{_datadir}/vulkan
712  %dir %{_datadir}/vulkan/icd.d  %dir %{_datadir}/vulkan/icd.d
713    %ifarch %{ix86} x86_64
714  %{_datadir}/vulkan/icd.d/intel_icd*.json  %{_datadir}/vulkan/icd.d/intel_icd*.json
 # (akien) No lib major?  
715  %{_libdir}/libvulkan_intel.so  %{_libdir}/libvulkan_intel.so
716    %endif
 %files -n %{libvulkanname}_radeon  
 %dir %{_datadir}/vulkan  
 %dir %{_datadir}/vulkan/icd.d  
717  %{_datadir}/vulkan/icd.d/radeon_icd*.json  %{_datadir}/vulkan/icd.d/radeon_icd*.json
 # (akien) No lib major?  
718  %{_libdir}/libvulkan_radeon.so  %{_libdir}/libvulkan_radeon.so
719    
720  %files -n %{libvulkanname}-devel  %files -n %{vulkandevel}
721  %{_includedir}/vulkan/  %dir %{_includedir}/vulkan
722    %ifarch %{ix86} x86_64
723    %{_includedir}/vulkan/vulkan_intel.h
724  %endif  %endif

Legend:
Removed from v.1339667  
changed lines
  Added in v.1362043

  ViewVC Help
Powered by ViewVC 1.1.30