--- cauldron/mesa/current/SPECS/mesa.spec	2018/12/10 10:37:01	1339690
+++ cauldron/mesa/current/SPECS/mesa.spec	2018/12/10 21:49:20	1340049
@@ -13,7 +13,7 @@
 # define version, RC & release
 %define main_version		18.3.0
 #define relc			1
-%define rel			3
+%define rel			4
 
 %define release			%mkrel %{?relc:0.rc%{relc}.}%{rel}
 
@@ -37,7 +37,7 @@
 %define gbmname			gbm
 %define waylandeglname		wayland-egl
 %define xaname			xatracker
-%define vulkanname		vulkan
+%define vulkanname		mesavulkan
 
 %define d3dmajor		1
 %define eglmajor		1
@@ -62,10 +62,12 @@
 %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
 
@@ -85,10 +87,10 @@
 
 %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
 
 
@@ -151,9 +153,7 @@
 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
@@ -363,22 +363,22 @@
 Provides:	lib%{xaname}-devel
 Provides:	%{libxaname}-devel
 
-%if %{enable_vulkan}
-%package -n %{libvulkanname}_intel
-Summary:	Mesa vulkan driver for Intel GPU
-Group:		System/Libraries
-
-%package -n %{libvulkanname}_radeon
-Summary:	Mesa vulkan driver for Radeon GPU
+%package -n %{vulkandrivers}
+Summary:	Mesa Vulkan driver for Intel and Radeon GPUs
 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
-Summary:	Mesa's Vulkan development files
+%package -n %{vulkandevel}
+Summary:	Mesa's Vulkan development files for Intel and Radeon drivers
 Group:		Development/C
-Requires:	%{libvulkanname}_intel = %{version}-%{release}
-Provides:	libvulkan-devel
-Provides:	libvulkan_intel-devel
-%endif
+Requires:	%{vulkandrivers} = %{version}-%{release}
+Obsoletes:	%{_lib}vulkan-devel < 0:18.3.0-4
+Provides:   %{vulkanname}-devel = %{version}-%{release}
 
 %package	common-devel
 Summary:	Meta package for mesa devel
@@ -504,16 +504,11 @@
 This packages provides a VPDAU plugin to enable video acceleration
 with the radeonsi driver.
 
-%if %{enable_vulkan}
-%description -n %{libvulkanname}_intel
-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 %{vulkandrivers}
+This package contains the Vulkan parts for Mesa's Intel and Radeon drivers.
 
-%description -n %{libvulkanname}-devel
+%description -n %{vulkandevel}
 This package contains the development files for Mesa's Vulkan implementation.
-%endif
 
 #------------------------------------------------------------------------------
 
@@ -528,9 +523,6 @@
 automake --add-missing
 
 %configure2_5x \
-%if %{enable_vulkan}
-		--with-vulkan-drivers=intel,radeon \
-%endif
 		--enable-gallium-osmesa \
 		--with-dri-driverdir=%{_libdir}/dri \
 		--enable-egl \
@@ -550,6 +542,7 @@
 		--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
 
@@ -712,21 +705,16 @@
 %files -n %{_lib}vdpau-driver-radeonsi
 %{_libdir}/vdpau/libvdpau_radeonsi.so.*
 
-%if %{enable_vulkan}
-%files -n %{libvulkanname}_intel
+%files -n %{vulkandrivers}
 %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
-
-%files -n %{libvulkanname}_radeon
-%dir %{_datadir}/vulkan
-%dir %{_datadir}/vulkan/icd.d
+%endif
 %{_datadir}/vulkan/icd.d/radeon_icd*.json
-# (akien) No lib major?
 %{_libdir}/libvulkan_radeon.so
 
-%files -n %{libvulkanname}-devel
-%{_includedir}/vulkan/
-%endif
+%files -n %{vulkandevel}
+%dir %{_includedir}/vulkan
+%{_includedir}/vulkan/vulkan_intel.h