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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1339690 by akien,
Mon Dec 10 10:37:01 2018 UTC
+revision 1343804 by tmb,
Thu Dec 20 18:11:00 2018 UTC
 Line 11
  %define opengl_ver 4.5
  # define version, RC & release
- %define main_version            18.3.0
+ %define main_version            18.3.1
  #define relc                    1
- %define rel                     3
+ %define rel                     2
  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}
 Line 37
  %define gbmname                 gbm
  %define waylandeglname          wayland-egl
  %define xaname                  xatracker
- %define vulkanname              vulkan
+ %define vulkanname              mesavulkan
  %define d3dmajor                1
  %define eglmajor                1
 Line 62
  %define libwaylandeglname       %mklibname %{waylandeglname} %{waylandeglmajor}
  %define libosmesaname           %mklibname osmesa %{osmesamajor}
  %define libxaname               %mklibname %{xaname} %{xamajor}
- %define libvulkanname           %mklibname %{vulkanname}
  %define dridrivers              %mklibname dri-drivers
+ %define vulkandrivers   %mklibname %{vulkanname}-drivers
+ %define vulkandevel             %mklibname %{vulkanname} -d
  %define khrdevel                %mklibname mesakhr -d
  %define osmesadevel             %mklibname osmesa -d
-Line 85
+Line 87
  %define with_vaapi 1
- # (akien) Not adding on arm as it would break the build there
- %define enable_vulkan   0
  %ifarch %{ix86} x86_64
- %define enable_vulkan   1
+ %define vulkan_drivers  --with-vulkan-drivers=intel,radeon
+ %else
+ %define vulkan_drivers  --with-vulkan-drivers=radeon
  %endif
-Line 151 
 BuildRequires:  pkgconfig(vdpau)
+Line 153 
 BuildRequires:  pkgconfig(vdpau)
  BuildRequires: pkgconfig(wayland-client)
  BuildRequires: pkgconfig(wayland-server)
  BuildRequires: pkgconfig(wayland-protocols)
- %if %{enable_vulkan}
  BuildRequires:  libgcrypt-devel
- %endif
  BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
  URL:            http://www.mesa3d.org
 Line 173 
 Patch000:      fix-linking.patch
  # mesa master branch from 101
  Patch101:       mesa-pci_ids-add-new-vega10-pci-ids.patch
  Patch102:       mesa-pci_ids-add-new-vega20-pci-id.patch
+ Patch103:       mesa-pci_ids-add-new-VegaM-pci-id.patch
  #------------------------------------------------------------------------------
 Line 363 
 Requires:      %{libxaname_virt} = %{version}
  Provides:       lib%{xaname}-devel
  Provides:       %{libxaname}-devel
- %if %{enable_vulkan}
+ %package -n %{vulkandrivers}
- %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
  Group:          System/Libraries
+ %ifarch %{ix86} x86_64
+ Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
+ Provides:       %{_lib}vulkan_intel = %{version}-%{release}
+ %endif
+ Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
+ Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
- %package -n %{libvulkanname}-devel
+ %package -n %{vulkandevel}
- Summary:        Mesa's Vulkan development files
+ Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
  Group:          Development/C
- Requires:       %{libvulkanname}_intel = %{version}-%{release}
+ Requires:       %{vulkandrivers} = %{version}-%{release}
- Provides:       libvulkan-devel
+ Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
- Provides:       libvulkan_intel-devel
+ Provides:   %{vulkanname}-devel = %{version}-%{release}
- %endif
  %package        common-devel
  Summary:        Meta package for mesa devel
 Line 504 
 with the r600 driver.
  This packages provides a VPDAU plugin to enable video acceleration
  with the radeonsi driver.
- %if %{enable_vulkan}
+ %description -n %{vulkandrivers}
- %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.
- %description -n %{libvulkanname}-devel
+ %description -n %{vulkandevel}
  This package contains the development files for Mesa's Vulkan implementation.
- %endif
  #------------------------------------------------------------------------------
-Line 528 
 autoreconf -vfi
+Line 523 
 autoreconf -vfi
  automake --add-missing
  %configure2_5x \
- %if %{enable_vulkan}
-                 --with-vulkan-drivers=intel,radeon \
- %endif
                  --enable-gallium-osmesa \
                  --with-dri-driverdir=%{_libdir}/dri \
                  --enable-egl \
-Line 550 
 automake --add-missing
+Line 542 
 automake --add-missing
                  --enable-xa \
                  --enable-nine \
                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
+         %{?vulkan_drivers} \
          %{?dri_drivers}
                  # end of configure options
-Line 586 
 rm -f %{buildroot}%{_libdir}/libwayland-
+Line 579 
 rm -f %{buildroot}%{_libdir}/libwayland-
  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
  %endif
+ %ifnarch %{ix86} x86_64
+ # To have something to package for mesavulkan-devel on arm/aarch64 for now
+ mkdir %{buildroot}%{_includedir}/vulkan
+ %endif
  #------------------------------------------------------------------------------
  %files
-Line 712 
 rm -f %{buildroot}%{_libdir}/pkgconfig/w
+Line 710 
 rm -f %{buildroot}%{_libdir}/pkgconfig/w
  %files -n %{_lib}vdpau-driver-radeonsi
  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
- %if %{enable_vulkan}
+ %files -n %{vulkandrivers}
- %files -n %{libvulkanname}_intel
  %dir %{_datadir}/vulkan
  %dir %{_datadir}/vulkan/icd.d
+ %ifarch %{ix86} x86_64
  %{_datadir}/vulkan/icd.d/intel_icd*.json
- # (akien) No lib major?
  %{_libdir}/libvulkan_intel.so
+ %endif
- %files -n %{libvulkanname}_radeon
- %dir %{_datadir}/vulkan
- %dir %{_datadir}/vulkan/icd.d
  %{_datadir}/vulkan/icd.d/radeon_icd*.json
- # (akien) No lib major?
  %{_libdir}/libvulkan_radeon.so
- %files -n %{libvulkanname}-devel
+ %files -n %{vulkandevel}
- %{_includedir}/vulkan/
+ %dir %{_includedir}/vulkan
+ %ifarch %{ix86} x86_64
+ %{_includedir}/vulkan/vulkan_intel.h
  %endif

 Legend:



Removed from v.1339690
 


changed lines


 
Added in v.1343804
 Legend:



Removed from v.1339690
 


changed lines


 
Added in v.1343804
-Removed from v.1339690
+Added in v.1343804

	ViewVC Help
Powered by ViewVC 1.1.30