From 419ac036f7f3d6584dec448154c6e662f4c33321b4fabf7bce59ad4f8d256921 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 Mar 2023 10:00:40 +0000 Subject: [PATCH] - Split part of glslang-devel to glslang-nonstd-devel. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=110 --- glslang.changes | 1 + glslang.spec | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/glslang.changes b/glslang.changes index c2fc84b..1061ae2 100644 --- a/glslang.changes +++ b/glslang.changes @@ -9,6 +9,7 @@ Tue Mar 28 18:53:03 UTC 2023 - Enrico Belleri * Support InterlockedAdd on float types - Delete 0001-build-set-SOVERSION-on-all-libraries.patch: fixed upstream +- Split part of glslang-devel to glslang-nonstd-devel. ------------------------------------------------------------------- Sun Jan 29 12:53:11 UTC 2023 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 03fd177..035a068 100644 --- a/glslang.spec +++ b/glslang.spec @@ -65,6 +65,20 @@ range (IDs are not as tightly packed around zero), but will compress better when multiple modules are compressed together, since compressor's dictionary can find better cross module commonality. +%package nonstd-devel +Summary: Secondary set of header files for glslang +Group: Development/Libraries/C and C++ +Requires: %lname = %version +BuildArch: noarch + +%description nonstd-devel +glslang is a compiler front end for the OpenGL ES and OpenGL shading +languages. It implements a strict interpretation of the +specifications for these languages. + +This package contains additional headers that are not officially installed, +but which some downstream packages rely on. + %prep %autosetup -p1 @@ -77,14 +91,31 @@ echo "V_%version { global: *; };" >/tmp/z.sym %install %global _lto_cflags %_lto_cflags -ffat-lto-objects +od="$PWD" %cmake_install + b="%buildroot" +pushd "$b" +( + find usr/include -mindepth 1 -type d -printf "%%%%dir /%p\n" + find usr/include "(" -type f -o -type l ")" -printf "/%p\n" +) | sort >"$od/devel.files" +popd + mkdir -p "$b/%_includedir" cp -a SPIRV glslang "$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 "{}" "+" +pushd "$b" +( + find usr/include -mindepth 1 -type d -printf "%%%%dir /%p\n" + find usr/include "(" -type f -o -type l ")" -printf "/%p\n" +) | sort >"$od/devel_full.files" +popd +comm -13 "$od/devel.files" "$od/devel_full.files" >"$od/devel2.files" + # 3rd party programs use -lOGLCompiler (because pristine glslang shipped .a files), # so satisfy them under our shared build. for i in libOGLCompiler libOSDependent libGenericCodeGen libMachineIndependent; do @@ -100,7 +131,7 @@ done %files -n %lname %_libdir/*.so.12* -%files devel +%files devel -f devel.files %_bindir/gls* %_bindir/spirv* %_libdir/cmake/ @@ -113,6 +144,7 @@ done %_libdir/libSPIRV.so %_libdir/libSPVRemapper.so %_libdir/libglslang.so -%_includedir/* + +%files nonstd-devel -f devel2.files %changelog