* [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/, media-libs/libplacebo/files/
@ 2022-11-07 19:30 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2022-11-07 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 9cdc7c96e725f66601c24233b332eeee68e1da84
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 10:54:40 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 19:27:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdc7c96
media-libs/libplacebo: add 5.229.1
With partly revamped ebuild, and:
* ensure use right python executble wrt bug #731728
* disable demos wrt bug #851927, there's little use in enabling
as only one of them gets installed by default and it's a very
barebone test video player
USE=glslang is now a no-op if shaderc is set, these provide
the same functionality and shaderc is the default pick upstream.
Previously, glslang would force disable shaderc even if set.
Alternatively could use REQUIRED_USE to prevent setting both
but feel this is mostly an annoyance.
Closes: https://bugs.gentoo.org/731728
Closes: https://bugs.gentoo.org/851927
Co-authored-by: Nick Sarnie <sarnex <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-libs/libplacebo/Manifest | 2 +
.../files/libplacebo-5.229.1-llvm-libunwind.patch | 9 +++
.../libplacebo-5.229.1-python-executable.patch | 11 +++
.../files/libplacebo-5.229.1-shared-glslang.patch | 12 +++
media-libs/libplacebo/libplacebo-5.229.1.ebuild | 91 ++++++++++++++++++++++
5 files changed, 125 insertions(+)
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index bee8111e1bb7..bb6d95b7a8aa 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1 +1,3 @@
+DIST libplacebo-glad-2.0.2.tar.gz 581059 BLAKE2B ce7f63ac1f9a6263d3de3f9c56f4a47b8bbdd1ac7eba875c7ad807ae923c8a82d7f323725af8b64adbbc30c2e014c6a5ed8b3325b7f15984222075874a68c0cf SHA512 c719bcd7a0aaa56d89158c9f347410b9e66466fb957a5a5f201b4cce21a0c1589d6d2a866e12134ed43435a5567d842fbfd134559dea1ca59a34b079ff6f5d37
DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525
+DIST libplacebo-v5.229.1.tar.gz 673121 BLAKE2B 0a59e16b4565b10b222c5a5a8e607670bd4010a2be9b99ebdc15638827fcaf21bbf3c16a3cd2b902bcef43041dec56441494a0f618094e14db8f99a9d314c621 SHA512 45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334
diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch
new file mode 100644
index 000000000000..a1f0aaa2b806
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch
@@ -0,0 +1,9 @@
+llvm-libunwind does not have cmake nor pkg-config files, not great
+but switch to cc.find for simplicity with meson feature-type options
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,3 +1,3 @@
+ ### Common dependencies
+-unwind = dependency('libunwind', required: get_option('unwind'))
++unwind = cc.find_library('libunwind', required: get_option('unwind'))
+ libexecinfo = cc.find_library('execinfo', required: false)
diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch
new file mode 100644
index 000000000000..35486262c992
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch
@@ -0,0 +1,11 @@
+Upstream bundles python deps and uses same interpreter as meson,
+but we don't and need this to use the eclass' python3 instead.
+
+https://bugs.gentoo.org/731728
+--- a/meson.build
++++ b/meson.build
+@@ -323,3 +323,3 @@
+ thirdparty = meson.project_source_root()/'3rdparty'
+-python = import('python').find_installation()
++python = import('python').find_installation('python3')
+ python_env = environment()
diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch
new file mode 100644
index 000000000000..14ce1f6972c0
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch
@@ -0,0 +1,12 @@
+OSDependent and OGLCompiler are already included in the shared libglslang,
+and glslang-1.3.231 normally does not install these with shared builds.
+--- a/src/glsl/meson.build
++++ b/src/glsl/meson.build
+@@ -21,5 +21,5 @@
+ cxx.find_library('MachineIndependent', required: false),
+- cxx.find_library('OSDependent', required: glslang_req),
++ cxx.find_library('OSDependent', required: false),
+ cxx.find_library('HLSL', required: glslang_req),
+- cxx.find_library('OGLCompiler', required: glslang_req),
++ cxx.find_library('OGLCompiler', required: false),
+ cxx.find_library('GenericCodeGen', required: false),
diff --git a/media-libs/libplacebo/libplacebo-5.229.1.ebuild b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
new file mode 100644
index 000000000000..305607263956
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson-multilib python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+ inherit git-r3
+else
+ GLAD_PV=2.0.2
+ SRC_URI="
+ https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
+ opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
+ S="${WORKDIR}/${PN}-v${PV}"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo/"
+
+LICENSE="LGPL-2.1+ opengl? ( MIT )"
+SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname
+IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+# libglvnd is used with dlopen() through glad (inc. egl/gles)
+RDEPEND="
+ lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+ opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] )
+ shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
+ !shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
+ unwind? (
+ llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+ !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+ )
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+DEPEND="
+ ${RDEPEND}
+ vulkan? ( dev-util/vulkan-headers )"
+BDEPEND="
+ virtual/pkgconfig
+ vulkan? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
+ "${FILESDIR}"/${PN}-5.229.1-python-executable.patch
+ "${FILESDIR}"/${PN}-5.229.1-shared-glslang.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use vulkan && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ local EGIT_SUBMODULES=( $(usev opengl 3rdparty/glad) )
+ git-r3_src_unpack
+ else
+ default
+ if use opengl; then
+ rmdir "${S}"/3rdparty/glad || die
+ mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die
+ fi
+ fi
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddemos=false #851927
+ $(meson_use test tests)
+ $(meson_feature lcms)
+ $(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)
+ -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml
+ )
+
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/, media-libs/libplacebo/files/
@ 2023-03-09 20:13 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-03-09 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 1e0535a5d55c69796ef3fe0d077a649c4adc2df7
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 18:34:16 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 20:12:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0535a5
media-libs/libplacebo: drop 4.192.1-r2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-libs/libplacebo/Manifest | 1 -
.../libplacebo-2.72.2-fix-vulkan-undeclared.patch | 26 -------
.../libplacebo-4.192.1-python-executable.patch | 8 ---
media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild | 81 ----------------------
4 files changed, 116 deletions(-)
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index abeba86da87b..37d8adbc5695 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,3 +1,2 @@
DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d5630408cebbbc86d17e73d0aa042b2d9765b9be7875a21ec4870f5efde589b8112a8d9ed785b0e9847c38a7b85ff1b5c4 SHA512 c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262
-DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525
DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165
diff --git a/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch b/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch
deleted file mode 100644
index beb40dcf7895..000000000000
--- a/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From db794a2fcc8214624c950752b04f6c23f8fc567d Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.dev>
-Date: Thu, 9 Jun 2022 21:32:36 +0200
-Subject: [PATCH] vulkan: blacklist metal structs from utils_gen.py
-
-Fixes https://code.videolan.org/videolan/libplacebo/-/issues/201
----
- src/vulkan/utils_gen.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
-index da565d45..7c0dad37 100644
---- a/src/vulkan/utils_gen.py
-+++ b/src/vulkan/utils_gen.py
-@@ -158,7 +158,7 @@ def get_vkstructs(registry):
- # Strings for platform-specific crap we want to blacklist as they will
- # most likely cause build failures
- blacklist_strs = [
-- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
-+ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', 'Metal',
- ]
-
- if any([ str in e.attrib['name'] for str in blacklist_strs ]):
---
-GitLab
-
diff --git a/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch b/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch
deleted file mode 100644
index 8fbad683e397..000000000000
--- a/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/731728
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -9,3 +9,3 @@
- # Dependencies
--prog_python = import('python').find_installation()
-+prog_python = import('python').find_installation('python3')
- libm = cc.find_library('m', required: false)
diff --git a/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
deleted file mode 100644
index 6f8a4dbea00f..000000000000
--- a/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
- inherit git-r3
-else
- KEYWORDS="amd64 ppc64 x86"
- SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
- S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/$(ver_cut 2)" # libplacebo.so version
-IUSE="glslang lcms +opengl +shaderc test unwind +vulkan"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-RESTRICT="!test? ( test )"
-
-# Build broken with newer glslang due to struct TBuiltInResource changes
-# (also breaks ABI wrt https://github.com/KhronosGroup/glslang/issues/3052).
-# Fixed in next libplacebo version, but this older one is needed for stable
-# mpv. Note glslang can be disabled, shaderc provides same functionality.
-RDEPEND="glslang? ( <dev-util/glslang-1.3.231:=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
- opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
- shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
- unwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
- vulkan? (
- dev-util/vulkan-headers
- media-libs/vulkan-loader[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig
- vulkan? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.72.2-fix-vulkan-undeclared.patch
- "${FILESDIR}"/${P}-python-executable.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use vulkan && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddemos=false #851927
- $(meson_feature glslang)
- $(meson_feature lcms)
- $(meson_feature opengl)
- $(meson_feature shaderc)
- $(meson_feature unwind)
- $(meson_feature vulkan)
- $(meson_use test tests)
- # hard-code path from dev-util/vulkan-headers
- -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- meson_src_test -t 10
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/, media-libs/libplacebo/files/
@ 2023-04-24 3:43 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-04-24 3:43 UTC (permalink / raw
To: gentoo-commits
commit: 5cca9ecd62112b3dc203677dd1b331922d1ad508
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 03:20:40 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 03:22:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cca9ecd
media-libs/libplacebo: drop 5.229.2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-libs/libplacebo/Manifest | 2 -
.../files/libplacebo-5.229.1-shared-glslang.patch | 13 ---
media-libs/libplacebo/libplacebo-5.229.2.ebuild | 100 ---------------------
3 files changed, 115 deletions(-)
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 3e23696e8296..4e1009f5c1b8 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,4 +1,2 @@
-DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d5630408cebbbc86d17e73d0aa042b2d9765b9be7875a21ec4870f5efde589b8112a8d9ed785b0e9847c38a7b85ff1b5c4 SHA512 c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262
DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7
-DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165
DIST libplacebo-v5.264.1.tar.gz 725394 BLAKE2B 421de50ef5e2270e3ba32dd85d92d816a374257442b535face6cb8501d565652aae530b86a7d717c9352c6a82ca665ff7d91c2d9768365780cbbe4f48d1d3276 SHA512 305f43b71f078f4113def43c444df667dfbdd2a6a34d3b457b15da0b3499ca97ec9a8acbd151d58c8e1a593ace3d8aa61067b32556c6bae451efbb217d60a731
diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch
deleted file mode 100644
index 84c83031e031..000000000000
--- a/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-OSDependent and OGLCompiler are already included in the shared libglslang,
-and glslang-1.3.231 normally does not install these with shared builds.
-https://code.videolan.org/videolan/libplacebo/-/issues/240
---- a/src/glsl/meson.build
-+++ b/src/glsl/meson.build
-@@ -21,5 +21,5 @@
- cxx.find_library('MachineIndependent', required: false),
-- cxx.find_library('OSDependent', required: glslang_req),
-+ cxx.find_library('OSDependent', required: false),
- cxx.find_library('HLSL', required: glslang_req),
-- cxx.find_library('OGLCompiler', required: glslang_req),
-+ cxx.find_library('OGLCompiler', required: false),
- cxx.find_library('GenericCodeGen', required: false),
diff --git a/media-libs/libplacebo/libplacebo-5.229.2.ebuild b/media-libs/libplacebo/libplacebo-5.229.2.ebuild
deleted file mode 100644
index d89de1f37823..000000000000
--- a/media-libs/libplacebo/libplacebo-5.229.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson-multilib python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
- inherit git-r3
-else
- GLAD_PV=2.0.1 # verify bug #881999 before bumping
- SRC_URI="
- https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
- opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
- S="${WORKDIR}/${PN}-v${PV}"
- KEYWORDS="amd64 ppc64 x86"
-fi
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://code.videolan.org/videolan/libplacebo/"
-
-LICENSE="LGPL-2.1+ opengl? ( MIT )"
-SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname
-IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-# libglvnd is used with dlopen() through glad (inc. egl/gles)
-RDEPEND="
- lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
- opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] )
- shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
- !shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
- unwind? (
- llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
- !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
- )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-# vulkan-headers is required even with USE=-vulkan (bug #882065)
-DEPEND="
- ${RDEPEND}
- dev-util/vulkan-headers"
-BDEPEND="
- $(python_gen_any_dep '
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]')
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
- "${FILESDIR}"/${PN}-5.229.1-python-executable.patch
- "${FILESDIR}"/${PN}-5.229.1-shared-glslang.patch
-)
-
-python_check_deps() {
- # note: setuptools can be removed when using >=glad-2.0.2
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- local EGIT_SUBMODULES=( $(usev opengl 3rdparty/glad) )
- git-r3_src_unpack
- else
- default
- if use opengl; then
- rmdir "${S}"/3rdparty/glad || die
- mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # typically auto-skipped, but may assume usable opengl/vulkan then hang
- sed -i "/tests += 'opengl_surfaceless.c'/d" src/opengl/meson.build || die
- sed -i "/tests += 'vulkan.c'/d" src/vulkan/meson.build || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddemos=false #851927
- $(meson_use test tests)
- $(meson_feature lcms)
- $(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)
- -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml
- )
-
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/, media-libs/libplacebo/files/
@ 2024-10-22 13:41 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2024-10-22 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 739ff8773274767c6bfea15b021da195f3635564
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 13:33:27 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 13:39:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739ff877
media-libs/libplacebo: fix build with glslang-1.3.296.0
Tempting to just drop support for using glslang directly given
that package changes things around all the time while shaderc
wraps around these changes for us. It's also what upstream
defaults to.
Albeit does require keywording shaderc on more arches if going
for that (aka arm64 for one wrt bug #941968).
Closes: https://bugs.gentoo.org/941968
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/libplacebo-7.349.0-glslang-1.3.296.patch | 16 ++++++++++++++++
media-libs/libplacebo/libplacebo-7.349.0.ebuild | 1 +
media-libs/libplacebo/libplacebo-9999.ebuild | 1 +
3 files changed, 18 insertions(+)
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
new file mode 100644
index 000000000000..81af061634b5
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch
@@ -0,0 +1,16 @@
+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 9d16436f4759..7899dff069c5 100644
--- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
@@ -71,6 +71,7 @@ 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() {
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 1831a83708b6..ecef342f645d 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -71,6 +71,7 @@ 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-22 13:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-09 20:13 [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/, media-libs/libplacebo/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-10-22 13:41 Ionen Wolkens
2023-04-24 3:43 Ionen Wolkens
2022-11-07 19:30 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox