From 493e1e35ea86a1c091b10a3a11d6a9fe991e03976baeece62804d8d1673cb745 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 11 Aug 2019 03:03:26 +0000 Subject: [PATCH 1/4] Accepting request 720447 from home:marxin:static Use FAT LTO objects in order to provide proper static library. OBS-URL: https://build.opensuse.org/request/show/720447 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=50 --- glslang.changes | 5 +++++ glslang.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/glslang.changes b/glslang.changes index f021823..99a485b 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 2 07:00:29 UTC 2019 - Martin Liška + +- Use FAT LTO objects in order to provide proper static library. + ------------------------------------------------------------------- Fri Jun 28 07:50:03 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index eb5f6e2..9c19bb4 100644 --- a/glslang.spec +++ b/glslang.spec @@ -72,12 +72,14 @@ compressor's dictionary can find better cross module commonality. %autosetup -p1 %build +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects # Trim -Wl,--no-undefined for now (https://github.com/KhronosGroup/glslang/issues/1484) %cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" make %{?_smp_mflags} %install -b="%buildroot" +b="%build +%global _lto_cflags %{_lto_cflags} -ffat-lto-objectsroot" %cmake_install mkdir -p "$b/%_includedir" cp -a SPIRV glslang "$b/%_includedir/" From b905058b0b6179cc2b928d97c0809a1328ac45dae330a34608df7c155485124e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 11 Aug 2019 11:55:21 +0000 Subject: [PATCH 2/4] fix broken submit rq720447 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=51 --- glslang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glslang.spec b/glslang.spec index 9c19bb4..ece16c2 100644 --- a/glslang.spec +++ b/glslang.spec @@ -78,9 +78,9 @@ compressor's dictionary can find better cross module commonality. make %{?_smp_mflags} %install -b="%build %global _lto_cflags %{_lto_cflags} -ffat-lto-objectsroot" %cmake_install +b="%buildroot" mkdir -p "$b/%_includedir" cp -a SPIRV glslang "$b/%_includedir/" find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete From d6cf431c608af1d55ef47a3fdc6ab7fb7f27677d0f721949d788f83217cce115 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 11 Aug 2019 12:03:10 +0000 Subject: [PATCH 3/4] same OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=52 --- glslang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glslang.spec b/glslang.spec index ece16c2..1b1cb37 100644 --- a/glslang.spec +++ b/glslang.spec @@ -78,7 +78,7 @@ compressor's dictionary can find better cross module commonality. make %{?_smp_mflags} %install -%global _lto_cflags %{_lto_cflags} -ffat-lto-objectsroot" +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %cmake_install b="%buildroot" mkdir -p "$b/%_includedir" From 7eb9f760d13c7bcb35deaa7bbd5a946bd339765f04af0d01f176f009276a8978 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Aug 2019 08:11:37 +0000 Subject: [PATCH 4/4] - Update to new upstream release 7.12.3352 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=53 --- _service | 8 ++++---- glslang-7.11.3276.git10.tar.xz | 3 --- glslang-7.12.3352.tar.xz | 3 +++ glslang.changes | 12 ++++++++++++ glslang.spec | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 glslang-7.11.3276.git10.tar.xz create mode 100644 glslang-7.12.3352.tar.xz diff --git a/_service b/_service index 4ba9dc4..7eb3818 100644 --- a/_service +++ b/_service @@ -1,11 +1,11 @@ git - git://github.com/KhronosGroup/glslang + https://github.com/KhronosGroup/glslang - 4162de4bbfc58ef37600c23e4e8fcf58e604f382 - 8e96e247fadd3b241fe4a5d081ebe1ad45f885bc - 7.11.3276.git@TAG_OFFSET@ + 7.12.3352 + 7.12.3352 + 7.12.3352 *.tar diff --git a/glslang-7.11.3276.git10.tar.xz b/glslang-7.11.3276.git10.tar.xz deleted file mode 100644 index c1f5755..0000000 --- a/glslang-7.11.3276.git10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:070b39ee22f73549e9dc7f157edf2363a0c3631da3cb431c046e9b4c40b9011e -size 1591316 diff --git a/glslang-7.12.3352.tar.xz b/glslang-7.12.3352.tar.xz new file mode 100644 index 0000000..f53811e --- /dev/null +++ b/glslang-7.12.3352.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48c61c85470d629df0254a0505022f6571b35ed4b823d16814a682e60773af35 +size 1602496 diff --git a/glslang.changes b/glslang.changes index 99a485b..a23fe7d 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Aug 21 07:23:09 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 7.12.3352 + * Add interface symbol and uniform symbol location auto mapping + for OpenGL shader. + * Handle SPIR-V type mismatch when constructing a composite. + * Implement GL_EXT_demote_to_helper_invocation. + * Avoid generating 8/16-bit constants when 8/16-bit arithmetic + extensions are not enabled. + * Add support for SPV_KHR_shader_clock. + ------------------------------------------------------------------- Fri Aug 2 07:00:29 UTC 2019 - Martin Liška diff --git a/glslang.spec b/glslang.spec index 1b1cb37..6c25947 100644 --- a/glslang.spec +++ b/glslang.spec @@ -16,11 +16,11 @@ # -%define version_unconverted 7.11.3276.git10 +%define version_unconverted 7.12.3352 %define lname libglslang-suse6 Name: glslang -Version: 7.11.3276.git10 +Version: 7.12.3352 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause