From c0d1f152eaa039377dfcfb71cdc757a197e5bcb141420b80189eb521e9d13457 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 2 Nov 2023 17:22:58 +0000 Subject: [PATCH 1/2] Accepting request 1122756 from home:hillwood:branches:X11:Deepin:Factory - Fix include dirs for headers of SPIRV and StandAlone. According to the setting in %{_libdir}/cmake/glslang/glslang-targets.cmake, headers of SPIRV and StandAlone should be installed in %{_includedir}/External OBS-URL: https://build.opensuse.org/request/show/1122756 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=124 --- 13.1.1.tar.gz => glslang-13.1.1.tar.gz | 0 glslang.changes | 7 +++++++ glslang.spec | 8 +++++--- 3 files changed, 12 insertions(+), 3 deletions(-) rename 13.1.1.tar.gz => glslang-13.1.1.tar.gz (100%) diff --git a/13.1.1.tar.gz b/glslang-13.1.1.tar.gz similarity index 100% rename from 13.1.1.tar.gz rename to glslang-13.1.1.tar.gz diff --git a/glslang.changes b/glslang.changes index 1f580fb..e762efe 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 2 13:44:22 UTC 2023 - Hillwood Yang + +- Fix include dirs for headers of SPIRV and StandAlone. According to the setting + in %{_libdir}/cmake/glslang/glslang-targets.cmake, headers of SPIRV and + StandAlone should be installed in %{_includedir}/External + ------------------------------------------------------------------- Sun Oct 22 02:09:01 UTC 2023 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 4b1e86b..8bd1fd8 100644 --- a/glslang.spec +++ b/glslang.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ #Git-URL: https://github.com/KhronosGroup/glslang -Source: https://github.com/KhronosGroup/glslang/archive/%version.tar.gz +Source: https://github.com/KhronosGroup/glslang/archive/%version/%{name}-%{version}.tar.gz Source3: baselibs.conf BuildRequires: bison BuildRequires: cmake >= 3.14.0 @@ -112,8 +112,10 @@ pushd "$b" ) | sort >"$od/devel.files" popd -mkdir -p "$b/%_includedir" -cp -a SPIRV StandAlone glslang "$b/%_includedir/" +mkdir -p "$b/%_includedir/External/" +cp -a glslang "$b/%_includedir/" +cp -a SPIRV StandAlone "$b/%_includedir/External/" +ln -sf "%_includedir/External/SPIRV" "$b/%_includedir/" find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete ln -s SPIRV/spirv.hpp "$b/%_includedir/" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" From 9d5b3cfc866d7f9e47e17d107425e980326ae62e9cd9105f3cf5db2f898ce0fc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 2 Nov 2023 17:26:16 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=125 --- glslang-13.1.1.tar.gz => 13.1.1.tar.gz | 0 glslang.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename glslang-13.1.1.tar.gz => 13.1.1.tar.gz (100%) diff --git a/glslang-13.1.1.tar.gz b/13.1.1.tar.gz similarity index 100% rename from glslang-13.1.1.tar.gz rename to 13.1.1.tar.gz diff --git a/glslang.spec b/glslang.spec index 8bd1fd8..bf7126b 100644 --- a/glslang.spec +++ b/glslang.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ #Git-URL: https://github.com/KhronosGroup/glslang -Source: https://github.com/KhronosGroup/glslang/archive/%version/%{name}-%{version}.tar.gz +Source: https://github.com/KhronosGroup/glslang/archive/refs/tags/%version.tar.gz Source3: baselibs.conf BuildRequires: bison BuildRequires: cmake >= 3.14.0