| 1 |
commit: 0e1f8f4089ddfe21900556d71fd9a271684b5fbd |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 11:43:46 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 7 19:27:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1f8f40 |
| 7 |
|
| 8 |
media-libs/libplacebo: build fixes for stable |
| 9 |
|
| 10 |
Just non-intrusive fixes partly backported from the ~arch ebuild: |
| 11 |
* ensure use right python executble wrt bug #731728 |
| 12 |
* disable demos wrt bug #851927 |
| 13 |
* require <glslang-1.3.231 (~arch is fixed with newer) |
| 14 |
* multilib usedep for unwind |
| 15 |
* add := to glslang for upcoming subslot, albeit this won't really |
| 16 |
get to use it given the above |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/731728 |
| 19 |
Bug: https://bugs.gentoo.org/851927 |
| 20 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 21 |
|
| 22 |
.../files/libplacebo-4.192.1-python-executable.patch | 8 ++++++++ |
| 23 |
...bo-4.192.1-r1.ebuild => libplacebo-4.192.1-r2.ebuild} | 16 ++++++++++++---- |
| 24 |
2 files changed, 20 insertions(+), 4 deletions(-) |
| 25 |
|
| 26 |
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 |
| 27 |
new file mode 100644 |
| 28 |
index 000000000000..8fbad683e397 |
| 29 |
--- /dev/null |
| 30 |
+++ b/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch |
| 31 |
@@ -0,0 +1,8 @@ |
| 32 |
+https://bugs.gentoo.org/731728 |
| 33 |
+--- a/src/meson.build |
| 34 |
++++ b/src/meson.build |
| 35 |
+@@ -9,3 +9,3 @@ |
| 36 |
+ # Dependencies |
| 37 |
+-prog_python = import('python').find_installation() |
| 38 |
++prog_python = import('python').find_installation('python3') |
| 39 |
+ libm = cc.find_library('m', required: false) |
| 40 |
|
| 41 |
diff --git a/media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild |
| 42 |
similarity index 73% |
| 43 |
rename from media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild |
| 44 |
rename to media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild |
| 45 |
index c047cd32fdf8..96e2470a8d31 100644 |
| 46 |
--- a/media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild |
| 47 |
+++ b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild |
| 48 |
@@ -26,11 +26,15 @@ IUSE="glslang lcms +opengl +shaderc test unwind +vulkan" |
| 49 |
REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" |
| 50 |
RESTRICT="!test? ( test )" |
| 51 |
|
| 52 |
-RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] ) |
| 53 |
+# Build broken with newer glslang due to struct TBuiltInResource changes |
| 54 |
+# (also breaks ABI wrt https://github.com/KhronosGroup/glslang/issues/3052). |
| 55 |
+# Fixed in next libplacebo version, but this older one is needed for stable |
| 56 |
+# mpv. Note glslang can be disabled, shaderc provides same functionality. |
| 57 |
+RDEPEND="glslang? ( <dev-util/glslang-1.3.231:=[${MULTILIB_USEDEP}] ) |
| 58 |
lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) |
| 59 |
opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] ) |
| 60 |
shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] ) |
| 61 |
- unwind? ( sys-libs/libunwind:= ) |
| 62 |
+ unwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) |
| 63 |
vulkan? ( |
| 64 |
dev-util/vulkan-headers |
| 65 |
media-libs/vulkan-loader[${MULTILIB_USEDEP}] |
| 66 |
@@ -43,7 +47,10 @@ BDEPEND="virtual/pkgconfig |
| 67 |
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') |
| 68 |
)" |
| 69 |
|
| 70 |
-PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch ) |
| 71 |
+PATCHES=( |
| 72 |
+ "${FILESDIR}"/${PN}-2.72.2-fix-vulkan-undeclared.patch |
| 73 |
+ "${FILESDIR}"/${P}-python-executable.patch |
| 74 |
+) |
| 75 |
|
| 76 |
python_check_deps() { |
| 77 |
has_version -b "dev-python/mako[${PYTHON_USEDEP}]" |
| 78 |
@@ -55,6 +62,7 @@ pkg_setup() { |
| 79 |
|
| 80 |
multilib_src_configure() { |
| 81 |
local emesonargs=( |
| 82 |
+ -Ddemos=false #851927 |
| 83 |
$(meson_feature glslang) |
| 84 |
$(meson_feature lcms) |
| 85 |
$(meson_feature opengl) |
| 86 |
@@ -63,7 +71,7 @@ multilib_src_configure() { |
| 87 |
$(meson_feature vulkan) |
| 88 |
$(meson_use test tests) |
| 89 |
# hard-code path from dev-util/vulkan-headers |
| 90 |
- -Dvulkan-registry=/usr/share/vulkan/registry/vk.xml |
| 91 |
+ -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml |
| 92 |
) |
| 93 |
meson_src_configure |
| 94 |
} |
Archives