SHA256
1
0
forked from pool/glslang

Accepting request 1122948 from X11:Wayland

- 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/1122948
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=47
This commit is contained in:
Ana Guerrero 2023-11-03 21:19:24 +00:00 committed by Git OBS Bridge
commit 33a3947586
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 2 13:44:22 UTC 2023 - Hillwood Yang <hillwood@opensuse.org>
- 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 <jengelh@inai.de> Sun Oct 22 02:09:01 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -25,7 +25,7 @@ License: BSD-3-Clause
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
#Git-URL: https://github.com/KhronosGroup/glslang #Git-URL: https://github.com/KhronosGroup/glslang
Source: https://github.com/KhronosGroup/glslang/archive/%version.tar.gz Source: https://github.com/KhronosGroup/glslang/archive/refs/tags/%version.tar.gz
Source3: baselibs.conf Source3: baselibs.conf
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 3.14.0 BuildRequires: cmake >= 3.14.0
@ -112,8 +112,10 @@ pushd "$b"
) | sort >"$od/devel.files" ) | sort >"$od/devel.files"
popd popd
mkdir -p "$b/%_includedir" mkdir -p "$b/%_includedir/External/"
cp -a SPIRV StandAlone glslang "$b/%_includedir/" 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 find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete
ln -s SPIRV/spirv.hpp "$b/%_includedir/" ln -s SPIRV/spirv.hpp "$b/%_includedir/"
find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+"