[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/files/

[Ionen Wolkens]

commit:     e63fbde53d184b691cd879ab051b42c7e0841575
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 10:17:13 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 10:18:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63fbde5

media-libs/libplacebo: drop unused patches

Signed-off-by: Ionen Wolkens <ionen <AT> 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..000000000000
--- a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 45e19e7bbbbfceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-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], &props);
-         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..000000000000
--- 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 <git@haasn.xyz>
-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/

[Ionen Wolkens]

commit:     cc318c2661468be454dcc32d596955179ced64e5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 01:09:50 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 01:09:50 2023 +0000
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 <ionen <AT> 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/

[Ionen Wolkens]

commit:     63d3591d9d03416e5a39e0020ecbb35f3be33ccb
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  4 01:23:08 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug  4 01:27:51 2023 +0000
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 <ionen <AT> 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/

[Ionen Wolkens]

commit:     e51a9c6125d5f29b85c2de31f9f8315f06a29baf
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 10:58:13 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 11:00:15 2023 +0000
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 <ionen <AT> 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 @@