graphics/vulkan-sdk: Update script.

This better matches the upstream vulkan-sdk packages.

  * Include VulkanTools from LunarG instead of Vulkan-Tools from KhronosGroup.
  * Vulkan-Headers and Vulkan-Tools split into their own packages.

Signed-off-by: orbea <orbea@riseup.net>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 118 insertions, 51 deletions

diff --git a/graphics/vulkan-sdk/README b/graphics/vulkan-sdk/README
index 3226fd36df..0796ec1f1a 100644
--- a/graphics/vulkan-sdk/README
+++ b/graphics/vulkan-sdk/README
@@ -4,6 +4,8 @@ level Vulkan commands. Additionally, the loader manages inserting Vulkan
 layer libraries, including validation layers between the application and
 the ICD.
 
+qt5 is an optional dependency for vkconfig.
+
 This will not provide a vulkan driver which must be acquired elsewhere.
 
 This SlackBuild will compile vulkan-sdk from source.
diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
index 05ee7d559f..5d5d742ae8 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=vulkan-sdk
 VERSION=${VERSION:-1.2.154.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -59,30 +59,52 @@ fi
 
 set -eu
 
+# VulkanTools from LunarG doesn't support an external jsoncpp
+JSONCPP_VERSION=${JSONCPP_VERSION:-1.8.0}
+
 chdir () { cd -- "$SRC/$1"; printf %s\\n '' "Building $1" ''; }
 
 cmake_build () {
   mkdir -p build
   cd build
   cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release \
     "${@:-}" ..
   make
   make install DESTDIR=$PKG
 }
 
+copydocs () {
+  dir="$1"
+  mkdir -p -- "$PKG/usr/doc/$PRGNAM-$VERSION/$dir"
+  shift
+  for i do
+    cp -a -- "$dir-sdk-$VERSION/$i" "$PKG/usr/doc/$PRGNAM-$VERSION/$dir/"
+  done
+}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvf $CWD/Vulkan-Headers-sdk-$VERSION.tar.gz
 tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz
 tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz
-tar xvf $CWD/Vulkan-Tools-sdk-$VERSION.tar.gz
+tar xvf $CWD/VulkanTools-sdk-$VERSION.tar.gz
+tar xvf $CWD/gfxreconstruct-sdk-$VERSION.tar.gz
+
+(
+  cd VulkanTools-sdk-$VERSION/submodules
+  tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.gz
+  rm -rf jsoncpp
+  mv jsoncpp-$JSONCPP_VERSION jsoncpp
+)
 
 chown -R root:root .
 find -L . \
@@ -91,17 +113,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-######################
-### vulkan-headers ###
-######################
-
-chdir Vulkan-Headers-sdk-$VERSION
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-cmake_build
-
 #####################
 ### vulkan-loader ###
 #####################
@@ -115,12 +126,11 @@ sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 patch -p1 < $CWD/vulkan-loader-cmake.patch
 
 cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_SKIP_RPATH=TRUE \
   -DBUILD_TESTS=OFF \
+  -DBUILD_WSI_XCB_SUPPORT=ON \
+  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr
 
 ###############################
 ### vulkan-validationlayers ###
@@ -128,56 +138,83 @@ cmake_build \
 
 chdir Vulkan-ValidationLayers-sdk-$VERSION
 
-# Use the system install path for spirv.hpp
-grep -rl spirv/unified1/spirv.hpp |
-  xargs sed -i 's|spirv/unified1/spirv.hpp|SPIRV/spirv.hpp|'
-
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 
 # Disable hardcoded errors
 patch -p1 < $CWD/vulkan-validationlayers-cmake.patch
 
+# Install into the vulkan directory to avoid conflicts
+patch -p1 < $CWD/vulkan-validationlayers-support.patch
+
 cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_DATADIR=share \
-  -DCMAKE_SKIP_RPATH=TRUE \
+  -DBUILD_LAYER_SUPPORT_FILES=ON \
   -DBUILD_TESTS=OFF \
-  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_XCB_SUPPORT=ON \
+  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
   -DGLSLANG_INSTALL_DIR=/usr \
-  -DSPIRV_HEADERS_INSTALL_DIR=/usr/include/glslang \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
+  -DSPIRV_HEADERS_INSTALL_DIR=/usr \
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr
+
+###################
+### vulkantools ###
+###################
 
-####################
-### vulkan-tools ###
-####################
+chdir VulkanTools-sdk-$VERSION
 
-chdir Vulkan-Tools-sdk-$VERSION
+# Generate missing jsoncpp sources
+(
+  cd submodules/jsoncpp
+  python3 ./amalgamate.py
+)
+
+# Update the include path
+patch -p1 < $CWD/vulkantools-support.patch
 
 # Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+find . -type f -name CMakeLists.txt | xargs grep -l '3\.10\.2' |
+  xargs sed -i 's/3.10.2/3.5.2/'
 
 cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_SKIP_RPATH=TRUE \
+  -DBUILD_GMOCK=OFF \
+  -DBUILD_WSI_XCB_SUPPORT=ON \
+  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
+  -DINSTALL_GTEST=OFF \
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr \
   -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
-  -DGLSLANG_INSTALL_DIR=/usr
+  -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr
+
+######################
+### gfxreconstruct ###
+######################
+
+chdir gfxreconstruct-sdk-$VERSION
+
+# Disable hardcoded errors
+sed -i '/-Werror/d' CMakeLists.txt
+
+# cmake 3.5.2 does not have FILTER for the list command
+sed -i '/generate_target_source_files(/d' cmake/CodeStyle.cmake
+
+cmake_build \
+  -DVULKAN_HEADER=/usr/include/vulkan
 
 cd -- "$SRC"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Vulkan-Loader-sdk-$VERSION/*.txt \
-  Vulkan-Loader-sdk-$VERSION/loader/LoaderAndLayerInterface.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+copydocs Vulkan-Loader CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md \
+  LICENSE.txt README.md
+copydocs Vulkan-ValidationLayers CODE_OF_CONDUCT.md CONTRIBUTING.md \
+  GOVERNANCE.md LAYER_CONFIGURATION.md LICENSE.txt README.md
+copydocs VulkanTools CONTRIBUTING.md GOVERNANCE.md LICENSE.txt README.md
+copydocs gfxreconstruct CONTRIBUTING.md LICENSE.txt LICENSE_ThirdParty.txt \
+  README.md USAGE_android.md USAGE_desktop.md
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
index 690a0ba39b..a7892a7020 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ b/graphics/vulkan-sdk/vulkan-sdk.info
@@ -1,16 +1,18 @@
 PRGNAM="vulkan-sdk"
 VERSION="1.2.154.0"
 HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.154.0/Vulkan-Headers-sdk-1.2.154.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.154.0/Vulkan-Loader-sdk-1.2.154.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.154.0/Vulkan-Tools-sdk-1.2.154.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.154.0/Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz"
-MD5SUM="f5905669df03cf99aad45707e066c2c2 \
-        26e6ad81252d01f27322851c01ea4ed4 \
-        8d499320da34b08206c762f5ce34fd72 \
-        922b963cc146acee9246927f4b79255b"
+DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.154.0/Vulkan-Loader-sdk-1.2.154.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.154.0/Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz \
+          https://github.com/LunarG/VulkanTools/archive/sdk-1.2.154.0/VulkanTools-sdk-1.2.154.0.tar.gz \
+          https://github.com/LunarG/gfxreconstruct/archive/sdk-1.2.154.0/gfxreconstruct-sdk-1.2.154.0.tar.gz \
+          https://github.com/open-source-parsers/jsoncpp/archive/1.8.0/jsoncpp-1.8.0.tar.gz"
+MD5SUM="26e6ad81252d01f27322851c01ea4ed4 \
+        922b963cc146acee9246927f4b79255b \
+        535b87b896571ca8c60d41f60f2b029d \
+        49bf75622c8ef36a7805baea5566ec9c \
+        6d6cbd82b5fe4a9cbae4ffef01f9e9fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="glslang"
+REQUIRES="Vulkan-Headers glslang"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/graphics/vulkan-sdk/vulkan-validationlayers-support.patch b/graphics/vulkan-sdk/vulkan-validationlayers-support.patch
new file mode 100644
index 0000000000..0544dcdfd9
--- /dev/null
+++ b/graphics/vulkan-sdk/vulkan-validationlayers-support.patch
@@ -0,0 +1,13 @@
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index d1134e8e..a9e46f2b 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -72,7 +72,7 @@ if(BUILD_LAYER_SUPPORT_FILES)
+         generated/vk_object_types.h
+         generated/vk_extension_helper.h
+         generated/vk_typemap_helper.h)
+-    install(FILES ${LAYER_UTIL_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++    install(FILES ${LAYER_UTIL_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vulkan)
+ endif()
+ 
+ set(TARGET_NAMES
diff --git a/graphics/vulkan-sdk/vulkantools-support.patch b/graphics/vulkan-sdk/vulkantools-support.patch
new file mode 100644
index 0000000000..319aacbde1
--- /dev/null
+++ b/graphics/vulkan-sdk/vulkantools-support.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7b45791f3..9101a3aad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ endif()
+ message(STATUS "Using Vulkan-ValidationLayers install located at ${VULKAN_VALIDATIONLAYERS_INSTALL_DIR}")
+ 
+ file(TO_CMAKE_PATH "${VULKAN_VALIDATIONLAYERS_INSTALL_DIR}" VULKAN_VALIDATIONLAYERS_INSTALL_DIR)
+-set(Vulkan-ValidationLayers_INCLUDE_DIR "${VULKAN_VALIDATIONLAYERS_INSTALL_DIR}/include")
++set(Vulkan-ValidationLayers_INCLUDE_DIR "${VULKAN_VALIDATIONLAYERS_INSTALL_DIR}/include/vulkan")
+ set(Vulkan-ValidationLayers_LIBRARY_DIR "${VULKAN_VALIDATIONLAYERS_INSTALL_DIR}/lib")
+ find_library(VkLayer_utils_LIBRARY VkLayer_utils HINTS ${Vulkan-ValidationLayers_LIBRARY_DIR})
+