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 edab110..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 -@@ -4,9 +4,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 82ff259..0000000 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -63,46 +63,6 @@ - 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. -- 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() -- -- 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) - include_directories ( -@@ -116,38 +76,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) -- 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 ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) -- 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) -- 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 ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) -- 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/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 bc7e86d..0000000 --- a/sources +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/vulkan.spec b/vulkan.spec deleted file mode 100644 index d4c15c9..0000000 --- a/vulkan.spec +++ /dev/null @@ -1,273 +0,0 @@ -%global use_git 0 - -%global commit d4cd34fd49caa759cf01cafa5fa271401b17c3b9 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global srcname Vulkan-LoaderAndValidationLayers - -%global commit1 9645f78293a59780b06ba93938bc46850b2c5b3c -%global srcname1 glslang - -%global commit2 661ad91124e6af2272afd00f804d8aa276e17107 -%global srcname2 SPIRV-Headers - -%global commit3 abc6f5a67288b50846b9ef5f21a8100edd36d7c8 -%global srcname3 SPIRV-Tools - -Name: vulkan -Version: 1.0.54.0 -%if 0%{?use_git} -Release: 0.2.git%{shortcommit}%{?dist} -%else -Release: 2%{?dist} -%endif -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 - -Patch0: 0003-layers-Don-t-set-an-rpath.patch -Patch1: 0008-demos-Don-t-build-tri-or-cube.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 -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 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 -%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 -tar -xf %{SOURCE2} -C external/spirv-tools/external/spirv-headers --strip 1 -tar -xf %{SOURCE3} -C external/spirv-tools --strip 1 -# 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 - -# sigh inttypes -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 .. -%make_build -make install -popd - -pushd external/spirv-tools/build/ -cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. -%make_build -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} - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -%endif - .. -%make_build -popd - -%install -pushd build/ -%{make_install} -popd - - -# 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 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%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 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 -* 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