media-libs/libplacebo: drop USE=glslang in favour of shaderc

This been nothing but trouble and is not worth avoiding shaderc
over. In the event that both are available, upstream also defaults
to using shaderc and it is the more tested path.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

5 files changed, 13 insertions, 30 deletions

diff --git a/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch b/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch
deleted file mode 100644
index 81af061634b5..000000000000
--- a/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Quick workaround for libSPIRV seemingly having became a stub in glslang-1.3.296
-
-https://bugs.gentoo.org/941968
-
-TODO?: rather than worry with the constant issues with glslang, should likely
-always force shaderc -- it's also what upstream prefers by default and so the
-glslang paths are hardly tested.
---- a/src/glsl/meson.build
-+++ b/src/glsl/meson.build
-@@ -39,4 +39,5 @@
- 
-     glslang_deps += spirv
-+    glslang_deps += cxx.find_library('glslang', required: required, static: static)
- 
-     if static
-
diff --git a/media-libs/libplacebo/libplacebo-7.349.0.ebuild b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
index 10102b7a31a0..f372c4f8f1a7 100644
--- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,11 +38,11 @@ LICENSE="
 "
 SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname
 IUSE="
-	glslang +lcms libdovi llvm-libunwind +opengl +shaderc test
+	+lcms libdovi llvm-libunwind +opengl +shaderc test
 	unwind +vulkan +xxhash
 "
 RESTRICT="!test? ( test )"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+REQUIRED_USE="vulkan? ( shaderc )"
 
 # dlopen: libglvnd (glad)
 RDEPEND="
@@ -50,7 +50,6 @@ RDEPEND="
 	libdovi? ( media-libs/libdovi:=[${MULTILIB_USEDEP}] )
 	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] )
 	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
-	!shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
 	unwind? (
 		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
@@ -71,7 +70,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
 	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
-	"${FILESDIR}"/${PN}-7.349.0-glslang-1.3.296.patch
 )
 
 python_check_deps() {
@@ -112,10 +110,12 @@ multilib_src_configure() {
 		$(meson_use test tests)
 		$(meson_feature lcms)
 		$(meson_feature libdovi)
+		# glslang has a history of breaking things and shaderc
+		# is the build system preferred alternative if available
+		-Dglslang=disabled
 		$(meson_feature opengl)
 		$(meson_feature opengl gl-proc-addr)
 		$(meson_feature shaderc)
-		$(usex shaderc -Dglslang=disabled $(meson_feature glslang))
 		$(meson_feature unwind)
 		$(meson_feature vulkan)
 		$(meson_feature vulkan vk-proc-addr)
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 2055812a69ea..8cd5f8cf1458 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,11 +38,11 @@ LICENSE="
 "
 SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname
 IUSE="
-	glslang +lcms libdovi llvm-libunwind +opengl +shaderc test
+	+lcms libdovi llvm-libunwind +opengl +shaderc test
 	unwind +vulkan +xxhash
 "
 RESTRICT="!test? ( test )"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+REQUIRED_USE="vulkan? ( shaderc )"
 
 # dlopen: libglvnd (glad)
 RDEPEND="
@@ -50,7 +50,6 @@ RDEPEND="
 	libdovi? ( media-libs/libdovi:=[${MULTILIB_USEDEP}] )
 	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] )
 	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
-	!shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
 	unwind? (
 		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
@@ -71,7 +70,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
 	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
-	"${FILESDIR}"/${PN}-7.349.0-glslang-1.3.296.patch
 )
 
 python_check_deps() {
@@ -112,10 +110,12 @@ multilib_src_configure() {
 		$(meson_use test tests)
 		$(meson_feature lcms)
 		$(meson_feature libdovi)
+		# glslang has a history of breaking things and shaderc
+		# is the build system preferred alternative if available
+		-Dglslang=disabled
 		$(meson_feature opengl)
 		$(meson_feature opengl gl-proc-addr)
 		$(meson_feature shaderc)
-		$(usex shaderc -Dglslang=disabled $(meson_feature glslang))
 		$(meson_feature unwind)
 		$(meson_feature vulkan)
 		$(meson_feature vulkan vk-proc-addr)
diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml
index 745fe262d0bb..2f39703b8b06 100644
--- a/media-libs/libplacebo/metadata.xml
+++ b/media-libs/libplacebo/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Ionen Wolkens</name>
 	</maintainer>
 	<use>
-		<flag name="glslang">Use <pkg>dev-util/glslang</pkg> to compile GLSL</flag>
 		<flag name="lcms">Add support for color management via <pkg>media-libs/lcms</pkg></flag>
 		<flag name="libdovi">Use <pkg>media-libs/libdovi</pkg> to read Dolby Vision metadata</flag>
 		<flag name="shaderc">Use <pkg>media-libs/shaderc</pkg> to compile GLSL</flag>
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index d97b9aa2f142..1706428078a7 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -110,7 +110,7 @@ app-alternatives/ninja samurai
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-10-09)
 # Vulkan is not available here, including packages for related USE.
-media-libs/libplacebo glslang shaderc vulkan
+media-libs/libplacebo shaderc vulkan
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-10-08)
 # Vulkan is not available on hppa.