From 4f28c7ba9f29e0717d956afa5e686553f6d0059b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:27:37 +0000 Subject: [PATCH 01/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vulkan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index d4c15c9..2da971f 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -16,9 +16,9 @@ Name: vulkan Version: 1.0.54.0 %if 0%{?use_git} -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif Summary: Vulkan loader and validation layers @@ -179,6 +179,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.54.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Jul 22 2017 Leigh Scott - 1.0.54.0-2 - Cleanup cmake commands From 359b7607cce4347f8b1d0835c83746221abeb284 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:10:06 +0000 Subject: [PATCH 02/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vulkan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 2da971f..aad6e8a 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -16,9 +16,9 @@ Name: vulkan Version: 1.0.54.0 %if 0%{?use_git} -Release: 0.3.git%{shortcommit}%{?dist} +Release: 0.4.git%{shortcommit}%{?dist} %else -Release: 3%{?dist} +Release: 4%{?dist} %endif Summary: Vulkan loader and validation layers @@ -179,6 +179,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.54.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.0.54.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From de00f72940dac8546c25b91da6b2350bc83361f5 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 14 Aug 2017 10:57:50 +0100 Subject: [PATCH 03/35] Update to 1.0.57.0 release --- sources | 8 ++++---- vulkan.spec | 15 +++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sources b/sources index bc7e86d..7549cd8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (glslang-9645f78293a59780b06ba93938bc46850b2c5b3c.tar.gz) = 561afd1205dd213d9d3bb90f825d30aef964217852739a2fc6d0c041776d5ecaa91f6277503bc2eedff4d9bc97818359fe285dd489c019ac327ed2b8c0ec42a2 -SHA512 (SPIRV-Headers-661ad91124e6af2272afd00f804d8aa276e17107.tar.gz) = e4af0bf25f4ceea74f7669547718b3d2a874fd394436eebe5d811841b089ea1c4341c1cfda6e32d67cd84e9d8f8ce2b312543a793067fdaf84198e168e2f476b -SHA512 (SPIRV-Tools-abc6f5a67288b50846b9ef5f21a8100edd36d7c8.tar.gz) = 706aaf33c1ebb8e0d4abf3200d61e2454ce4d22b3db2830b7c8a4cc9685af57596fe8289805d095ce71ae45c654852fcb4879b1da4338f967435a9ca1acac7cb -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.54.0.tar.gz) = f5478e1a7f966a2d09b97a3b47a04b4c9ccd68b88126fefcd6f97bfd0347c5a5bebf52e1cdfccc4863d22dd3b875e04cddf406e3e546eb3dc50d2ef61d85a21f +SHA512 (glslang-d5aedc199f127a1f8bda8079244a1cc275c1a12d.tar.gz) = da30f6b9c8863c52ecee0cc970c6f0d40996651cce3a39e2d7e54a33f045bff7fc8be459c3f7bb22cffe2d0150f4ff28c7fad01558624bf5baf78f3605c781b7 +SHA512 (SPIRV-Headers-4a7a9fdaa984af968a382e24ebe1bc3fedc4e73a.tar.gz) = cc8057eedba9349df804c138b0bc00bb9f859ae9e6d5e2eb0f9328e7831ab9f9331ce4adfb0793d505f178ec5b6283aa7ee96cfc006927faffa2db42d15dcd71 +SHA512 (SPIRV-Tools-f0fe601dc8f2e8a2176d87fe60603a1ca306486c.tar.gz) = 066a583d8d8163502ece6902d91ebaf36aac69f9fbdea056de09c0a44f9221666d7ee6fbcad17b51e50607b7d90a2757a415fd6b2c01f58e40870653e4618568 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0.tar.gz) = e9b3fc49f15de00a83578a6dd6a15478541fdf184a115f91c5311a7f2079940a86ee5f682c9c7a4d6745728958d52cc366ff2371c9c7a1cf158f361993db995c diff --git a/vulkan.spec b/vulkan.spec index aad6e8a..7cbd72e 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -4,21 +4,21 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname Vulkan-LoaderAndValidationLayers -%global commit1 9645f78293a59780b06ba93938bc46850b2c5b3c +%global commit1 d5aedc199f127a1f8bda8079244a1cc275c1a12d %global srcname1 glslang -%global commit2 661ad91124e6af2272afd00f804d8aa276e17107 +%global commit2 4a7a9fdaa984af968a382e24ebe1bc3fedc4e73a %global srcname2 SPIRV-Headers -%global commit3 abc6f5a67288b50846b9ef5f21a8100edd36d7c8 +%global commit3 f0fe601dc8f2e8a2176d87fe60603a1ca306486c %global srcname3 SPIRV-Tools Name: vulkan -Version: 1.0.54.0 +Version: 1.0.57.0 %if 0%{?use_git} -Release: 0.4.git%{shortcommit}%{?dist} +Release: 0.1.git%{shortcommit}%{?dist} %else -Release: 4%{?dist} +Release: 1%{?dist} %endif Summary: Vulkan loader and validation layers @@ -179,6 +179,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Aug 14 2017 Leigh Scott - 1.0.57.0-1 +- Update to 1.0.57.0 release + * Thu Aug 03 2017 Fedora Release Engineering - 1.0.54.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 140576aa6e29057da34f2a3bcb569ba129a4a70d Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Sep 2017 09:25:35 +0100 Subject: [PATCH 04/35] Update to 1.0.61.0 release --- sources | 8 ++++---- vulkan.spec | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 7549cd8..b00ab98 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (glslang-d5aedc199f127a1f8bda8079244a1cc275c1a12d.tar.gz) = da30f6b9c8863c52ecee0cc970c6f0d40996651cce3a39e2d7e54a33f045bff7fc8be459c3f7bb22cffe2d0150f4ff28c7fad01558624bf5baf78f3605c781b7 -SHA512 (SPIRV-Headers-4a7a9fdaa984af968a382e24ebe1bc3fedc4e73a.tar.gz) = cc8057eedba9349df804c138b0bc00bb9f859ae9e6d5e2eb0f9328e7831ab9f9331ce4adfb0793d505f178ec5b6283aa7ee96cfc006927faffa2db42d15dcd71 -SHA512 (SPIRV-Tools-f0fe601dc8f2e8a2176d87fe60603a1ca306486c.tar.gz) = 066a583d8d8163502ece6902d91ebaf36aac69f9fbdea056de09c0a44f9221666d7ee6fbcad17b51e50607b7d90a2757a415fd6b2c01f58e40870653e4618568 -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0.tar.gz) = e9b3fc49f15de00a83578a6dd6a15478541fdf184a115f91c5311a7f2079940a86ee5f682c9c7a4d6745728958d52cc366ff2371c9c7a1cf158f361993db995c +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.61.0.tar.gz) = bfc7609d2427b6947985f4dad46e2f9027b4d3c58cd0c2cdd754df58a908666fc6e5efb03306626a801de7bf1a4bd7f72e57e89bd81a43af09c3fc7a8016c084 +SHA512 (glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af.tar.gz) = a6b2f589d432015d3830027dee377350529bec9c339a8de24aa52bab5ca52b3e17e2163d3bd1a7d91f7a08c446ebfe86d64bbbbae5a23af831d2e0cb724f7418 +SHA512 (SPIRV-Headers-2bb92e6fe2c6aa410152fc6c63443f452acb1a65.tar.gz) = cdd1437a67c7e31e2062e5d0f25c767b99a3fadd64b91d00c3b07404e535bb4bfd78a43878ebbcd45e013a7153f1a2c969da99d50a99cc39efab940d0aab7cfd +SHA512 (SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23.tar.gz) = 67e8fcdcb9748df1e7c86bb50358a89b656f80a96534bc5771afc4ce22e9ebcc8ca382f784fab7b856324d487f810c21abaaab2facee7453c0343a9b51d7e60b diff --git a/vulkan.spec b/vulkan.spec index 7cbd72e..7b64cc2 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -4,17 +4,17 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname Vulkan-LoaderAndValidationLayers -%global commit1 d5aedc199f127a1f8bda8079244a1cc275c1a12d +%global commit1 3a21c880500eac21cdf79bef5b80f970a55ac6af %global srcname1 glslang -%global commit2 4a7a9fdaa984af968a382e24ebe1bc3fedc4e73a +%global commit2 2bb92e6fe2c6aa410152fc6c63443f452acb1a65 %global srcname2 SPIRV-Headers -%global commit3 f0fe601dc8f2e8a2176d87fe60603a1ca306486c +%global commit3 7e2d26c77b606b21af839b37fd21381c4a669f23 %global srcname3 SPIRV-Tools Name: vulkan -Version: 1.0.57.0 +Version: 1.0.61.0 %if 0%{?use_git} Release: 0.1.git%{shortcommit}%{?dist} %else @@ -179,6 +179,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Sep 19 2017 Leigh Scott - 1.0.61.0-1 +- Update to 1.0.61.0 release + * Mon Aug 14 2017 Leigh Scott - 1.0.57.0-1 - Update to 1.0.57.0 release From 86dacbc9f437c480906aca6da89a7667b5b1d339 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 21 Sep 2017 07:36:43 +0100 Subject: [PATCH 05/35] Update to 1.0.61.1 release (rhbz 1493425) --- sources | 2 +- vulkan.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b00ab98..3aa693a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.61.0.tar.gz) = bfc7609d2427b6947985f4dad46e2f9027b4d3c58cd0c2cdd754df58a908666fc6e5efb03306626a801de7bf1a4bd7f72e57e89bd81a43af09c3fc7a8016c084 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.61.1.tar.gz) = e16599ca458dc1c636c80a03693edc4a24563e08768de95e7711cd7927d7cfdcd0ce14d16d938ca066bfe4ce8fe43836d2b61973bc2a7ba6ad14ab5f18166e0e SHA512 (glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af.tar.gz) = a6b2f589d432015d3830027dee377350529bec9c339a8de24aa52bab5ca52b3e17e2163d3bd1a7d91f7a08c446ebfe86d64bbbbae5a23af831d2e0cb724f7418 SHA512 (SPIRV-Headers-2bb92e6fe2c6aa410152fc6c63443f452acb1a65.tar.gz) = cdd1437a67c7e31e2062e5d0f25c767b99a3fadd64b91d00c3b07404e535bb4bfd78a43878ebbcd45e013a7153f1a2c969da99d50a99cc39efab940d0aab7cfd SHA512 (SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23.tar.gz) = 67e8fcdcb9748df1e7c86bb50358a89b656f80a96534bc5771afc4ce22e9ebcc8ca382f784fab7b856324d487f810c21abaaab2facee7453c0343a9b51d7e60b diff --git a/vulkan.spec b/vulkan.spec index 7b64cc2..8adc43f 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -14,7 +14,7 @@ %global srcname3 SPIRV-Tools Name: vulkan -Version: 1.0.61.0 +Version: 1.0.61.1 %if 0%{?use_git} Release: 0.1.git%{shortcommit}%{?dist} %else @@ -179,6 +179,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Thu Sep 21 2017 Leigh Scott - 1.0.61.1-1 +- Update to 1.0.61.1 release (rhbz 1493425) + * Tue Sep 19 2017 Leigh Scott - 1.0.61.0-1 - Update to 1.0.61.0 release From 00072c4d574db125823504ec19410e7aec57d58e Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 6 Oct 2017 18:33:42 +0100 Subject: [PATCH 06/35] add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) --- fix_x86_TEXTREL.patch | 23 +++++++++++++++++++++++ vulkan.spec | 8 ++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 fix_x86_TEXTREL.patch diff --git a/fix_x86_TEXTREL.patch b/fix_x86_TEXTREL.patch new file mode 100644 index 0000000..877db23 --- /dev/null +++ b/fix_x86_TEXTREL.patch @@ -0,0 +1,23 @@ +From 560f9cdf78d3d03dbf97be638becd1a7df5fa154 Mon Sep 17 00:00:00 2001 +From: Lenny Komow +Date: Fri, 6 Oct 2017 11:13:15 -0600 +Subject: [PATCH] loader: Fix TEXTREL on 32-bit linux loader + +Change-Id: I5fc568ce0ad17c280c484f37b2797eead08169b3 +--- + loader/unknown_ext_chain_gas.asm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm +index 798760bd8..aca92ea5b 100644 +--- a/loader/unknown_ext_chain_gas.asm ++++ b/loader/unknown_ext_chain_gas.asm +@@ -89,7 +89,7 @@ vkPhysDevExtTermin\num: + terminError\num: + mov eax, [eax + INSTANCE_OFFSET_ICD_TERM] # Load the loader_instance into eax + push [eax + (HASH_OFFSET_INSTANCE + (HASH_SIZE * \num) + FUNC_NAME_OFFSET_HASH)] # Push the func name (fifth arg) +- push offset termin_error_string # Push the error string (fourth arg) ++ push offset termin_error_string@GOT # Push the error string (fourth arg) + push 0 # Push zero (third arg) + push VK_DEBUG_REPORT_ERROR_BIT_EXT # Push the error logging bit (second arg) + push eax # Push the loader_instance (first arg) diff --git a/vulkan.spec b/vulkan.spec index 8adc43f..7d71419 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -16,9 +16,9 @@ Name: vulkan Version: 1.0.61.1 %if 0%{?use_git} -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Vulkan loader and validation layers @@ -36,6 +36,7 @@ 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: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -179,6 +180,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Fri Oct 06 2017 Leigh Scott - 1.0.61.1-2 +- add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) + * Thu Sep 21 2017 Leigh Scott - 1.0.61.1-1 - Update to 1.0.61.1 release (rhbz 1493425) From 45e05a185be7f6c100a9e72e6a711cf25de2c5bd Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 31 Oct 2017 11:39:49 +0000 Subject: [PATCH 07/35] Remove epel conditionals --- vulkan.spec | 51 ++++++++++++--------------------------------------- 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 7d71419..46b6800 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -1,7 +1,3 @@ -%global use_git 0 - -%global commit d4cd34fd49caa759cf01cafa5fa271401b17c3b9 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname Vulkan-LoaderAndValidationLayers %global commit1 3a21c880500eac21cdf79bef5b80f970a55ac6af @@ -15,21 +11,11 @@ Name: vulkan Version: 1.0.61.1 -%if 0%{?use_git} -Release: 0.2.git%{shortcommit}%{?dist} -%else -Release: 2%{?dist} -%endif +Release: 3%{?dist} Summary: Vulkan loader and validation layers - License: ASL 2.0 URL: https://github.com/KhronosGroup - -%if 0%{?use_git} -Source0: %url/%{srcname}/archive/%{commit}.tar.gz#/%{srcname}-%{commit}.tar.gz -%else Source0: %url/%{srcname}/archive/sdk-%{version}.tar.gz#/%{srcname}-sdk-%{version}.tar.gz -%endif Source1: %url/%{srcname1}/archive/%{commit1}.tar.gz#/%{srcname1}-%{commit1}.tar.gz Source2: %url/%{srcname2}/archive/%{commit2}.tar.gz#/%{srcname2}-%{commit2}.tar.gz Source3: %url/%{srcname3}/archive/%{commit3}.tar.gz#/%{srcname3}-%{commit3}.tar.gz @@ -38,31 +24,23 @@ Patch0: 0003-layers-Don-t-set-an-rpath.patch Patch1: 0008-demos-Don-t-build-tri-or-cube.patch Patch2: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch -BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 BuildRequires: /usr/bin/chrpath BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pciaccess) -%if 0%{?fedora} BuildRequires: python3 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) -%else -BuildRequires: python34 -%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xrandr) Requires: vulkan-filesystem = %{version}-%{release} - -%if 0%{?fedora} Recommends: mesa-vulkan-drivers -%endif %description Vulkan is a new generation graphics and compute API that provides @@ -87,11 +65,7 @@ BuildArch: noarch Filesystem for Vulkan. %prep -%if 0%{?use_git} -%autosetup -p1 -n %{srcname}-%{commit} -%else %autosetup -p1 -n %{srcname}-sdk-%{version} -%endif 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 @@ -109,35 +83,29 @@ sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} %build pushd external/glslang/build/ -CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS ; -CXXFLAGS="$RPM_OPT_FLAGS" ; export CXXFLAGS ; -LDFLAGS="$RPM_LD_FLAGS" ; export LDFLAGS ; -cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. +%cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install .. %make_build make install popd pushd external/spirv-tools/build/ -cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. +%cmake3 -DCMAKE_BUILD_TYPE=Release .. %make_build 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} \ - -DBUILD_WSI_MIR_SUPPORT=OFF \ -%if 0%{?rhel} - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -%endif - .. + -DBUILD_WSI_MIR_SUPPORT=OFF .. %make_build popd %install pushd build/ -%{make_install} +%make_install popd @@ -180,8 +148,13 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Oct 31 2017 Leigh Scott - 1.0.61.1-3 +- Remove epel conditionals +- Remove vulkan git conditionals +- Use cmake macro for everything + * Fri Oct 06 2017 Leigh Scott - 1.0.61.1-2 -- add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) +- Add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) * Thu Sep 21 2017 Leigh Scott - 1.0.61.1-1 - Update to 1.0.61.1 release (rhbz 1493425) From d650776957c468ed75f86ccefa43f628177b8903 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 31 Oct 2017 13:05:49 +0000 Subject: [PATCH 08/35] Fix vulkan requires --- SPIRV-Tools_staticlib.patch | 36 ++++++++++++++++++++++++++++++++++++ vulkan.spec | 34 +++++++++++++++++++++++++++++----- 2 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 SPIRV-Tools_staticlib.patch diff --git a/SPIRV-Tools_staticlib.patch b/SPIRV-Tools_staticlib.patch new file mode 100644 index 0000000..2e4a184 --- /dev/null +++ b/SPIRV-Tools_staticlib.patch @@ -0,0 +1,36 @@ +diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/CMakeLists.txt SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/CMakeLists.txt +--- SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/CMakeLists.txt 2017-09-01 22:28:22.000000000 +0200 ++++ SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/CMakeLists.txt 2017-10-13 10:06:17.033675656 +0200 +@@ -282,7 +282,7 @@ set_source_files_properties( + ${CMAKE_CURRENT_SOURCE_DIR}/software_version.cpp + PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") + +-add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) ++add_library(${SPIRV_TOOLS} STATIC ${SPIRV_SOURCES}) + spvtools_default_compile_options(${SPIRV_TOOLS}) + target_include_directories(${SPIRV_TOOLS} + PUBLIC ${spirv-tools_SOURCE_DIR}/include +diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/comp/CMakeLists.txt SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/comp/CMakeLists.txt +--- SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/comp/CMakeLists.txt 2017-09-01 22:28:22.000000000 +0200 ++++ SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/comp/CMakeLists.txt 2017-10-13 10:06:25.958201827 +0200 +@@ -12,7 +12,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-add_library(SPIRV-Tools-comp markv_codec.cpp) ++add_library(SPIRV-Tools-comp STATIC markv_codec.cpp) + + spvtools_default_compile_options(SPIRV-Tools-comp) + target_include_directories(SPIRV-Tools-comp +diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/opt/CMakeLists.txt SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/opt/CMakeLists.txt +--- SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/opt/CMakeLists.txt 2017-09-01 22:28:22.000000000 +0200 ++++ SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/opt/CMakeLists.txt 2017-10-13 10:06:42.471288632 +0200 +@@ -11,7 +11,7 @@ + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +-add_library(SPIRV-Tools-opt ++add_library(SPIRV-Tools-opt STATIC + aggressive_dead_code_elim_pass.h + basic_block.h + block_merge_pass.h diff --git a/vulkan.spec b/vulkan.spec index 46b6800..7e0b418 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -1,3 +1,5 @@ +%global __requires_exclude ^libVkLayer_utils.so + %global srcname Vulkan-LoaderAndValidationLayers %global commit1 3a21c880500eac21cdf79bef5b80f970a55ac6af @@ -11,7 +13,7 @@ Name: vulkan Version: 1.0.61.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -22,7 +24,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: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch +Patch2: SPIRV-Tools_staticlib.patch +Patch3: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch BuildRequires: gcc-c++ BuildRequires: bison @@ -50,6 +53,13 @@ devices from PCs and consoles to mobile phones and embedded platforms. This package contains the reference ICD loader and validation layers for Vulkan. +%package demos +Summary: Vulkan demo package +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description demos +Vulkan demo package contains vulkaninfo and vulkan-smoketest. + %package devel Summary: Vulkan development package Requires: %{name}%{?_isa} = %{version}-%{release} @@ -65,12 +75,20 @@ BuildArch: noarch Filesystem for Vulkan. %prep -%autosetup -p1 -n %{srcname}-sdk-%{version} +%setup -q -n %{srcname}-sdk-%{version} +%patch0 -p1 +%patch1 -p1 +%patch3 -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 tar -xf %{SOURCE2} -C external/spirv-tools/external/spirv-headers --strip 1 tar -xf %{SOURCE3} -C external/spirv-tools --strip 1 + +pushd external/spirv-tools +%patch2 -p1 +popd + # fix spurious-executable-perm chmod 0644 README.md chmod 0644 external/glslang/SPIRV/spirv.hpp @@ -126,12 +144,14 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %files %license LICENSE.txt COPYRIGHT.txt %doc README.md CONTRIBUTING.md -%{_bindir}/vulkaninfo -%{_bindir}/vulkan-smoketest %{_datadir}/vulkan/explicit_layer.d/*.json %{_libdir}/libVkLayer_*.so %{_libdir}/libvulkan.so.* +%files demos +%{_bindir}/vulkaninfo +%{_bindir}/vulkan-smoketest + %files devel %{_includedir}/vulkan/ %{_libdir}/pkgconfig/vulkan.pc @@ -148,6 +168,10 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Oct 31 2017 Leigh Scott - 1.0.61.1-4 +- Fix vulkan requires +- Move demos to sub-package + * Tue Oct 31 2017 Leigh Scott - 1.0.61.1-3 - Remove epel conditionals - Remove vulkan git conditionals From 34cf4a00677881ed58a589ce15de5ea80dea56fc Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 31 Oct 2017 17:43:44 +0000 Subject: [PATCH 09/35] Add small compile fix --- glslang-default-resource-limits_staticlib.patch | 9 +++++++++ vulkan.spec | 14 ++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 glslang-default-resource-limits_staticlib.patch 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 From 5035fb22e4aadf346fba160ff0d7c7c33eccee5a Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 7 Nov 2017 18:10:52 +0000 Subject: [PATCH 10/35] readd rhel conditionals --- vulkan.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index 8eff77a..23ea75f 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -34,17 +34,23 @@ BuildRequires: cmake3 BuildRequires: /usr/bin/chrpath BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pciaccess) +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python3 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) +%else +BuildRequires: python34 +%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xrandr) Requires: vulkan-filesystem = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} > 7 Recommends: mesa-vulkan-drivers +%endif %description Vulkan is a new generation graphics and compute API that provides @@ -120,7 +126,11 @@ pushd build/ -DCMAKE_SKIP_RPATH:BOOL=yes \ -DBUILD_VKJSON=OFF \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ - -DBUILD_WSI_MIR_SUPPORT=OFF .. + -DBUILD_WSI_MIR_SUPPORT=OFF \ +%if 0%{?rhel} + -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ +%endif +.. %make_build popd From 473d4438e16fe5b4eb2cc3ea7d55b254e0076982 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 16 Nov 2017 08:24:06 -0600 Subject: [PATCH 11/35] Additional spec file conditional fix --- vulkan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 23ea75f..c590509 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -13,7 +13,7 @@ Name: vulkan Version: 1.0.61.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -127,7 +127,7 @@ pushd build/ -DBUILD_VKJSON=OFF \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ -DBUILD_WSI_MIR_SUPPORT=OFF \ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ %endif .. @@ -181,6 +181,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Thu Nov 16 2017 Merlin Mathesius - 1.0.61.1-6 +- Additional spec file conditional fix + * Tue Oct 31 2017 Leigh Scott - 1.0.61.1-5 - Add small compile fix From 0eeaa694f937f31cf2de195b68d2154029327830 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 22 Nov 2017 09:08:22 +0000 Subject: [PATCH 12/35] Redo conditionals --- vulkan.spec | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index c590509..cfceafc 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -1,3 +1,9 @@ +%if 0%{?rhel} && 0%{?rhel} <= 7 +%global _wayland OFF +%else +%global _wayland ON +%endif + %global __requires_exclude ^libVkLayer_utils.so %global srcname Vulkan-LoaderAndValidationLayers @@ -13,7 +19,7 @@ Name: vulkan Version: 1.0.61.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -32,25 +38,20 @@ BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 BuildRequires: /usr/bin/chrpath +BuildRequires: python%{python3_pkgversion} BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pciaccess) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xrandr) %if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python3 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) -%else -BuildRequires: python34 -%endif -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xrandr) - -Requires: vulkan-filesystem = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} > 7 Recommends: mesa-vulkan-drivers %endif +Requires: vulkan-filesystem = %{version}-%{release} %description Vulkan is a new generation graphics and compute API that provides @@ -111,7 +112,8 @@ sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} %build pushd external/glslang/build/ -%cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install .. +%cmake3 -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=./install .. %make_build make install popd @@ -123,14 +125,11 @@ popd pushd build/ %cmake3 -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH:BOOL=yes \ - -DBUILD_VKJSON=OFF \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ - -DBUILD_WSI_MIR_SUPPORT=OFF \ -%if 0%{?rhel} && 0%{?rhel} <= 7 - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -%endif -.. + -DCMAKE_SKIP_RPATH:BOOL=yes \ + -DBUILD_VKJSON=OFF \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ + -DBUILD_WSI_MIR_SUPPORT=OFF \ + -DBUILD_WSI_WAYLAND_SUPPORT=%{_wayland} .. %make_build popd @@ -181,6 +180,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Wed Nov 22 2017 Leigh Scott - 1.0.61.1-7 +- Redo conditionals + * Thu Nov 16 2017 Merlin Mathesius - 1.0.61.1-6 - Additional spec file conditional fix From 9e72cd25c5f46bf9b337a43080a962ba830ebcf9 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Dec 2017 01:41:09 +0000 Subject: [PATCH 13/35] Update to 1.0.65.1 --- 0003-layers-Don-t-set-an-rpath.patch | 2 +- 0008-demos-Don-t-build-tri-or-cube.patch | 4 +-- SPIRV-Tools_staticlib.patch | 31 +++++++++---------- fix_x86_TEXTREL.patch | 23 -------------- ...ng-default-resource-limits_staticlib.patch | 4 +-- sources | 8 ++--- vulkan.spec | 18 ++++++----- 7 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 fix_x86_TEXTREL.patch diff --git a/0003-layers-Don-t-set-an-rpath.patch b/0003-layers-Don-t-set-an-rpath.patch index edab110..2dc28b5 100644 --- a/0003-layers-Don-t-set-an-rpath.patch +++ b/0003-layers-Don-t-set-an-rpath.patch @@ -1,6 +1,6 @@ --- a/tests/layers/CMakeLists.txt +++ b/tests/layers/CMakeLists.txt -@@ -4,9 +4,6 @@ +@@ -5,9 +5,6 @@ VkLayer_device_profile_api VkLayer_test ) diff --git a/0008-demos-Don-t-build-tri-or-cube.patch b/0008-demos-Don-t-build-tri-or-cube.patch index 82ff259..ceae302 100644 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ b/0008-demos-Don-t-build-tri-or-cube.patch @@ -1,6 +1,6 @@ --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -63,46 +63,6 @@ +@@ -70,46 +70,6 @@ else() endif() @@ -47,7 +47,7 @@ if(WIN32) include_directories ( -@@ -116,38 +76,6 @@ +@@ -123,38 +83,6 @@ add_executable(${API_LOWERCASE}info vulkaninfo.c) target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) diff --git a/SPIRV-Tools_staticlib.patch b/SPIRV-Tools_staticlib.patch index 2e4a184..02bbcbc 100644 --- a/SPIRV-Tools_staticlib.patch +++ b/SPIRV-Tools_staticlib.patch @@ -1,7 +1,6 @@ -diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/CMakeLists.txt SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/CMakeLists.txt ---- SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/CMakeLists.txt 2017-09-01 22:28:22.000000000 +0200 -+++ SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/CMakeLists.txt 2017-10-13 10:06:17.033675656 +0200 -@@ -282,7 +282,7 @@ set_source_files_properties( +--- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/CMakeLists.txt ++++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/CMakeLists.txt +@@ -287,7 +287,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/software_version.cpp PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") @@ -10,21 +9,21 @@ diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/CMakeList spvtools_default_compile_options(${SPIRV_TOOLS}) target_include_directories(${SPIRV_TOOLS} PUBLIC ${spirv-tools_SOURCE_DIR}/include -diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/comp/CMakeLists.txt SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/comp/CMakeLists.txt ---- SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/comp/CMakeLists.txt 2017-09-01 22:28:22.000000000 +0200 -+++ SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/comp/CMakeLists.txt 2017-10-13 10:06:25.958201827 +0200 -@@ -12,7 +12,7 @@ - # See the License for the specific language governing permissions and + +--- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/comp/CMakeLists.txt ++++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/comp/CMakeLists.txt +@@ -13,7 +13,7 @@ # limitations under the License. --add_library(SPIRV-Tools-comp markv_codec.cpp) -+add_library(SPIRV-Tools-comp STATIC markv_codec.cpp) + if(SPIRV_BUILD_COMPRESSION) +- add_library(SPIRV-Tools-comp markv_codec.cpp) ++ add_library(SPIRV-Tools-comp STATIC markv_codec.cpp) - spvtools_default_compile_options(SPIRV-Tools-comp) - target_include_directories(SPIRV-Tools-comp -diff -rupN SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/opt/CMakeLists.txt SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/opt/CMakeLists.txt ---- SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23/source/opt/CMakeLists.txt 2017-09-01 22:28:22.000000000 +0200 -+++ SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23-new/source/opt/CMakeLists.txt 2017-10-13 10:06:42.471288632 +0200 + spvtools_default_compile_options(SPIRV-Tools-comp) + target_include_directories(SPIRV-Tools-comp + +--- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/opt/CMakeLists.txt ++++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/opt/CMakeLists.txt @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and diff --git a/fix_x86_TEXTREL.patch b/fix_x86_TEXTREL.patch deleted file mode 100644 index 877db23..0000000 --- a/fix_x86_TEXTREL.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 560f9cdf78d3d03dbf97be638becd1a7df5fa154 Mon Sep 17 00:00:00 2001 -From: Lenny Komow -Date: Fri, 6 Oct 2017 11:13:15 -0600 -Subject: [PATCH] loader: Fix TEXTREL on 32-bit linux loader - -Change-Id: I5fc568ce0ad17c280c484f37b2797eead08169b3 ---- - loader/unknown_ext_chain_gas.asm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm -index 798760bd8..aca92ea5b 100644 ---- a/loader/unknown_ext_chain_gas.asm -+++ b/loader/unknown_ext_chain_gas.asm -@@ -89,7 +89,7 @@ vkPhysDevExtTermin\num: - terminError\num: - mov eax, [eax + INSTANCE_OFFSET_ICD_TERM] # Load the loader_instance into eax - push [eax + (HASH_OFFSET_INSTANCE + (HASH_SIZE * \num) + FUNC_NAME_OFFSET_HASH)] # Push the func name (fifth arg) -- push offset termin_error_string # Push the error string (fourth arg) -+ push offset termin_error_string@GOT # Push the error string (fourth arg) - push 0 # Push zero (third arg) - push VK_DEBUG_REPORT_ERROR_BIT_EXT # Push the error logging bit (second arg) - push eax # Push the loader_instance (first arg) diff --git a/glslang-default-resource-limits_staticlib.patch b/glslang-default-resource-limits_staticlib.patch index 73992e5..0bd0446 100644 --- a/glslang-default-resource-limits_staticlib.patch +++ b/glslang-default-resource-limits_staticlib.patch @@ -1,5 +1,5 @@ ---- glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af/StandAlone/CMakeLists.txt -+++ glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af-new/StandAlone/CMakeLists.txt +--- glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a/StandAlone/CMakeLists.txt ++++ glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a-new/StandAlone/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(glslang-default-resource-limits +add_library(glslang-default-resource-limits STATIC diff --git a/sources b/sources index 3aa693a..790062e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.61.1.tar.gz) = e16599ca458dc1c636c80a03693edc4a24563e08768de95e7711cd7927d7cfdcd0ce14d16d938ca066bfe4ce8fe43836d2b61973bc2a7ba6ad14ab5f18166e0e -SHA512 (glslang-3a21c880500eac21cdf79bef5b80f970a55ac6af.tar.gz) = a6b2f589d432015d3830027dee377350529bec9c339a8de24aa52bab5ca52b3e17e2163d3bd1a7d91f7a08c446ebfe86d64bbbbae5a23af831d2e0cb724f7418 -SHA512 (SPIRV-Headers-2bb92e6fe2c6aa410152fc6c63443f452acb1a65.tar.gz) = cdd1437a67c7e31e2062e5d0f25c767b99a3fadd64b91d00c3b07404e535bb4bfd78a43878ebbcd45e013a7153f1a2c969da99d50a99cc39efab940d0aab7cfd -SHA512 (SPIRV-Tools-7e2d26c77b606b21af839b37fd21381c4a669f23.tar.gz) = 67e8fcdcb9748df1e7c86bb50358a89b656f80a96534bc5771afc4ce22e9ebcc8ca382f784fab7b856324d487f810c21abaaab2facee7453c0343a9b51d7e60b +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1.tar.gz) = 7f82ecb9760a50345bc50c10de28ae3f989b660a9f9c6d74a93b92d661b5efa41c2e72c84ff98a6dbed239d23754501332579fe963c2b38fad5b19c9f8f8de51 +SHA512 (glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a.tar.gz) = 9c46249cf2addb31833fcf3b1ce47458b8d339f86e6a5896ed8511d8b8e48dfcf65d2e4b7291593d47161f1c23a82e5f42fc2bbcf33e2383e9b0bd951f092924 +SHA512 (SPIRV-Headers-061097878467b8e040fbf153a837d844ef9f9f96.tar.gz) = 2717a16dc4f490fd93fd155f292f4dd2685a1085cfa964b53d860a03d24375bcc01b297a791bd06f85a25895e9415f6be8fdbdc3fa1d43f751024e1c71d9bd2e +SHA512 (SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f.tar.gz) = fbaa8445c4c6deedd6dcec14f266feb414f1e0da694270a5b2821b4b59ba61e207839cd66d9144ebf2c3c28719d53125b884b8d7039db20db55fc2694befdd6d diff --git a/vulkan.spec b/vulkan.spec index cfceafc..5d0fd96 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -8,18 +8,18 @@ %global srcname Vulkan-LoaderAndValidationLayers -%global commit1 3a21c880500eac21cdf79bef5b80f970a55ac6af +%global commit1 715c353a15836e5ae192a64a4cf54e2ce7e8d66a %global srcname1 glslang -%global commit2 2bb92e6fe2c6aa410152fc6c63443f452acb1a65 +%global commit2 061097878467b8e040fbf153a837d844ef9f9f96 %global srcname2 SPIRV-Headers -%global commit3 7e2d26c77b606b21af839b37fd21381c4a669f23 +%global commit3 5834719fc17d4735fce0102738b87b70255cfd5f %global srcname3 SPIRV-Tools Name: vulkan -Version: 1.0.61.1 -Release: 7%{?dist} +Version: 1.0.65.1 +Release: 1%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -32,7 +32,6 @@ 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: glslang-default-resource-limits_staticlib.patch -Patch4: %url/%{srcname}/commit/560f9cdf78d3d03dbf97be638becd1a7df5fa154.patch#/fix_x86_TEXTREL.patch BuildRequires: gcc-c++ BuildRequires: bison @@ -86,7 +85,6 @@ Filesystem for Vulkan. %setup -q -n %{srcname}-sdk-%{version} %patch0 -p1 %patch1 -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 @@ -136,6 +134,7 @@ popd %install pushd build/ %make_install +install -p -m 0755 icd/libVkICD_mock_icd.so %{buildroot}%{_libdir}/libVkICD_mock_icd.so popd @@ -157,6 +156,8 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %license LICENSE.txt COPYRIGHT.txt %doc README.md CONTRIBUTING.md %{_datadir}/vulkan/explicit_layer.d/*.json +%{_datadir}/vulkan/icd.d/VkICD_mock_icd.json +%{_libdir}/libVkICD_mock_icd.so %{_libdir}/libVkLayer_*.so %{_libdir}/libvulkan.so.* @@ -180,6 +181,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Dec 19 2017 Leigh Scott - 1.0.65.1-1 +- Update to 1.0.65.1 + * Wed Nov 22 2017 Leigh Scott - 1.0.61.1-7 - Redo conditionals From 94cde24b3a7bbeac491ca9b0fc0bf2a4f8f0c653 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Dec 2017 18:58:01 +0000 Subject: [PATCH 14/35] Move VkICD_mock to devel --- vulkan.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 5d0fd96..28c4240 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -19,7 +19,7 @@ Name: vulkan Version: 1.0.65.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -156,8 +156,6 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %license LICENSE.txt COPYRIGHT.txt %doc README.md CONTRIBUTING.md %{_datadir}/vulkan/explicit_layer.d/*.json -%{_datadir}/vulkan/icd.d/VkICD_mock_icd.json -%{_libdir}/libVkICD_mock_icd.so %{_libdir}/libVkLayer_*.so %{_libdir}/libvulkan.so.* @@ -169,6 +167,8 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %{_includedir}/vulkan/ %{_libdir}/pkgconfig/vulkan.pc %{_libdir}/libvulkan.so +%{_libdir}/libVkICD_mock_icd.so +%{_datadir}/vulkan/icd.d/VkICD_mock_icd.json %files filesystem %dir %{_sysconfdir}/vulkan/ @@ -181,6 +181,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Dec 19 2017 Leigh Scott - 1.0.65.1-2 +- Move VkICD_mock to devel + * Tue Dec 19 2017 Leigh Scott - 1.0.65.1-1 - Update to 1.0.65.1 From d787689453d5acbe684df5ad5d6dbd6993993a37 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 2 Jan 2018 23:50:55 +0000 Subject: [PATCH 15/35] Add build require glslang-devel, spirv-tools-devel and spirv-headers-devel --- SPIRV-Tools_staticlib.patch | 35 ------------- ...ng-default-resource-limits_staticlib.patch | 9 ---- sources | 3 -- vulkan.spec | 49 +++---------------- 4 files changed, 8 insertions(+), 88 deletions(-) delete mode 100644 SPIRV-Tools_staticlib.patch delete mode 100644 glslang-default-resource-limits_staticlib.patch diff --git a/SPIRV-Tools_staticlib.patch b/SPIRV-Tools_staticlib.patch deleted file mode 100644 index 02bbcbc..0000000 --- a/SPIRV-Tools_staticlib.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/CMakeLists.txt -@@ -287,7 +287,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/software_version.cpp - PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") - --add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+add_library(${SPIRV_TOOLS} STATIC ${SPIRV_SOURCES}) - spvtools_default_compile_options(${SPIRV_TOOLS}) - target_include_directories(${SPIRV_TOOLS} - PUBLIC ${spirv-tools_SOURCE_DIR}/include - ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/comp/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/comp/CMakeLists.txt -@@ -13,7 +13,7 @@ - # limitations under the License. - - if(SPIRV_BUILD_COMPRESSION) -- add_library(SPIRV-Tools-comp markv_codec.cpp) -+ add_library(SPIRV-Tools-comp STATIC markv_codec.cpp) - - spvtools_default_compile_options(SPIRV-Tools-comp) - target_include_directories(SPIRV-Tools-comp - ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/opt/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/opt/CMakeLists.txt -@@ -11,7 +11,7 @@ - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. --add_library(SPIRV-Tools-opt -+add_library(SPIRV-Tools-opt STATIC - aggressive_dead_code_elim_pass.h - basic_block.h - block_merge_pass.h diff --git a/glslang-default-resource-limits_staticlib.patch b/glslang-default-resource-limits_staticlib.patch deleted file mode 100644 index 0bd0446..0000000 --- a/glslang-default-resource-limits_staticlib.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a/StandAlone/CMakeLists.txt -+++ glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a-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/sources b/sources index 790062e..54a1956 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1.tar.gz) = 7f82ecb9760a50345bc50c10de28ae3f989b660a9f9c6d74a93b92d661b5efa41c2e72c84ff98a6dbed239d23754501332579fe963c2b38fad5b19c9f8f8de51 -SHA512 (glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a.tar.gz) = 9c46249cf2addb31833fcf3b1ce47458b8d339f86e6a5896ed8511d8b8e48dfcf65d2e4b7291593d47161f1c23a82e5f42fc2bbcf33e2383e9b0bd951f092924 -SHA512 (SPIRV-Headers-061097878467b8e040fbf153a837d844ef9f9f96.tar.gz) = 2717a16dc4f490fd93fd155f292f4dd2685a1085cfa964b53d860a03d24375bcc01b297a791bd06f85a25895e9415f6be8fdbdc3fa1d43f751024e1c71d9bd2e -SHA512 (SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f.tar.gz) = fbaa8445c4c6deedd6dcec14f266feb414f1e0da694270a5b2821b4b59ba61e207839cd66d9144ebf2c3c28719d53125b884b8d7039db20db55fc2694befdd6d diff --git a/vulkan.spec b/vulkan.spec index 28c4240..661542a 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -8,36 +8,24 @@ %global srcname Vulkan-LoaderAndValidationLayers -%global commit1 715c353a15836e5ae192a64a4cf54e2ce7e8d66a -%global srcname1 glslang - -%global commit2 061097878467b8e040fbf153a837d844ef9f9f96 -%global srcname2 SPIRV-Headers - -%global commit3 5834719fc17d4735fce0102738b87b70255cfd5f -%global srcname3 SPIRV-Tools - Name: vulkan Version: 1.0.65.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup Source0: %url/%{srcname}/archive/sdk-%{version}.tar.gz#/%{srcname}-sdk-%{version}.tar.gz -Source1: %url/%{srcname1}/archive/%{commit1}.tar.gz#/%{srcname1}-%{commit1}.tar.gz -Source2: %url/%{srcname2}/archive/%{commit2}.tar.gz#/%{srcname2}-%{commit2}.tar.gz -Source3: %url/%{srcname3}/archive/%{commit3}.tar.gz#/%{srcname3}-%{commit3}.tar.gz - 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: glslang-default-resource-limits_staticlib.patch BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 BuildRequires: /usr/bin/chrpath BuildRequires: python%{python3_pkgversion} +BuildRequires: glslang-devel +BuildRequires: spirv-headers-devel +BuildRequires: spirv-tools-devel BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pciaccess) BuildRequires: pkgconfig(x11) @@ -86,21 +74,8 @@ Filesystem for Vulkan. %patch0 -p1 %patch1 -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 -tar -xf %{SOURCE2} -C external/spirv-tools/external/spirv-headers --strip 1 -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 -chmod 0644 external/glslang/SPIRV/spirv.hpp # fix wrong-script-end-of-line-encoding sed -i 's/\r//' README.md @@ -109,18 +84,7 @@ sed -i 's/\r//' README.md sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} %build -pushd external/glslang/build/ -%cmake3 -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=./install .. -%make_build -make install -popd - -pushd external/spirv-tools/build/ -%cmake3 -DCMAKE_BUILD_TYPE=Release .. -%make_build -popd - +mkdir -p build/ pushd build/ %cmake3 -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH:BOOL=yes \ @@ -181,6 +145,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Jan 02 2018 Leigh Scott - 1.0.65.1-3 +- Add build require glslang-devel, spirv-tools-devel and spirv-headers-devel + * Tue Dec 19 2017 Leigh Scott - 1.0.65.1-2 - Move VkICD_mock to devel From 7d3df2cd68e709943ec3e8dce22360f8077dcc9b Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 9 Jan 2018 07:44:13 +0000 Subject: [PATCH 16/35] Update to 1.0.65.2 --- sources | 2 +- vulkan.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 54a1956..3fb768e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1.tar.gz) = 7f82ecb9760a50345bc50c10de28ae3f989b660a9f9c6d74a93b92d661b5efa41c2e72c84ff98a6dbed239d23754501332579fe963c2b38fad5b19c9f8f8de51 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.65.2.tar.gz) = 646f0c4e7a0bd5888eb70f9592b880c7f1ec58ceb082deee6a0ae1398b2178a52bbfbdb5fd6bc71a59ed4e4d76c62b369ac45cee039c9f24115cba22025f9c57 diff --git a/vulkan.spec b/vulkan.spec index 661542a..14255c3 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,8 +9,8 @@ %global srcname Vulkan-LoaderAndValidationLayers Name: vulkan -Version: 1.0.65.1 -Release: 3%{?dist} +Version: 1.0.65.2 +Release: 1%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -98,7 +98,6 @@ popd %install pushd build/ %make_install -install -p -m 0755 icd/libVkICD_mock_icd.so %{buildroot}%{_libdir}/libVkICD_mock_icd.so popd @@ -131,8 +130,6 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %{_includedir}/vulkan/ %{_libdir}/pkgconfig/vulkan.pc %{_libdir}/libvulkan.so -%{_libdir}/libVkICD_mock_icd.so -%{_datadir}/vulkan/icd.d/VkICD_mock_icd.json %files filesystem %dir %{_sysconfdir}/vulkan/ @@ -145,6 +142,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Jan 09 2018 Leigh Scott - 1.0.65.2-1 +- Update to 1.0.65.2 + * Tue Jan 02 2018 Leigh Scott - 1.0.65.1-3 - Add build require glslang-devel, spirv-tools-devel and spirv-headers-devel From 12822843a07661f8f395ce5803167372cc1ceec1 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 8 Feb 2018 15:39:47 +0000 Subject: [PATCH 17/35] Use ninja to build --- vulkan.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 14255c3..2891720 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.0.65.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -21,6 +21,7 @@ Patch1: 0008-demos-Don-t-build-tri-or-cube.patch BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 +BuildRequires: ninja-build BuildRequires: /usr/bin/chrpath BuildRequires: python%{python3_pkgversion} BuildRequires: glslang-devel @@ -91,13 +92,14 @@ pushd build/ -DBUILD_VKJSON=OFF \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ -DBUILD_WSI_MIR_SUPPORT=OFF \ - -DBUILD_WSI_WAYLAND_SUPPORT=%{_wayland} .. -%make_build + -DBUILD_WSI_WAYLAND_SUPPORT=%{_wayland} \ + -GNinja .. +%ninja_build popd %install pushd build/ -%make_install +%ninja_install popd @@ -112,8 +114,7 @@ mv %{buildroot}%{_bindir}/smoketest %{buildroot}%{_bindir}/vulkan-smoketest # remove RPATH chrpath -d %{buildroot}%{_bindir}/vulkaninfo -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.txt COPYRIGHT.txt @@ -142,6 +143,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Thu Feb 08 2018 Leigh Scott - 1.0.65.2-2 +- Use ninja to build + * Tue Jan 09 2018 Leigh Scott - 1.0.65.2-1 - Update to 1.0.65.2 From 6594918d22074ad8be8a01877daf29cbf5ec2bb1 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Feb 2018 22:30:19 +0000 Subject: [PATCH 18/35] Split libs into -libs subpackage --- 0008-demos-Don-t-build-tri-or-cube.patch | 71 +++++++++++++----------- vulkan.spec | 23 ++++---- 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/0008-demos-Don-t-build-tri-or-cube.patch b/0008-demos-Don-t-build-tri-or-cube.patch index ceae302..539328a 100644 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ b/0008-demos-Don-t-build-tri-or-cube.patch @@ -1,9 +1,15 @@ --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -70,46 +70,6 @@ - else() - endif() +@@ -64,53 +64,6 @@ + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + if(WIN32) +- set (LIBRARIES "${API_LOWERCASE}-${MAJOR}") +-elseif(UNIX) +- set (LIBRARIES "${API_LOWERCASE}") +-else() +-endif() +- -if(WIN32) - # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory. - # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the @@ -22,38 +28,40 @@ - endif() - endforeach() - -- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv -- COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert -- DEPENDS cube.vert ${GLSLANG_VALIDATOR} -- ) -- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv -- COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag -- DEPENDS cube.frag ${GLSLANG_VALIDATOR} -- ) - file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) - file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) --else() -- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) -- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv -- COMMAND ${GLSLANG_VALIDATOR} -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert -- DEPENDS cube.vert ${GLSLANG_VALIDATOR} -- ) -- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv -- COMMAND ${GLSLANG_VALIDATOR} -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag -- DEPENDS cube.frag ${GLSLANG_VALIDATOR} -- ) -- endif() -endif() - - if(WIN32) +- +-add_custom_command( +- COMMENT "Compiling cube demo vertex shader" +- OUTPUT cube.vert.inc +- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.vert.inc ${PROJECT_SOURCE_DIR}/demos/cube.vert +- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/demos/cube.vert +- DEPENDS ${PROJECT_SOURCE_DIR}/demos/cube.vert ${GLSLANG_VALIDATOR} +-) +-add_custom_command( +- COMMENT "Compiling cube demo fragment shader" +- OUTPUT cube.frag.inc +- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.frag.inc ${PROJECT_SOURCE_DIR}/demos/cube.frag +- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/demos/cube.frag +- DEPENDS ${PROJECT_SOURCE_DIR}/demos/cube.frag ${GLSLANG_VALIDATOR} +-) +- +-include_directories(${CMAKE_CURRENT_BINARY_DIR}) +- +- +-if(WIN32) include_directories ( -@@ -123,38 +83,6 @@ + "${PROJECT_SOURCE_DIR}/icd/common" + ) +@@ -121,38 +74,6 @@ + add_executable(${API_LOWERCASE}info vulkaninfo.c) target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) - +- -if(NOT WIN32) - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) -- add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) +- add_executable(cube cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(cube ${LIBRARIES}) - endif() -else() @@ -63,13 +71,13 @@ - set (LIB_DIR "Win32") - endif() - -- add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) +- add_executable(cube WIN32 cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(cube ${LIBRARIES}) -endif() - -if(NOT WIN32) - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) -- add_executable(cubepp cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) +- add_executable(cubepp cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(cubepp ${LIBRARIES}) - endif() -else() @@ -79,11 +87,10 @@ - set (LIB_DIR "Win32") - endif() - -- add_executable(cubepp WIN32 cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) +- add_executable(cubepp WIN32 cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(cubepp ${LIBRARIES}) -endif() -- + if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})) if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Android")) - add_subdirectory(smoke) diff --git a/vulkan.spec b/vulkan.spec index 2891720..58ee478 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,14 +9,17 @@ %global srcname Vulkan-LoaderAndValidationLayers Name: vulkan -Version: 1.0.65.2 -Release: 2%{?dist} +Version: 1.0.68.0 +Release: 1%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup Source0: %url/%{srcname}/archive/sdk-%{version}.tar.gz#/%{srcname}-sdk-%{version}.tar.gz -Patch0: 0003-layers-Don-t-set-an-rpath.patch -Patch1: 0008-demos-Don-t-build-tri-or-cube.patch +# Edit spirv_tools_commit_id.h to match spirv-tools commit id +Source1: spirv_tools_commit_id.h +Patch0: cmake_spirv_tools_commit.patch +Patch1: 0003-layers-Don-t-set-an-rpath.patch +Patch2: 0008-demos-Don-t-build-tri-or-cube.patch BuildRequires: gcc-c++ BuildRequires: bison @@ -74,6 +77,8 @@ Filesystem for Vulkan. %setup -q -n %{srcname}-sdk-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +cp %{SOURCE1} . # fix spurious-executable-perm chmod 0644 README.md @@ -85,22 +90,17 @@ sed -i 's/\r//' README.md sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} %build -mkdir -p build/ -pushd build/ %cmake3 -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH:BOOL=yes \ -DBUILD_VKJSON=OFF \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ -DBUILD_WSI_MIR_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=%{_wayland} \ - -GNinja .. + -GNinja %ninja_build -popd %install -pushd build/ %ninja_install -popd # create the filesystem @@ -143,6 +143,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Fri Feb 09 2018 Leigh Scott - 1.0.68.0-1 +- Update to 1.0.68.0 + * Thu Feb 08 2018 Leigh Scott - 1.0.65.2-2 - Use ninja to build From ee63313b3a96552a9e37c589a5ca81790bdeeffe Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Feb 2018 22:37:16 +0000 Subject: [PATCH 19/35] Update to 1.0.68.0 --- cmake_spirv_tools_commit.patch | 8 ++++++++ sources | 2 +- spirv_tools_commit_id.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 cmake_spirv_tools_commit.patch create mode 100644 spirv_tools_commit_id.h diff --git a/cmake_spirv_tools_commit.patch b/cmake_spirv_tools_commit.patch new file mode 100644 index 0000000..392e646 --- /dev/null +++ b/cmake_spirv_tools_commit.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -357,7 +356,6 @@ + run_vk_xml_generate(helper_file_generator.py vk_object_types.h) + run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) +-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) + diff --git a/sources b/sources index 3fb768e..1125e45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.65.2.tar.gz) = 646f0c4e7a0bd5888eb70f9592b880c7f1ec58ceb082deee6a0ae1398b2178a52bbfbdb5fd6bc71a59ed4e4d76c62b369ac45cee039c9f24115cba22025f9c57 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.68.0.tar.gz) = a814152a5bcb9d11d1ec9dab32b0a0681fc839c642502d3b499194a134abafb5c3ee66ba3a536c26bbd45c26a48fcf00b343da657f5ffffd7536c99ba04117f3 diff --git a/spirv_tools_commit_id.h b/spirv_tools_commit_id.h new file mode 100644 index 0000000..051aa6a --- /dev/null +++ b/spirv_tools_commit_id.h @@ -0,0 +1,29 @@ +// *** THIS FILE IS GENERATED - DO NOT EDIT *** +// See external_revision_generator.py for modifications + +/*************************************************************************** + * + * Copyright (c) 2015-2017 The Khronos Group Inc. + * Copyright (c) 2015-2017 Valve Corporation + * Copyright (c) 2015-2017 LunarG, Inc. + * Copyright (c) 2015-2017 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Author: Chris Forbes + * Author: Cort Stratton + * + ****************************************************************************/ +#pragma once + +#define SPIRV_TOOLS_COMMIT_ID "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8" From dd85b9c41fbad3cd721f6fcf35c6240d27c1dba4 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Feb 2018 22:48:03 +0000 Subject: [PATCH 20/35] Use versioned build requires for spirv-tools --- vulkan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index 58ee478..912ea0e 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -29,7 +29,7 @@ BuildRequires: /usr/bin/chrpath BuildRequires: python%{python3_pkgversion} BuildRequires: glslang-devel BuildRequires: spirv-headers-devel -BuildRequires: spirv-tools-devel +BuildRequires: pkgconfig(SPIRV-Tools) = 2018.1.0 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pciaccess) BuildRequires: pkgconfig(x11) From fd42476b4051b12ec007edf1ec384df1cd76aba1 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 10 Feb 2018 00:07:19 +0000 Subject: [PATCH 21/35] Add version for spirv-tool-libs requires --- vulkan.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vulkan.spec b/vulkan.spec index 912ea0e..9312f49 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -43,6 +43,7 @@ BuildRequires: pkgconfig(wayland-egl) Recommends: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} +Requires: spirv-tools-libs = 2018.1.0 %description Vulkan is a new generation graphics and compute API that provides From dc83bd13946a9161948c4b5d6e9e9aeb2b24f31f Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 10 Feb 2018 07:31:31 +0000 Subject: [PATCH 22/35] Add isa --- vulkan.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 9312f49..d2785cc 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -43,7 +43,7 @@ BuildRequires: pkgconfig(wayland-egl) Recommends: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} -Requires: spirv-tools-libs = 2018.1.0 +Requires: spirv-tools-libs%{?_isa} = 2018.1.0 %description Vulkan is a new generation graphics and compute API that provides @@ -55,7 +55,7 @@ Vulkan. %package demos Summary: Vulkan demo package -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}24917628 = %{version}-%{release} %description demos Vulkan demo package contains vulkaninfo and vulkan-smoketest. From 5063cde13610b27a84d24ed1aa0bd5b790a03256 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 10 Feb 2018 10:25:01 +0000 Subject: [PATCH 23/35] Fix broken isa --- vulkan.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index d2785cc..7dfcf3f 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.0.68.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -55,7 +55,7 @@ Vulkan. %package demos Summary: Vulkan demo package -Requires: %{name}24917628 = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description demos Vulkan demo package contains vulkaninfo and vulkan-smoketest. @@ -144,6 +144,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Sat Feb 10 2018 Leigh Scott - 1.0.68.0-2 +- Fix broken isa + * Fri Feb 09 2018 Leigh Scott - 1.0.68.0-1 - Update to 1.0.68.0 From 08f52943fe6ac803d97f840b7231953c022ed123 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 8 Mar 2018 00:37:53 +0000 Subject: [PATCH 24/35] Update to 1.1.70.0 --- 0008-demos-Don-t-build-tri-or-cube.patch | 19 ++++++------------- sources | 2 +- vulkan.spec | 7 +++++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/0008-demos-Don-t-build-tri-or-cube.patch b/0008-demos-Don-t-build-tri-or-cube.patch index 539328a..2f7b82c 100644 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ b/0008-demos-Don-t-build-tri-or-cube.patch @@ -1,16 +1,9 @@ --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -64,53 +64,6 @@ - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +@@ -92,46 +92,6 @@ + endif() if(WIN32) -- set (LIBRARIES "${API_LOWERCASE}-${MAJOR}") --elseif(UNIX) -- set (LIBRARIES "${API_LOWERCASE}") --else() --endif() -- --if(WIN32) - # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory. - # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the - # appropriate data at build time. @@ -51,10 +44,10 @@ - - -if(WIN32) - include_directories ( - "${PROJECT_SOURCE_DIR}/icd/common" - ) -@@ -121,38 +74,6 @@ + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES") + endif() +@@ -142,38 +102,6 @@ add_executable(${API_LOWERCASE}info vulkaninfo.c) target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) diff --git a/sources b/sources index 1125e45..57db8a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.68.0.tar.gz) = a814152a5bcb9d11d1ec9dab32b0a0681fc839c642502d3b499194a134abafb5c3ee66ba3a536c26bbd45c26a48fcf00b343da657f5ffffd7536c99ba04117f3 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.1.70.0.tar.gz) = ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26 diff --git a/vulkan.spec b/vulkan.spec index 7dfcf3f..41f183a 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,8 +9,8 @@ %global srcname Vulkan-LoaderAndValidationLayers Name: vulkan -Version: 1.0.68.0 -Release: 2%{?dist} +Version: 1.1.70.0 +Release: 1%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -144,6 +144,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Thu Mar 08 2018 Leigh Scott - 1.1.70.0-1 +- Update to 1.1.70.0 + * Sat Feb 10 2018 Leigh Scott - 1.0.68.0-2 - Fix broken isa From 03b55633cd472ba86d0ef8df3f882bfea3e1219f Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 24 Apr 2018 11:23:52 +0100 Subject: [PATCH 25/35] Update to 1.1.73.0 --- 0008-demos-Don-t-build-tri-or-cube.patch | 25 ++++++++++++++++-------- cmake_spirv_tools_commit.patch | 8 ++++++-- sources | 2 +- spirv_tools_commit_id.h | 2 +- vulkan.spec | 10 +++++++--- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/0008-demos-Don-t-build-tri-or-cube.patch b/0008-demos-Don-t-build-tri-or-cube.patch index 2f7b82c..94f292e 100644 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ b/0008-demos-Don-t-build-tri-or-cube.patch @@ -1,6 +1,6 @@ --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -92,46 +92,6 @@ +@@ -94,46 +94,6 @@ endif() if(WIN32) @@ -47,12 +47,16 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES") endif() -@@ -142,38 +102,6 @@ +@@ -173,47 +133,6 @@ + endif() + endif() - add_executable(${API_LOWERCASE}info vulkaninfo.c) - target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) +-###################################################################################### +-# cube - --if(NOT WIN32) +-if(APPLE) +- include(macOS/cube/cube.cmake) +-elseif(NOT WIN32) - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) - add_executable(cube cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(cube ${LIBRARIES}) @@ -68,7 +72,12 @@ - target_link_libraries(cube ${LIBRARIES}) -endif() - --if(NOT WIN32) +-###################################################################################### +-# cubepp +- +-if(APPLE) +- include(macOS/cubepp/cubepp.cmake) +-elseif(NOT WIN32) - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) - add_executable(cubepp cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(cubepp ${LIBRARIES}) @@ -84,6 +93,6 @@ - target_link_libraries(cubepp ${LIBRARIES}) -endif() - if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})) - if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Android")) + ###################################################################################### + # smoke diff --git a/cmake_spirv_tools_commit.patch b/cmake_spirv_tools_commit.patch index 392e646..047acf3 100644 --- a/cmake_spirv_tools_commit.patch +++ b/cmake_spirv_tools_commit.patch @@ -1,8 +1,12 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -357,7 +356,6 @@ +@@ -380,9 +380,6 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h) run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) --run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) +-if(BUILD_LAYERS) +- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) +-endif() + + diff --git a/sources b/sources index 57db8a5..93b49e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.1.70.0.tar.gz) = ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0.tar.gz) = 609cef72369265dbae467cbd9677416e62715119140e6e0a74a593d7d00a723fe265344e180e099af46fb92204d494fbb975ba1c9490261b676709fb7dce5d09 diff --git a/spirv_tools_commit_id.h b/spirv_tools_commit_id.h index 051aa6a..c4269ad 100644 --- a/spirv_tools_commit_id.h +++ b/spirv_tools_commit_id.h @@ -26,4 +26,4 @@ ****************************************************************************/ #pragma once -#define SPIRV_TOOLS_COMMIT_ID "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8" +#define SPIRV_TOOLS_COMMIT_ID "26a698c34788bb69123a1f3789970a16cf4d9641" diff --git a/vulkan.spec b/vulkan.spec index 41f183a..f1303f4 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ %global srcname Vulkan-LoaderAndValidationLayers Name: vulkan -Version: 1.1.70.0 +Version: 1.1.73.0 Release: 1%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 @@ -29,7 +29,7 @@ BuildRequires: /usr/bin/chrpath BuildRequires: python%{python3_pkgversion} BuildRequires: glslang-devel BuildRequires: spirv-headers-devel -BuildRequires: pkgconfig(SPIRV-Tools) = 2018.1.0 +BuildRequires: pkgconfig(SPIRV-Tools) = 2018.3.0 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pciaccess) BuildRequires: pkgconfig(x11) @@ -43,7 +43,7 @@ BuildRequires: pkgconfig(wayland-egl) Recommends: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} -Requires: spirv-tools-libs%{?_isa} = 2018.1.0 +Requires: spirv-tools-libs%{?_isa} = 2018.3.0 %description Vulkan is a new generation graphics and compute API that provides @@ -97,6 +97,7 @@ sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ -DBUILD_WSI_MIR_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=%{_wayland} \ + -DBUILD_TESTS=OFF \ -GNinja %ninja_build @@ -144,6 +145,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Tue Apr 24 2018 Leigh Scott - 1.1.73.0-1 +- Update to 1.1.73.0 + * Thu Mar 08 2018 Leigh Scott - 1.1.70.0-1 - Update to 1.1.70.0 From 8d660048adf95b1169201e974f95af08e59119e3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 24 Apr 2018 15:19:18 -0400 Subject: [PATCH 26/35] Update to 1.1.73.0 --- vulkan.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index f1303f4..f739ffa 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -5,9 +5,11 @@ %endif %global __requires_exclude ^libVkLayer_utils.so - %global srcname Vulkan-LoaderAndValidationLayers +# i686 at least will run out of address space... +%undefine _smp_mflags + Name: vulkan Version: 1.1.73.0 Release: 1%{?dist} From 31e1b4952e4343436ff0ccf83064e8c20cafd398 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 1 May 2018 15:11:53 -0400 Subject: [PATCH 27/35] Nope, that didn't help --- vulkan.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index f739ffa..c4e0250 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -7,9 +7,6 @@ %global __requires_exclude ^libVkLayer_utils.so %global srcname Vulkan-LoaderAndValidationLayers -# i686 at least will run out of address space... -%undefine _smp_mflags - Name: vulkan Version: 1.1.73.0 Release: 1%{?dist} From b538d843b78e6db0dcd9521f3bafed072057be22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 2 May 2018 13:48:30 +0200 Subject: [PATCH 28/35] workaround various OOM situations during build --- vulkan.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vulkan.spec b/vulkan.spec index c4e0250..83454e9 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -90,6 +90,13 @@ sed -i 's/\r//' README.md sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} %build +# Force serial build to workaround kernel OOM with multiple g++ processes running +%global _smp_mflags -j1 +%ifarch %{ix86} +# Decrease debuginfo verbosity to reduce memory consumption even more +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%endif + %cmake3 -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH:BOOL=yes \ -DBUILD_VKJSON=OFF \ From a578eb7bf4ba400ce5f73118f011593eae58678b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 13 Jun 2018 16:30:19 -0400 Subject: [PATCH 29/35] Change to Requires: mesa-vulkan-drivers. Too many things still don't agree what Recommends means, and they're even lighter-weight than the GL drivers which are already hard Requires. --- vulkan.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 83454e9..8eaa785 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -39,7 +39,7 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) -Recommends: mesa-vulkan-drivers +Requires: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} Requires: spirv-tools-libs%{?_isa} = 2018.3.0 @@ -151,6 +151,11 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Wed Jun 13 2018 Adam Jackson - 1.1.73.0-2 +- Change to Requires: mesa-vulkan-drivers. Too many things still don't agree + what Recommends means, and they're even lighter-weight than the GL drivers + which are already hard Requires. + * Tue Apr 24 2018 Leigh Scott - 1.1.73.0-1 - Update to 1.1.73.0 From ec4592aa5cbca73773bcd1e5baf81b763d8edd30 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 16 Jun 2018 15:12:24 +0100 Subject: [PATCH 30/35] Make vulkan x86 only to match vulkan drivers --- vulkan.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index 8eaa785..4acbe93 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -20,6 +20,9 @@ Patch0: cmake_spirv_tools_commit.patch Patch1: 0003-layers-Don-t-set-an-rpath.patch Patch2: 0008-demos-Don-t-build-tri-or-cube.patch +# mesa-vulkan-drivers and nvidia driver don't support other arch +ExclusiveArch: x86_64 i686 + BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 @@ -151,6 +154,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Sat Jun 16 2018 Leigh Scott - 1.1.73.0-3 +- Make vulkan x86 only to match vulkan drivers + * Wed Jun 13 2018 Adam Jackson - 1.1.73.0-2 - Change to Requires: mesa-vulkan-drivers. Too many things still don't agree what Recommends means, and they're even lighter-weight than the GL drivers From bac864740d844ba526184bf3dbcdabeb5f27a7d5 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 18 Jun 2018 12:41:02 -0400 Subject: [PATCH 31/35] Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. --- vulkan.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 4acbe93..e77e5f9 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -20,9 +20,6 @@ Patch0: cmake_spirv_tools_commit.patch Patch1: 0003-layers-Don-t-set-an-rpath.patch Patch2: 0008-demos-Don-t-build-tri-or-cube.patch -# mesa-vulkan-drivers and nvidia driver don't support other arch -ExclusiveArch: x86_64 i686 - BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 @@ -154,6 +151,10 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 +- Undo previous change. Mesa is wrong to not build radv for more arches, + and there's nothing x86-specific about this package, the Vulkan loader. + * Sat Jun 16 2018 Leigh Scott - 1.1.73.0-3 - Make vulkan x86 only to match vulkan drivers From ff0332e366bd20e904530932ce88ddd009b0de58 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 18 Jun 2018 19:52:26 +0100 Subject: [PATCH 32/35] Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! --- vulkan.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index e77e5f9..669e048 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -39,7 +39,6 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) -Requires: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} Requires: spirv-tools-libs%{?_isa} = 2018.3.0 @@ -151,6 +150,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 +- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! + * Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 - Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. From a64251b043cb3822106af357e462d9850535cf16 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Jun 2018 00:38:52 +0100 Subject: [PATCH 33/35] Revert "Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it!" This reverts commit ff0332e366bd20e904530932ce88ddd009b0de58. --- vulkan.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 669e048..e77e5f9 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 5%{?dist} +Release: 4%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -39,6 +39,7 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) +Requires: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} Requires: spirv-tools-libs%{?_isa} = 2018.3.0 @@ -150,9 +151,6 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog -* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 -- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! - * Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 - Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. From 4b5cf4dcd4245d121364c693ca98f0c3852144ce Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Jun 2018 00:42:57 +0100 Subject: [PATCH 34/35] Revert last commit --- vulkan.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index e77e5f9..ee7cdd9 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,7 +9,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -151,6 +151,12 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-6 +- Revert last commit + +* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 +- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! + * Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 - Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. From c5ab1daa670ee613cb2b38b44a908cd4444865bd Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 27 Jun 2018 18:41:26 +0100 Subject: [PATCH 35/35] Kronos split the source code --- .gitignore | 5 - 0003-layers-Don-t-set-an-rpath.patch | 13 - 0008-demos-Don-t-build-tri-or-cube.patch | 98 ------- cmake_spirv_tools_commit.patch | 12 - dead.package | 1 + sources | 1 - spirv_tools_commit_id.h | 29 -- vulkan.spec | 326 ----------------------- 8 files changed, 1 insertion(+), 484 deletions(-) delete mode 100644 .gitignore delete mode 100644 0003-layers-Don-t-set-an-rpath.patch delete mode 100644 0008-demos-Don-t-build-tri-or-cube.patch delete mode 100644 cmake_spirv_tools_commit.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 spirv_tools_commit_id.h delete mode 100644 vulkan.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 21aca76..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/SPIRV-Headers-*.tar.gz -/glslang-*.tar.gz -/SPIRV-Tools-*.tar.gz -/Vulkan-LoaderAndValidationLayers-sdk-*.tar.gz -/vulkan-*.src.rpm diff --git a/0003-layers-Don-t-set-an-rpath.patch b/0003-layers-Don-t-set-an-rpath.patch deleted file mode 100644 index 2dc28b5..0000000 --- a/0003-layers-Don-t-set-an-rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tests/layers/CMakeLists.txt -+++ b/tests/layers/CMakeLists.txt -@@ -5,9 +5,6 @@ - VkLayer_device_profile_api - VkLayer_test - ) -- --set(VK_LAYER_RPATH /usr/lib/x86_64-linux-gnu/vulkan/layer:/usr/lib/i386-linux-gnu/vulkan/layer) --set(CMAKE_INSTALL_RPATH ${VK_LAYER_RPATH}) - - if (WIN32) - if (NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)) - diff --git a/0008-demos-Don-t-build-tri-or-cube.patch b/0008-demos-Don-t-build-tri-or-cube.patch deleted file mode 100644 index 94f292e..0000000 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -94,46 +94,6 @@ - endif() - - if(WIN32) -- # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory. -- # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the -- # appropriate data at build time. -- if (CMAKE_CL_64) -- set (BUILDTGT_DIR build) -- else () -- set (BUILDTGT_DIR build32) -- endif() -- -- # Use static MSVCRT libraries -- foreach(configuration in CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO -- CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO) -- if(${configuration} MATCHES "/MD") -- string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}") -- endif() -- endforeach() -- -- file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) -- file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) --endif() -- --add_custom_command( -- COMMENT "Compiling cube demo vertex shader" -- OUTPUT cube.vert.inc -- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.vert.inc ${PROJECT_SOURCE_DIR}/demos/cube.vert -- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/demos/cube.vert -- DEPENDS ${PROJECT_SOURCE_DIR}/demos/cube.vert ${GLSLANG_VALIDATOR} --) --add_custom_command( -- COMMENT "Compiling cube demo fragment shader" -- OUTPUT cube.frag.inc -- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.frag.inc ${PROJECT_SOURCE_DIR}/demos/cube.frag -- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/demos/cube.frag -- DEPENDS ${PROJECT_SOURCE_DIR}/demos/cube.frag ${GLSLANG_VALIDATOR} --) -- --include_directories(${CMAKE_CURRENT_BINARY_DIR}) -- -- --if(WIN32) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES") - endif() -@@ -173,47 +133,6 @@ - endif() - endif() - --###################################################################################### --# cube -- --if(APPLE) -- include(macOS/cube/cube.cmake) --elseif(NOT WIN32) -- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) -- add_executable(cube cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) -- target_link_libraries(cube ${LIBRARIES}) -- endif() --else() -- if (CMAKE_CL_64) -- set (LIB_DIR "Win64") -- else() -- set (LIB_DIR "Win32") -- endif() -- -- add_executable(cube WIN32 cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) -- target_link_libraries(cube ${LIBRARIES}) --endif() -- --###################################################################################### --# cubepp -- --if(APPLE) -- include(macOS/cubepp/cubepp.cmake) --elseif(NOT WIN32) -- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) -- add_executable(cubepp cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) -- target_link_libraries(cubepp ${LIBRARIES}) -- endif() --else() -- if (CMAKE_CL_64) -- set (LIB_DIR "Win64") -- else() -- set (LIB_DIR "Win32") -- endif() -- -- add_executable(cubepp WIN32 cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc) -- target_link_libraries(cubepp ${LIBRARIES}) --endif() - - ###################################################################################### - # smoke - diff --git a/cmake_spirv_tools_commit.patch b/cmake_spirv_tools_commit.patch deleted file mode 100644 index 047acf3..0000000 --- a/cmake_spirv_tools_commit.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -380,9 +380,6 @@ - run_vk_xml_generate(helper_file_generator.py vk_object_types.h) - run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) --if(BUILD_LAYERS) -- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) --endif() - - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..be7dc56 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Kronos split the source code diff --git a/sources b/sources deleted file mode 100644 index 93b49e6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0.tar.gz) = 609cef72369265dbae467cbd9677416e62715119140e6e0a74a593d7d00a723fe265344e180e099af46fb92204d494fbb975ba1c9490261b676709fb7dce5d09 diff --git a/spirv_tools_commit_id.h b/spirv_tools_commit_id.h deleted file mode 100644 index c4269ad..0000000 --- a/spirv_tools_commit_id.h +++ /dev/null @@ -1,29 +0,0 @@ -// *** THIS FILE IS GENERATED - DO NOT EDIT *** -// See external_revision_generator.py for modifications - -/*************************************************************************** - * - * Copyright (c) 2015-2017 The Khronos Group Inc. - * Copyright (c) 2015-2017 Valve Corporation - * Copyright (c) 2015-2017 LunarG, Inc. - * Copyright (c) 2015-2017 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Author: Chris Forbes - * Author: Cort Stratton - * - ****************************************************************************/ -#pragma once - -#define SPIRV_TOOLS_COMMIT_ID "26a698c34788bb69123a1f3789970a16cf4d9641" diff --git a/vulkan.spec b/vulkan.spec deleted file mode 100644 index ee7cdd9..0000000 --- a/vulkan.spec +++ /dev/null @@ -1,326 +0,0 @@ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%global _wayland OFF -%else -%global _wayland ON -%endif - -%global __requires_exclude ^libVkLayer_utils.so -%global srcname Vulkan-LoaderAndValidationLayers - -Name: vulkan -Version: 1.1.73.0 -Release: 6%{?dist} -Summary: Vulkan loader and validation layers -License: ASL 2.0 -URL: https://github.com/KhronosGroup -Source0: %url/%{srcname}/archive/sdk-%{version}.tar.gz#/%{srcname}-sdk-%{version}.tar.gz -# Edit spirv_tools_commit_id.h to match spirv-tools commit id -Source1: spirv_tools_commit_id.h -Patch0: cmake_spirv_tools_commit.patch -Patch1: 0003-layers-Don-t-set-an-rpath.patch -Patch2: 0008-demos-Don-t-build-tri-or-cube.patch - -BuildRequires: gcc-c++ -BuildRequires: bison -BuildRequires: cmake3 -BuildRequires: ninja-build -BuildRequires: /usr/bin/chrpath -BuildRequires: python%{python3_pkgversion} -BuildRequires: glslang-devel -BuildRequires: spirv-headers-devel -BuildRequires: pkgconfig(SPIRV-Tools) = 2018.3.0 -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(pciaccess) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xrandr) -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wayland-egl) -Requires: mesa-vulkan-drivers -%endif -Requires: vulkan-filesystem = %{version}-%{release} -Requires: spirv-tools-libs%{?_isa} = 2018.3.0 - -%description -Vulkan is a new generation graphics and compute API that provides -high-efficiency, cross-platform access to modern GPUs used in a wide variety of -devices from PCs and consoles to mobile phones and embedded platforms. - -This package contains the reference ICD loader and validation layers for -Vulkan. - -%package demos -Summary: Vulkan demo package -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description demos -Vulkan demo package contains vulkaninfo and vulkan-smoketest. - -%package devel -Summary: Vulkan development package -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -Development headers for Vulkan applications. - -%package filesystem -Summary: Vulkan filesystem package -BuildArch: noarch - -%description filesystem -Filesystem for Vulkan. - -%prep -%setup -q -n %{srcname}-sdk-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -cp %{SOURCE1} . - -# fix spurious-executable-perm -chmod 0644 README.md - -# fix wrong-script-end-of-line-encoding -sed -i 's/\r//' README.md - -# sigh inttypes -sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} - -%build -# Force serial build to workaround kernel OOM with multiple g++ processes running -%global _smp_mflags -j1 -%ifarch %{ix86} -# Decrease debuginfo verbosity to reduce memory consumption even more -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif - -%cmake3 -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH:BOOL=yes \ - -DBUILD_VKJSON=OFF \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_datadir} \ - -DBUILD_WSI_MIR_SUPPORT=OFF \ - -DBUILD_WSI_WAYLAND_SUPPORT=%{_wayland} \ - -DBUILD_TESTS=OFF \ - -GNinja -%ninja_build - -%install -%ninja_install - - -# create the filesystem -mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ -%{buildroot}%{_datadir}/vulkan/{explicit,implicit}_layer.d/ \ -%{buildroot}{%{_sysconfdir},%{_datadir}}/vulkan/icd.d - -# rename smoketest -mv %{buildroot}%{_bindir}/smoketest %{buildroot}%{_bindir}/vulkan-smoketest - -# remove RPATH -chrpath -d %{buildroot}%{_bindir}/vulkaninfo - -%ldconfig_scriptlets - -%files -%license LICENSE.txt COPYRIGHT.txt -%doc README.md CONTRIBUTING.md -%{_datadir}/vulkan/explicit_layer.d/*.json -%{_libdir}/libVkLayer_*.so -%{_libdir}/libvulkan.so.* - -%files demos -%{_bindir}/vulkaninfo -%{_bindir}/vulkan-smoketest - -%files devel -%{_includedir}/vulkan/ -%{_libdir}/pkgconfig/vulkan.pc -%{_libdir}/libvulkan.so - -%files filesystem -%dir %{_sysconfdir}/vulkan/ -%dir %{_sysconfdir}/vulkan/explicit_layer.d/ -%dir %{_sysconfdir}/vulkan/icd.d/ -%dir %{_sysconfdir}/vulkan/implicit_layer.d/ -%dir %{_datadir}/vulkan/ -%dir %{_datadir}/vulkan/explicit_layer.d/ -%dir %{_datadir}/vulkan/icd.d/ -%dir %{_datadir}/vulkan/implicit_layer.d/ - -%changelog -* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-6 -- Revert last commit - -* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 -- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! - -* Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 -- Undo previous change. Mesa is wrong to not build radv for more arches, - and there's nothing x86-specific about this package, the Vulkan loader. - -* Sat Jun 16 2018 Leigh Scott - 1.1.73.0-3 -- Make vulkan x86 only to match vulkan drivers - -* Wed Jun 13 2018 Adam Jackson - 1.1.73.0-2 -- Change to Requires: mesa-vulkan-drivers. Too many things still don't agree - what Recommends means, and they're even lighter-weight than the GL drivers - which are already hard Requires. - -* Tue Apr 24 2018 Leigh Scott - 1.1.73.0-1 -- Update to 1.1.73.0 - -* Thu Mar 08 2018 Leigh Scott - 1.1.70.0-1 -- Update to 1.1.70.0 - -* Sat Feb 10 2018 Leigh Scott - 1.0.68.0-2 -- Fix broken isa - -* Fri Feb 09 2018 Leigh Scott - 1.0.68.0-1 -- Update to 1.0.68.0 - -* Thu Feb 08 2018 Leigh Scott - 1.0.65.2-2 -- Use ninja to build - -* Tue Jan 09 2018 Leigh Scott - 1.0.65.2-1 -- Update to 1.0.65.2 - -* Tue Jan 02 2018 Leigh Scott - 1.0.65.1-3 -- Add build require glslang-devel, spirv-tools-devel and spirv-headers-devel - -* Tue Dec 19 2017 Leigh Scott - 1.0.65.1-2 -- Move VkICD_mock to devel - -* Tue Dec 19 2017 Leigh Scott - 1.0.65.1-1 -- Update to 1.0.65.1 - -* Wed Nov 22 2017 Leigh Scott - 1.0.61.1-7 -- Redo conditionals - -* Thu Nov 16 2017 Merlin Mathesius - 1.0.61.1-6 -- Additional spec file conditional fix - -* 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 - -* Tue Oct 31 2017 Leigh Scott - 1.0.61.1-3 -- Remove epel conditionals -- Remove vulkan git conditionals -- Use cmake macro for everything - -* Fri Oct 06 2017 Leigh Scott - 1.0.61.1-2 -- Add upstream fix for 32bit TEXTREL issue (like anyone gives a damn) - -* Thu Sep 21 2017 Leigh Scott - 1.0.61.1-1 -- Update to 1.0.61.1 release (rhbz 1493425) - -* Tue Sep 19 2017 Leigh Scott - 1.0.61.0-1 -- Update to 1.0.61.0 release - -* Mon Aug 14 2017 Leigh Scott - 1.0.57.0-1 -- Update to 1.0.57.0 release - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.54.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.54.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jul 22 2017 Leigh Scott - 1.0.54.0-2 -- Cleanup cmake commands - -* Sat Jul 22 2017 Leigh Scott - 1.0.54.0-1 -- Update to 1.0.54.0 release -- Use build requires cmake3 for epel build -- Build layers for epel - -* Fri Jun 16 2017 Leigh Scott - 1.0.51.0-1 -- Update to 1.0.51.0 release - -* Mon May 15 2017 Fedora Release Engineering - 1.0.46.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Apr 14 2017 Leigh Scott - 1.0.46.0-2 -- Fix epel build - -* Fri Apr 14 2017 Leigh Scott - 1.0.46.0-1 -- Update to 1.0.46.0 release - -* Sat Apr 01 2017 Leigh Scott - 1.0.42.2-1 -- Update to 1.0.42.2 release - -* Fri Mar 03 2017 Leigh Scott - 1.0.42.0-1 -- Update to 1.0.42.0 release - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.39.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 31 2017 Leigh Scott - 1.0.39.1-1 -- Update to 1.0.39.1 release - -* Tue Jan 24 2017 Leigh Scott - 1.0.39.0-1 -- Update to 1.0.39.0 release -- Add build requires libXrandr-devel - -* Fri Dec 16 2016 leigh scott - 1.0.37.0-1 -- Update to 1.0.37.0 release -- Disable Mir as it's lame ubuntu rubbish - -* Fri Dec 02 2016 leigh scott - 1.0.34.0-0.1.gitd4cd34f -- Update to latest git - -* Thu Dec 01 2016 leigh scott - 1.0.30.0-2 -- Fix VkLayer undefined symbol: util_GetExtensionProperties - -* Sat Oct 15 2016 Leigh Scott - 1.0.30.0-1 -- Update to 1.0.30.0 release - -* Mon Oct 10 2016 Leigh Scott - 1.0.26.0-4 -- Build with wayland support (rhbz 1383115) - -* Tue Sep 27 2016 Leigh Scott - 1.0.26.0-3 -- Move unversioned libraries -- Disable vkjson build -- Fix license tag - -* Sun Sep 11 2016 Leigh Scott - 1.0.26.0-2 -- Make layers conditional. - -* Sun Sep 11 2016 Leigh Scott - 1.0.26.0-1 -- Update to 1.0.26.0 release - -* Thu Sep 08 2016 Leigh Scott - 1.0.26.0-0.3.gitfbb8667 -- Clean up - -* Thu Sep 08 2016 Leigh Scott - 1.0.26.0-0.2.gitfbb8667 -- Change build requires python3 -- Use release for cmake -- Make build verbose - -* Wed Sep 07 2016 Leigh Scott - 1.0.26.0-0.1.gitfbb8667 -- Update to latest git - -* Tue Feb 16 2016 Igor Gnatenko - 1.0.3-0.1.git1affe90 -- Add ldconfig in post/postun -- Use upstream tarball from commit + patches -- Fix versioning. In fact it was never released -- Fixup mixing of spaces/tabs -- Remove rpath from vulkaninfo -- Make filesystem subpkg noarch (it is really noarch) -- BuildRequire gcc and gcc-c++ explicitly -- Require main pkg with isa tag -- Fix perms and perm of README.md -- Use %%license tag - -* Tue Feb 16 2016 Adam Jackson - 1.0.3-0 -- Update loader to not build cube or tri. Drop bundled LunarGLASS and llvm - since they're only needed for those demos. - -* Tue Feb 16 2016 Adam Jackson - 1.0.3-0 -- Initial packaging