diff --git a/.gitignore b/.gitignore index b6c938d..1ad7659 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,40 @@ /Vulkan-Loader-sdk-1.1.85.0.tar.gz /sdk-1.1.92.tar.gz /Vulkan-Loader-sdk-1.1.92.0.tar.gz +/Vulkan-Loader-sdk-1.1.97.0.tar.gz +/Vulkan-Loader-sdk-1.1.101.0.tar.gz +/Vulkan-Loader-sdk-1.1.108.0.tar.gz +/Vulkan-Loader-sdk-1.1.114.0.tar.gz +/Vulkan-Loader-sdk-1.1.126.0.tar.gz +/Vulkan-Loader-sdk-1.2.131.1.tar.gz +/Vulkan-Loader-sdk-1.2.135.0.tar.gz +/Vulkan-Loader-sdk-1.2.148.0.tar.gz +/Vulkan-Loader-sdk-1.2.148.1.tar.gz +/Vulkan-Loader-sdk-1.2.154.1.tar.gz +/Vulkan-Loader-sdk-1.2.162.0.tar.gz +/Vulkan-Loader-sdk-1.2.176.0.tar.gz +/Vulkan-Loader-sdk-1.2.182.0.tar.gz +/Vulkan-Loader-sdk-1.2.189.0.tar.gz +/Vulkan-Loader-sdk-1.2.198.0.tar.gz +/Vulkan-Loader-sdk-1.3.204.0.tar.gz +/Vulkan-Loader-sdk-1.3.211.0.tar.gz +/Vulkan-Loader-sdk-1.3.216.0.tar.gz +/Vulkan-Loader-sdk-1.3.224.0.tar.gz +/Vulkan-Loader-sdk-1.3.231.1.tar.gz +/Vulkan-Loader-sdk-1.3.239.0.tar.gz +/Vulkan-Loader-sdk-1.3.243.0.tar.gz +/Vulkan-Loader-sdk-1.3.250.0.tar.gz +/Vulkan-Loader-sdk-1.3.261.1.tar.gz +/Vulkan-Loader-sdk-1.3.268.0.tar.gz +/Vulkan-Loader-sdk-1.3.275.0.tar.gz +/Vulkan-Loader-sdk-1.3.280.0.tar.gz +/Vulkan-Loader-sdk-1.3.283.0.tar.gz +/Vulkan-Loader-sdk-1.3.290.0.tar.gz +/Vulkan-Loader-sdk-1.3.296.0.tar.gz +/Vulkan-Loader-sdk-1.4.304.0.tar.gz +/Vulkan-Loader-sdk-1.4.309.0.tar.gz +/Vulkan-Loader-sdk-1.4.313.0.tar.gz +/Vulkan-Loader-sdk-1.4.321.0.tar.gz +/Vulkan-Loader-sdk-1.4.328.1.tar.gz +/Vulkan-Loader-sdk-1.4.341.0.tar.gz +/Vulkan-Loader-sdk-1.4.350.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..c337fb5 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,15 @@ +# packit config for vulkan-loader +# Build Stage 2 - depends on vulkan-headers + +jobs: + - job: koji_build + trigger: commit | koji_build + allowed_committers: [all_admins] + dist_git_branches: + - fedora-all + sidetag_group: vulkan-sdk-releases + dependencies: + - vulkan-headers + dependents: + - vulkan-utility-libraries + - vulkan-volk diff --git a/fix-vulkan-1.patch b/fix-vulkan-1.patch new file mode 100644 index 0000000..9da4b2f --- /dev/null +++ b/fix-vulkan-1.patch @@ -0,0 +1,26 @@ +From 7a313093b5c4af964d50a5a64e73d7df6152ea3f Mon Sep 17 00:00:00 2001 +From: Michel Zou +Date: Thu, 26 Nov 2020 22:12:58 +0100 +Subject: [PATCH] cmake: remove mingw lib prefix + +we want the dll to be named vulkan-1.dll and not libvulkan-1.dll +as it is the default on mingw (for drop-in replacement) +--- + loader/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt +index 7cc5fd71e..659511855 100644 +--- a/loader/CMakeLists.txt ++++ b/loader/CMakeLists.txt +@@ -224,7 +224,9 @@ if(WIN32) + PROPERTIES LINK_FLAGS_DEBUG + "/ignore:4098" + OUTPUT_NAME +- vulkan-1) ++ vulkan-1 ++ PREFIX ++ "") + target_link_libraries(vulkan Vulkan::Headers) + + if(ENABLE_WIN10_ONECORE) diff --git a/sources b/sources index 974244e..22021f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-Loader-sdk-1.1.92.0.tar.gz) = 957680ea25e16d41051847841093c055c9390eff8cd977eb0cd1ff3676094b7f490a970a0a5f218c8b71316ecb31935a3105e5a3aea927073765dcb7ffc4ddad +SHA512 (Vulkan-Loader-sdk-1.4.350.0.tar.gz) = 5d9829bed6e166b598e6769b6263c0d0408ba578c3e99b460e1ca2a5b13bd0ea38f315953f6ad74567fbd7025143050704b87e2ea11e6689c41675220e115ce1 diff --git a/vulkan-loader.spec b/vulkan-loader.spec index 7e9c0a1..41ee28d 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -1,15 +1,15 @@ Name: vulkan-loader -Version: 1.1.92.0 -Release: 1%{?dist} +Version: 1.4.350.0 +Release: %autorelease Summary: Vulkan ICD desktop loader -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/KhronosGroup/Vulkan-Loader -Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz +Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: ninja-build BuildRequires: python%{python3_pkgversion}-devel BuildRequires: vulkan-headers = %{version} @@ -26,13 +26,7 @@ Obsoletes: vulkan < %{version}-%{release} Provides: vulkan-filesystem = %{version}-%{release} Obsoletes: vulkan-filesystem < %{version}-%{release} -%if 0%{?fedora} <= 27 -%ifarch x86_64 i686 -Requires: mesa-vulkan-drivers%{?_isa} -%endif -%else -Requires: mesa-vulkan-drivers%{?_isa} -%endif +Recommends: mesa-vulkan-drivers%{?_isa} %description This project provides the Khronos official Vulkan ICD desktop @@ -52,16 +46,16 @@ developing applications that use %{name}. %prep -%autosetup -n Vulkan-Loader-sdk-%{version} +%autosetup -p1 -n Vulkan-Loader-vulkan-sdk-%{version} %build -%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release . -%ninja_build +%cmake -GNinja -DCMAKE_BUILD_TYPE=Release +%cmake_build %install -%ninja_install +%cmake_install # create the filesystem mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ @@ -73,7 +67,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ %files -%license LICENSE.txt COPYRIGHT.txt +%license LICENSE.txt %doc README.md CONTRIBUTING.md %dir %{_sysconfdir}/vulkan/ %dir %{_sysconfdir}/vulkan/explicit_layer.d/ @@ -88,30 +82,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ %files devel %{_libdir}/pkgconfig/vulkan.pc %{_libdir}/*.so - +%dir %{_libdir}/cmake/VulkanLoader/ +%{_libdir}/cmake/VulkanLoader/*.cmake %changelog -* Mon Dec 03 2018 Dave Airlie - 1.1.92.0-1 -- Update to 1.1.92.0 - -* Mon Nov 19 2018 Dave Airlie - 1.1.85.0-1 -- Update to 1.1.85.0 - -* Tue Aug 07 2018 Leigh Scott - 1.1.82.0-1 -- Update to 1.1.82.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.77.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 27 2018 Leigh Scott - 1.1.77.0-4 -- Fix update path - -* Tue Jun 26 2018 Leigh Scott - 1.1.77.0-3 -- Add conditional for mesa-vulkan-drivers requires - -* Tue Jun 26 2018 Leigh Scott - 1.1.77.0-2 -- Improve description and summary -- Set release - -* Sat Jun 23 2018 Leigh Scott - 1.1.77.0-1 -- Initial package +%autochangelog