From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E48BD158020 for ; Tue, 8 Nov 2022 23:57:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E3F9E09CB; Tue, 8 Nov 2022 23:57:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB024E09CB for ; Tue, 8 Nov 2022 23:57:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 189FC340AC0 for ; Tue, 8 Nov 2022 23:57:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A78E66DF for ; Tue, 8 Nov 2022 23:57:24 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1667951787.5b3406b932a28470270a2b83993c1358d9d0a62a.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch dev-util/glslang/glslang-1.3.231-r1.ebuild dev-util/glslang/glslang-1.3.231.ebuild dev-util/glslang/glslang-9999.ebuild X-VCS-Directories: dev-util/glslang/ dev-util/glslang/files/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 5b3406b932a28470270a2b83993c1358d9d0a62a X-VCS-Branch: master Date: Tue, 8 Nov 2022 23:57:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ff341858-6392-46c5-a64f-10e9fb733fcc X-Archives-Hash: 0f023d596f10e769612066c70c795207 commit: 5b3406b932a28470270a2b83993c1358d9d0a62a Author: Nick Sarnie gentoo org> AuthorDate: Sat Nov 5 22:10:54 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue Nov 8 23:56:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3406b9 dev-util/glslang: Add subslot, install static libs Signed-off-by: Nick Sarnie gentoo.org> .../glslang-1.3.231-Install-static-libs.patch | 57 ++++++++++++++++++++++ ...ng-1.3.231.ebuild => glslang-1.3.231-r1.ebuild} | 4 +- dev-util/glslang/glslang-9999.ebuild | 4 +- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch new file mode 100644 index 000000000000..b7ed014d92b3 --- /dev/null +++ b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch @@ -0,0 +1,57 @@ +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 +@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) + message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OGLCompiler) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OGLCompiler ALIAS glslang::OGLCompiler) +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 +@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) + message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OSDependent) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OSDependent ALIAS glslang::OSDependent) diff --git a/dev-util/glslang/glslang-1.3.231.ebuild b/dev-util/glslang/glslang-1.3.231-r1.ebuild similarity index 92% rename from dev-util/glslang/glslang-1.3.231.ebuild rename to dev-util/glslang/glslang-1.3.231-r1.ebuild index a87aaeeb9345..dc652e36d9b8 100644 --- a/dev-util/glslang/glslang-1.3.231.ebuild +++ b/dev-util/glslang/glslang-1.3.231-r1.ebuild @@ -19,8 +19,10 @@ 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" +SLOT="0/1" BDEPEND="${PYTHON_DEPS}" diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild index a87aaeeb9345..1f9728bad96e 100644 --- a/dev-util/glslang/glslang-9999.ebuild +++ b/dev-util/glslang/glslang-9999.ebuild @@ -19,8 +19,10 @@ 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}/${PN}-1.3.231-Install-static-libs.patch" ) + LICENSE="BSD" -SLOT="0" +SLOT="0/1" BDEPEND="${PYTHON_DEPS}"