forked from pool/glslang
Accepting request 1061875 from X11:Wayland
- Update to release 12 OBS-URL: https://build.opensuse.org/request/show/1061875 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b523e33a2b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162
|
||||
size 3658039
|
||||
3
12.0.0.tar.gz
Normal file
3
12.0.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7cb45842ec1d4b6ea775d624c3d2d8ba9450aa416b0482b0cc7e4fdd399c3d75
|
||||
size 3682791
|
||||
@ -1,69 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2022-10-25 02:00:05.861368368 +0200
|
||||
References: https://github.com/KhronosGroup/glslang/issues/3052
|
||||
|
||||
The ABI break in commit 11.12.0~18^2 causes programs to no longer run.
|
||||
Induce a SONAME change.
|
||||
---
|
||||
SPIRV/CMakeLists.txt | 2 ++
|
||||
StandAlone/CMakeLists.txt | 1 +
|
||||
glslang/CMakeLists.txt | 1 +
|
||||
hlsl/CMakeLists.txt | 1 +
|
||||
4 files changed, 5 insertions(+)
|
||||
|
||||
Index: glslang-11.13.0/SPIRV/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.13.0.orig/SPIRV/CMakeLists.txt
|
||||
+++ glslang-11.13.0/SPIRV/CMakeLists.txt
|
||||
@@ -72,6 +72,7 @@ set(SPVREMAP_HEADERS
|
||||
|
||||
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
|
||||
set_target_properties(SPIRV PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(SPIRV PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
target_include_directories(SPIRV PUBLIC
|
||||
@@ -83,6 +84,7 @@ glslang_add_build_info_dependency(SPIRV)
|
||||
if (ENABLE_SPVREMAPPER)
|
||||
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
||||
set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+ set_target_properties(SPVRemapper PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
Index: glslang-11.13.0/StandAlone/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.13.0.orig/StandAlone/CMakeLists.txt
|
||||
+++ glslang-11.13.0/StandAlone/CMakeLists.txt
|
||||
@@ -51,6 +51,7 @@ add_library(glslang-default-resource-lim
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp)
|
||||
set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(glslang-default-resource-limits PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
|
||||
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
Index: glslang-11.13.0/glslang/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.13.0.orig/glslang/CMakeLists.txt
|
||||
+++ glslang-11.13.0/glslang/CMakeLists.txt
|
||||
@@ -172,6 +172,7 @@ set_target_properties(glslang PROPERTIES
|
||||
POSITION_INDEPENDENT_CODE ON
|
||||
VERSION "${GLSLANG_VERSION}"
|
||||
SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(glslang PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
target_link_libraries(glslang PRIVATE OGLCompiler OSDependent MachineIndependent)
|
||||
target_include_directories(glslang PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
|
||||
Index: glslang-11.13.0/hlsl/CMakeLists.txt
|
||||
===================================================================
|
||||
--- glslang-11.13.0.orig/hlsl/CMakeLists.txt
|
||||
+++ glslang-11.13.0/hlsl/CMakeLists.txt
|
||||
@@ -41,6 +41,7 @@ add_library(HLSL ${LIB_TYPE} "stub.cpp")
|
||||
set_property(TARGET HLSL PROPERTY FOLDER hlsl)
|
||||
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
set_target_properties(HLSL PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
|
||||
+set_target_properties(HLSL PROPERTIES LINK_FLAGS "-Wl,--version-script=/tmp/z.sym")
|
||||
|
||||
if(WIN32 AND BUILD_SHARED_LIBS)
|
||||
set_target_properties(HLSL PROPERTIES PREFIX "")
|
||||
@ -1 +1 @@
|
||||
libglslang11
|
||||
libglslang12
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 29 12:53:11 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 12
|
||||
* Add support for GL_NV_shader_invocation_reorder.
|
||||
* Support extension ARB_bindless_texture.
|
||||
- Delete abibreak_bump.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 15 14:11:52 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
11
glslang.spec
11
glslang.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package glslang
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,9 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
%define lname libglslang11
|
||||
%define lname libglslang12
|
||||
Name: glslang
|
||||
Version: 11.13.0
|
||||
Version: 12.0.0
|
||||
Release: 0
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
License: BSD-3-Clause
|
||||
@ -28,7 +28,6 @@ URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
|
||||
Source: https://github.com/KhronosGroup/glslang/archive/%version.tar.gz
|
||||
Source3: baselibs.conf
|
||||
Patch1: 0001-build-set-SOVERSION-on-all-libraries.patch
|
||||
Patch2: abibreak_bump.diff
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: fdupes
|
||||
@ -78,7 +77,7 @@ echo "V_%version { global: *; };" >/tmp/z.sym
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
%global _lto_cflags %_lto_cflags -ffat-lto-objects
|
||||
%cmake_install
|
||||
b="%buildroot"
|
||||
mkdir -p "$b/%_includedir"
|
||||
@ -101,7 +100,7 @@ done
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files -n %lname
|
||||
%_libdir/*.so.11*
|
||||
%_libdir/*.so.12*
|
||||
|
||||
%files devel
|
||||
%_bindir/gls*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user