commit vulkan for openSUSE:Factory

Hello community, here is the log from the commit of package vulkan for openSUSE:Factory checked in at 2016-07-01 09:58:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan (Old) and /work/SRC/openSUSE:Factory/.vulkan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan" Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan/vulkan.changes 2016-03-26 15:22:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan.new/vulkan.changes 2016-07-01 09:58:17.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Jun 13 12:27:45 UTC 2016 - jengelh@inai.de + +- Update to new snapshot 1.0.3.g5493 +* Added helpers: getSwapchainNode(), getSwapchainFromImage(), + getImageNode(), getImageViewData(), getSamplerNode(), + getBufferViewInfo(), getBufferNode(). +- Resolve build failure stemming from new glslang version +- Add 0001-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch, + 0001-loader-Add-install-rule.patch, + 0001-vkjson-don-t-clobber-cflags-or-you-ll-lose-fPIC.patch. + These were in a prior tarball made from a Fedora git, + but we since switched to the upstream git. + +------------------------------------------------------------------- Old: ---- vulkan-1.0.3.g19.tar.xz New: ---- 0001-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch 0001-loader-Add-install-rule.patch 0001-vkjson-don-t-clobber-cflags-or-you-ll-lose-fPIC.patch Vulkan-LoaderAndValidationLayers-1.0.3.g5493.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan.spec ++++++ --- /var/tmp/diff_new_pack.AIiGZ0/_old 2016-07-01 09:58:18.000000000 +0200 +++ /var/tmp/diff_new_pack.AIiGZ0/_new 2016-07-01 09:58:18.000000000 +0200 @@ -16,16 +16,21 @@ # +%define version_unconverted 1.0.3.g5493 + Name: vulkan %define lname libvulkan1 -Version: 1.0.3.g19 +Version: 1.0.3.g5493 Release: 0 Summary: Vulkan loader and validation layers License: MIT Group: System/Libraries Url: http://www.khronos.org/ -Source: %name-%version.tar.xz +Source: Vulkan-LoaderAndValidationLayers-%version.tar.xz +Patch1: 0001-loader-Add-install-rule.patch +Patch2: 0001-vkjson-don-t-clobber-cflags-or-you-ll-lose-fPIC.patch +Patch3: 0001-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: cmake >= 2.8.11 @@ -34,7 +39,9 @@ BuildRequires: libpciaccess-devel BuildRequires: pkg-config BuildRequires: python3 +BuildRequires: spirv-tools-devel BuildRequires: systemd-devel +BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) %description @@ -73,7 +80,8 @@ to make use of Vulkan. %prep -%setup -qn Vulkan-LoaderAndValidationLayers +%setup -qn Vulkan-LoaderAndValidationLayers-%version +%patch -P 1 -P 2 -P 3 -p1 %build chmod a-x *.md *.txt @@ -81,8 +89,8 @@ mkdir -p ../glslang/install/bin ../glslang/build/install ln -sv /usr/bin/glslangValidator ../glslang/install/bin/ ln -Tsv "%_libdir" ../glslang/build/install/lib -%cmake -make %{?_smp_mflags} -j1 +%cmake -DSPIRV_TOOLS_LIB="%_libdir/libSPIRV-Tools-1.1.so" +make %{?_smp_mflags} %install b="%buildroot" @@ -112,7 +120,6 @@ %files -n libvulkan1 %defattr(-,root,root) %doc README.md LICENSE.txt -%_libdir/liblayer_utils.so %_libdir/libVkLayer*.so %_libdir/libvulkan.so.1* ++++++ 0001-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch ++++++ Origin https://github.com/nwnk/Vulkan-LoaderAndValidationLayers

From 991a05cc657345d24cb86658a2d3fbd25643bdb2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 10 Feb 2016 15:11:54 -0500 Subject: [PATCH] layers: Install to CMAKE_INSTALL_LIBDIR

