[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/
commit: e51a9c6125d5f29b85c2de31f9f8315f06a29baf Author: Ionen Wolkens gentoo org> AuthorDate: Thu Aug 17 10:58:13 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Aug 17 11:00:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51a9c61 media-libs/libplacebo: note meson changes in python patch Signed-off-by: Ionen Wolkens gentoo.org> .../libplacebo/files/libplacebo-5.229.1-python-executable.patch | 5 + 1 file changed, 5 insertions(+) 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 index 181e281bfde1..3626292d873d 100644 --- a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch @@ -4,6 +4,11 @@ and the latter also needs distutils that is unavailable with python3_12 without setuptools. https://bugs.gentoo.org/731728 + +Update: former should no longer be an issue since [1], but keeping +patch given [2] is still an issue +[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0686381dfc3d +[2] https://github.com/mesonbuild/meson/issues/7702 --- a/meson.build +++ b/meson.build @@ -323,3 +323,3 @@
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/
commit: 63d3591d9d03416e5a39e0020ecbb35f3be33ccb
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Aug 4 01:23:08 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 4 01:27:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d3591d
media-libs/libplacebo: adjust old interpreter patch
Re-looking at this, it may be worth upstreaming sometime
by using find_program() if really nothing that needs
find_installation().
Fortunately setuptools issues hardly occured with 3.12
because we check for jinja which pulled setuptools.
Signed-off-by: Ionen Wolkens gentoo.org>
.../libplacebo/files/libplacebo-5.229.1-python-executable.patch | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
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
index 35486262c992..181e281bfde1 100644
--- a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch
+++ b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch
@@ -1,5 +1,7 @@
-Upstream bundles python deps and uses same interpreter as meson,
-but we don't and need this to use the eclass' python3 instead.
+Ensure we get the interpreter from python-any-r1 rather than same
+as meson. Plus find_program() is quicker than find_installation(),
+and the latter also needs distutils that is unavailable with
+python3_12 without setuptools.
https://bugs.gentoo.org/731728
--- a/meson.build
@@ -7,5 +9,5 @@ https://bugs.gentoo.org/731728
@@ -323,3 +323,3 @@
thirdparty = meson.project_source_root()/'3rdparty'
-python = import('python').find_installation()
-+python = import('python').find_installation('python3')
++python = find_program('python3')
python_env = environment()
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/
commit: cc318c2661468be454dcc32d596955179ced64e5 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Jan 14 01:09:50 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jan 14 01:09:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc318c26 media-libs/libplacebo: add buglink for shared-glslang.patch Signed-off-by: Ionen Wolkens gentoo.org> media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch | 1 + 1 file changed, 1 insertion(+) 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 index 14ce1f6972c0..84c83031e031 100644 --- a/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch @@ -1,5 +1,6 @@ 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 @@
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/, media-libs/libplacebo/
commit: 0e1f8f4089ddfe21900556d71fd9a271684b5fbd
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 6 11:43:46 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 7 19:27:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1f8f40
media-libs/libplacebo: build fixes for stable
Just non-intrusive fixes partly backported from the ~arch ebuild:
* ensure use right python executble wrt bug #731728
* disable demos wrt bug #851927
* require https://bugs.gentoo.org/731728
Bug: https://bugs.gentoo.org/851927
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/libplacebo-4.192.1-python-executable.patch | 8
...bo-4.192.1-r1.ebuild => libplacebo-4.192.1-r2.ebuild} | 16
2 files changed, 20 insertions(+), 4 deletions(-)
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
new file mode 100644
index ..8fbad683e397
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch
@@ -0,0 +1,8 @@
+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-r1.ebuild
b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
similarity index 73%
rename from media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild
rename to media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
index c047cd32fdf8..96e2470a8d31 100644
--- a/media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild
+++ b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild
@@ -26,11 +26,15 @@ IUSE="glslang lcms +opengl +shaderc test unwind +vulkan"
REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
RESTRICT="!test? ( test )"
-RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
+# 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? ( =media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
- unwind? ( sys-libs/libunwind:= )
+ unwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
vulkan? (
dev-util/vulkan-headers
media-libs/vulkan-loader[${MULTILIB_USEDEP}]
@@ -43,7 +47,10 @@ BDEPEND="virtual/pkgconfig
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
)"
-PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.72.2-fix-vulkan-undeclared.patch
+ "${FILESDIR}"/${P}-python-executable.patch
+)
python_check_deps() {
has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
@@ -55,6 +62,7 @@ pkg_setup() {
multilib_src_configure() {
local emesonargs=(
+ -Ddemos=false #851927
$(meson_feature glslang)
$(meson_feature lcms)
$(meson_feature opengl)
@@ -63,7 +71,7 @@ multilib_src_configure() {
$(meson_feature vulkan)
$(meson_use test tests)
# hard-code path from dev-util/vulkan-headers
- -Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
+ -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml
)
meson_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/
commit: e63fbde53d184b691cd879ab051b42c7e0841575
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 6 10:17:13 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 6 10:18:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63fbde5
media-libs/libplacebo: drop unused patches
Signed-off-by: Ionen Wolkens gentoo.org>
...43.0-vulkan-headers-1.2.140-compatibility.patch | 59 --
.../libplacebo-2.72.0-fix-vulkan-undeclared.patch | 33
2 files changed, 92 deletions(-)
diff --git
a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
deleted file mode 100644
index 8fa64744fd05..
---
a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 45e19e7fceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001
-From: Niklas Haas
-Date: Tue, 5 May 2020 00:13:49 +0200
-Subject: [PATCH] vulkan: get rid of deprecated enum members
-
-Maybe we should just get rid of the switch coverage check altogether. I
-wish we could somehow differentiate between enums defined in our code
-and enums defined externally.
-
-Fixes #71.
- src/vulkan/context.c | 4 +++-
- src/vulkan/swapchain.c | 7 +--
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/vulkan/context.c b/src/vulkan/context.c
-index 10928a9..14a57cf 100644
a/src/vulkan/context.c
-+++ b/src/vulkan/context.c
-@@ -685,7 +685,6 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context
*ctx,
- [VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU]= {"virtual",3},
- [VK_PHYSICAL_DEVICE_TYPE_CPU]= {"software", 2},
- [VK_PHYSICAL_DEVICE_TYPE_OTHER] = {"other", 1},
--[VK_PHYSICAL_DEVICE_TYPE_END_RANGE+1]= {0},
- };
-
- int best = 0;
-@@ -693,6 +692,9 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context
*ctx,
- VkPhysicalDeviceProperties props = {0};
- GetPhysicalDeviceProperties(devices[i], );
- VkPhysicalDeviceType t = props.deviceType;
-+if (t > PL_ARRAY_SIZE(types))
-+continue;
-+
- PL_INFO(vk, "GPU %d: %s (%s)", i, props.deviceName,
types[t].name);
-
- if (params->surface) {
-diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c
-index bf6fd54..6bf40dd 100644
a/src/vulkan/swapchain.c
-+++ b/src/vulkan/swapchain.c
-@@ -138,13 +138,8 @@ static bool vk_map_color_space(VkColorSpaceKHR space,
struct pl_color_space *out
- return false;
- #endif
-
--// Included to satisfy the switch coverage check
--case VK_COLOR_SPACE_RANGE_SIZE_KHR:
--case VK_COLOR_SPACE_MAX_ENUM_KHR:
--break;
-+default: return false;
- }
--
--return false;
- }
-
- static bool pick_surf_format(const struct pl_gpu *gpu, const struct vk_ctx
*vk,
---
-2.27.0
-
diff --git
a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
deleted file mode 100644
index 15bac9718222..
--- a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/789498
-
-From ac44e8f14acbfd2810c46e07e38466673f0ad7e0 Mon Sep 17 00:00:00 2001
-From: Niklas Haas
-Date: Tue, 23 Mar 2021 11:57:13 +0100
-Subject: [PATCH] vulkan: blacklist FUCHSIA strings
-
-Maybe one day we'll actually figure out how to make this python script
-exclude platform-specific stuff in a way that doesn't rely on hardcoding
-a list of strings to blacklist.
-
-One day.
-
-Fixes https://code.videolan.org/videolan/libplacebo/-/issues/131
- 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 a4565f3..53195f2 100644
a/src/vulkan/utils_gen.py
-+++ b/src/vulkan/utils_gen.py
-@@ -155,7 +155,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'
-+'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
- ]
-
- if any([ str in e.attrib['name'] for str in blacklist_strs ]):
---
-GitLab
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/, media-libs/libplacebo/
commit: cbe8cf7aba85fe8124c9b118b519e602ede9
Author: Stephan Hartmann gentoo org>
AuthorDate: Sat Sep 3 20:27:27 2022 +
Commit: Stephan Hartmann gentoo org>
CommitDate: Sat Sep 3 20:27:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe8cf7a
media-libs/libplacebo: fix build with vulkan-headers-1.3.217
Closes: https://bugs.gentoo.org/868297
Signed-off-by: Stephan Hartmann gentoo.org>
.../libplacebo-2.72.2-fix-vulkan-undeclared.patch | 26 ++
media-libs/libplacebo/libplacebo-2.72.2.ebuild | 5 +++--
media-libs/libplacebo/libplacebo-3.120.3.ebuild| 2 ++
media-libs/libplacebo/libplacebo-4.192.1.ebuild| 2 ++
4 files changed, 33 insertions(+), 2 deletions(-)
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
new file mode 100644
index ..beb40dcf7895
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch
@@ -0,0 +1,26 @@
+From db794a2fcc8214624c950752b04f6c23f8fc567d Mon Sep 17 00:00:00 2001
+From: Niklas Haas
+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/libplacebo-2.72.2.ebuild
b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 3aee3073d9fc..12deb1498de2 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git;
@@ -44,6 +44,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}"/${PN}-2.72.0-fix-vulkan-undeclared.patch
+ "${FILESDIR}"/${PN}-2.72.2-fix-vulkan-undeclared.patch
)
python_check_deps() {
diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild
b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
index dad6f376d93f..2480715bf384 100644
--- a/media-libs/libplacebo/libplacebo-3.120.3.ebuild
+++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
@@ -42,6 +42,8 @@ BDEPEND="virtual/pkgconfig
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
)"
+PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch )
+
python_check_deps() {
has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
}
diff --git a/media-libs/libplacebo/libplacebo-4.192.1.ebuild
b/media-libs/libplacebo/libplacebo-4.192.1.ebuild
index b147ffadfcbb..1f996e6c78c2 100644
--- a/media-libs/libplacebo/libplacebo-4.192.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-4.192.1.ebuild
@@ -42,6 +42,8 @@ BDEPEND="virtual/pkgconfig
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
)"
+PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch )
+
python_check_deps() {
has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/, media-libs/libplacebo/
commit: 271f88948e1c76d54cb297f9904b904d44f40500
Author: Sam James gentoo org>
AuthorDate: Sat May 29 15:52:29 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat May 29 15:52:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271f8894
media-libs/libplacebo: add Vulkan compile patch
Closes: https://bugs.gentoo.org/789498
Signed-off-by: Sam James gentoo.org>
.../libplacebo-2.72.0-fix-vulkan-undeclared.patch | 33 ++
media-libs/libplacebo/libplacebo-2.72.2.ebuild | 7 -
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git
a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
new file mode 100644
index 000..15bac971822
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/789498
+
+From ac44e8f14acbfd2810c46e07e38466673f0ad7e0 Mon Sep 17 00:00:00 2001
+From: Niklas Haas
+Date: Tue, 23 Mar 2021 11:57:13 +0100
+Subject: [PATCH] vulkan: blacklist FUCHSIA strings
+
+Maybe one day we'll actually figure out how to make this python script
+exclude platform-specific stuff in a way that doesn't rely on hardcoding
+a list of strings to blacklist.
+
+One day.
+
+Fixes https://code.videolan.org/videolan/libplacebo/-/issues/131
+---
+ 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 a4565f3..53195f2 100644
+--- a/src/vulkan/utils_gen.py
b/src/vulkan/utils_gen.py
+@@ -155,7 +155,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'
++'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
+ ]
+
+ if any([ str in e.attrib['name'] for str in blacklist_strs ]):
+--
+GitLab
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 6dfc04687ed..a516eb79627 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,11 @@ BDEPEND="virtual/pkgconfig
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.72.0-fix-vulkan-undeclared.patch
+)
+
python_check_deps() {
has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/, media-libs/libplacebo/
commit: 60bf2b4609439e1b3d96059102a57d2e7163ea9b
Author: Niklas Haas haasn xyz>
AuthorDate: Wed Jun 17 01:41:43 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 18 09:13:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60bf2b46
media-libs/libplacebo: backport vulkan-headers compatibility patch
This patch is needed to compile older versions of libplacebo against
versions of vulkan-headers newer than 1.2.140. It doesn't break anything
retroactively, and doesn't change behaviour, nor installed headers, so
we don't need to bump the revision number.
Closes: https://bugs.gentoo.org/728248
Signed-off-by: Niklas Haas haasn.xyz>
Closes: https://github.com/gentoo/gentoo/pull/16243
Signed-off-by: Andreas Sturmlechner gentoo.org>
...43.0-vulkan-headers-1.2.140-compatibility.patch | 59 ++
media-libs/libplacebo/libplacebo-2.43.0.ebuild | 4 ++
2 files changed, 63 insertions(+)
diff --git
a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
new file mode 100644
index 000..8fa64744fd0
--- /dev/null
+++
b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
@@ -0,0 +1,59 @@
+From 45e19e7fceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001
+From: Niklas Haas
+Date: Tue, 5 May 2020 00:13:49 +0200
+Subject: [PATCH] vulkan: get rid of deprecated enum members
+
+Maybe we should just get rid of the switch coverage check altogether. I
+wish we could somehow differentiate between enums defined in our code
+and enums defined externally.
+
+Fixes #71.
+---
+ src/vulkan/context.c | 4 +++-
+ src/vulkan/swapchain.c | 7 +--
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/vulkan/context.c b/src/vulkan/context.c
+index 10928a9..14a57cf 100644
+--- a/src/vulkan/context.c
b/src/vulkan/context.c
+@@ -685,7 +685,6 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context
*ctx,
+ [VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU]= {"virtual",3},
+ [VK_PHYSICAL_DEVICE_TYPE_CPU]= {"software", 2},
+ [VK_PHYSICAL_DEVICE_TYPE_OTHER] = {"other", 1},
+-[VK_PHYSICAL_DEVICE_TYPE_END_RANGE+1]= {0},
+ };
+
+ int best = 0;
+@@ -693,6 +692,9 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context
*ctx,
+ VkPhysicalDeviceProperties props = {0};
+ GetPhysicalDeviceProperties(devices[i], );
+ VkPhysicalDeviceType t = props.deviceType;
++if (t > PL_ARRAY_SIZE(types))
++continue;
++
+ PL_INFO(vk, "GPU %d: %s (%s)", i, props.deviceName,
types[t].name);
+
+ if (params->surface) {
+diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c
+index bf6fd54..6bf40dd 100644
+--- a/src/vulkan/swapchain.c
b/src/vulkan/swapchain.c
+@@ -138,13 +138,8 @@ static bool vk_map_color_space(VkColorSpaceKHR space,
struct pl_color_space *out
+ return false;
+ #endif
+
+-// Included to satisfy the switch coverage check
+-case VK_COLOR_SPACE_RANGE_SIZE_KHR:
+-case VK_COLOR_SPACE_MAX_ENUM_KHR:
+-break;
++default: return false;
+ }
+-
+-return false;
+ }
+
+ static bool pick_surf_format(const struct pl_gpu *gpu, const struct vk_ctx
*vk,
+--
+2.27.0
+
diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
index b0088dafa64..3306d2602b4 100644
--- a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
@@ -32,6 +32,10 @@ BDEPEND="virtual/pkgconfig"
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}"/${P}-vulkan-headers-1.2.140-compatibility.patch
+)
+
multilib_src_configure() {
local emesonargs=(
$(meson_feature glslang)
