commit:     6790faaf95b65351d3f0512f27a65287848dfcb9
Author:     Sergei Chernyadyev <serg.cherniadjev <AT> gmail <DOT> com>
AuthorDate: Mon Dec 19 20:10:06 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 21:39:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6790faaf

dev-util/glslang: Version bump

Signed-off-by: Sergei Chernyadyev <serg.cherniadjev <AT> gmail.com>
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 dev-util/glslang/Manifest                          |  1 +
 .../glslang-1.3.236-Install-static-libs.patch      | 39 ++++++++++++++++++++++
 dev-util/glslang/glslang-1.3.236.ebuild            | 37 ++++++++++++++++++++
 3 files changed, 77 insertions(+)

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index bb1609390d75..2d49fc095c50 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,3 +1,4 @@
 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 
0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8
 SHA512 
4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 
5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407
 SHA512 
d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
 DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 
3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19
 SHA512 
2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56
+DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 
7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b
 SHA512 
4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3

diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch 
b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
new file mode 100644
index 000000000000..826e0f6cd856
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
@@ -0,0 +1,39 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index b44cbc73..41f6de93 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(WIN32)
+     source_group("Source" FILES ${SOURCES})
+ endif(WIN32)
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OGLCompiler EXPORT glslang-targets)
+ 
+     # Backward compatibility
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index a8b14911..57ec1efd 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ 
################################################################################
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS glslang EXPORT glslang-targets)
+-    if(NOT BUILD_SHARED_LIBS)
++    if(BUILD_SHARED_LIBS)
+         install(TARGETS MachineIndependent EXPORT glslang-targets)
+         install(TARGETS GenericCodeGen EXPORT glslang-targets)
+ 
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt 
b/glslang/OSDependent/Unix/CMakeLists.txt
+index 16eb939b..959788dc 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -52,7 +52,7 @@ else()
+     target_link_libraries(OSDependent Threads::Threads)
+ endif()
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT glslang-targets)
+ 
+     # Backward compatibility

diff --git a/dev-util/glslang/glslang-1.3.236.ebuild 
b/dev-util/glslang/glslang-1.3.236.ebuild
new file mode 100644
index 000000000000..519eb9fd2b13
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.236.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+       EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git";
+       inherit git-r3
+else
+       SNAPSHOT_COMMIT="sdk-${PV}.0"
+       
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+       S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V 
generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ 
https://github.com/KhronosGroup/glslang";
+
+PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
+
+LICENSE="BSD"
+SLOT="0/1"
+
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DENABLE_PCH=OFF
+       )
+       cmake_src_configure
+}

Reply via email to