Adapted for newer vulkan -jengelh@inai.de --- layers/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: Vulkan-LoaderAndValidationLayers-1.0.3.g5493/layers/CMakeLists.txt =================================================================== --- Vulkan-LoaderAndValidationLayers-1.0.3.g5493.orig/layers/CMakeLists.txt +++ Vulkan-LoaderAndValidationLayers-1.0.3.g5493/layers/CMakeLists.txt @@ -82,7 +82,7 @@ else() target_link_Libraries(VkLayer_${target} VkLayer_utils) add_dependencies(VkLayer_${target} generate_vk_layer_helpers) set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") - install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) + install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endmacro() endif() @@ -149,7 +149,7 @@ if (WIN32) add_library(VkLayer_utils STATIC vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) else() add_library(VkLayer_utils SHARED vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) - install(TARGETS VkLayer_utils DESTINATION ${PROJECT_BINARY_DIR}/install_staging) + install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() add_vk_layer(core_validation core_validation.cpp vk_layer_table.cpp vk_safe_struct.cpp descriptor_sets.cpp) ++++++ 0001-loader-Add-install-rule.patch ++++++ Origin https://github.com/nwnk/Vulkan-LoaderAndValidationLayers

From 68165bda903b68520c21dd132ebc23be0177b7f4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 10 Feb 2016 15:17:06 -0500 Subject: [PATCH] loader: Add install rule

--- loader/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) Index: Vulkan-LoaderAndValidationLayers-1.0.3.g5493/loader/CMakeLists.txt =================================================================== --- Vulkan-LoaderAndValidationLayers-1.0.3.g5493.orig/loader/CMakeLists.txt +++ Vulkan-LoaderAndValidationLayers-1.0.3.g5493/loader/CMakeLists.txt @@ -83,4 +83,5 @@ else() add_library(vulkan SHARED ${LOADER_SRCS}) set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.13") target_link_libraries(vulkan -ldl -lpthread -lm) + install(TARGETS vulkan DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() ++++++ 0001-vkjson-don-t-clobber-cflags-or-you-ll-lose-fPIC.patch ++++++ Origin https://github.com/nwnk/Vulkan-LoaderAndValidationLayers

From 03f5fbb50b90b90ee48be8797d328bb26dd3819a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 10 Feb 2016 14:08:17 -0500 Subject: [PATCH] vkjson: don't clobber cflags or you'll lose -fPIC

--- libs/vkjson/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt index b650609..387eafb 100644 --- a/libs/vkjson/CMakeLists.txt +++ b/libs/vkjson/CMakeLists.txt @@ -20,7 +20,7 @@ # THE SOFTWARE. if (NOT WIN32) - set (CMAKE_CXX_FLAGS "-std=c++11") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif() include_directories( ${CMAKE_CURRENT_SOURCE_DIR} -- 2.6.6 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.AIiGZ0/_old 2016-07-01 09:58:18.000000000 +0200 +++ /var/tmp/diff_new_pack.AIiGZ0/_new 2016-07-01 09:58:18.000000000 +0200 @@ -1,15 +1,16 @@ <services> - <service mode="disabled" name="tar_scm"> + <service name="tar_scm" mode="disabled"> <param name="scm">git</param> - <param name="url">https://github.com/nwnk/Vulkan-LoaderAndValidationLayers</param> - <param name="revision">sdk-1.0.3-fedora</param> - <param name="parent-tag">windows-rt-1.0.3.0</param> + <param name="url">https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers</param> + <param name="revision">e3382ac16bc50e271112504244fb79da31cd0919</param> + <param name="parent-tag">2220a3ba9bfa7f7599b608cc90f427275b9e130b</param> <param name="versionformat">1.0.3.g@TAG_OFFSET@</param> + <param name="exclude">windowsRuntimeInstaller</param> </service> - <service mode="disabled" name="recompress"> + <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service mode="disabled" name="set_version"/> + <service name="set_version" mode="disabled"/> <!-- remove directory windows*/ because of vcredist --> </services>