diff --git a/glslang-default-resource-limits_staticlib.patch b/glslang-default-resource-limits_staticlib.patch new file mode 100644 index 0000000..73992e5 --- /dev/null +++ b/glslang-default-resource-limits_staticlib.patch @@ -0,0 +1,9 @@ +--- glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af/StandAlone/CMakeLists.txt ++++ glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af-new/StandAlone/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(glslang-default-resource-limits ++add_library(glslang-default-resource-limits STATIC + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) + set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) + set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) + diff --git a/vulkan.spec b/vulkan.spec index 7e0b418..8eff77a 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -13,7 +13,7 @@ Name: vulkan Version: 1.0.61.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -25,7 +25,8 @@ Source3: %url/%{srcname3}/archive/%{commit3}.tar.gz#/%{srcname3}-%{commit Patch0: 0003-layers-Don-t-set-an-rpath.patch Patch1: 0008-demos-Don-t-build-tri-or-cube.patch Patch2: SPIRV-Tools_staticlib.patch -Patch3: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch +Patch3: glslang-default-resource-limits_staticlib.patch +Patch4: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch BuildRequires: gcc-c++ BuildRequires: bison @@ -78,7 +79,7 @@ Filesystem for Vulkan. %setup -q -n %{srcname}-sdk-%{version} %patch0 -p1 %patch1 -p1 -%patch3 -p1 +%patch4 -p1 mkdir -p build/ external/glslang/build/install external/spirv-tools/build/ external/spirv-tools/external/spirv-headers tar -xf %{SOURCE1} -C external/glslang --strip 1 @@ -88,6 +89,9 @@ tar -xf %{SOURCE3} -C external/spirv-tools --strip 1 pushd external/spirv-tools %patch2 -p1 popd +pushd external/glslang +%patch3 -p1 +popd # fix spurious-executable-perm chmod 0644 README.md @@ -113,7 +117,6 @@ popd pushd build/ %cmake3 -DCMAKE_BUILD_TYPE=Release \ - -DGLSLANG_VALIDATOR=../external/glslang/build/StandAlone/glslangValidator \ -DCMAKE_SKIP_RPATH:BOOL=yes \ -DBUILD_VKJSON=OFF \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ @@ -168,6 +171,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Oct 31 2017 Leigh Scott - 1.0.61.1-5 +- Add small compile fix + * Tue Oct 31 2017 Leigh Scott - 1.0.61.1-4 - Fix vulkan requires - Move demos to sub-package