graphics/libplacebo: Updated for version 2.72.0.
Signed-off-by: orbea <orbea@riseup.net> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
9f19b2786e
commit
a8412054d9
|
@ -3,5 +3,6 @@ turned into a library.
|
|||
|
||||
shaderc is an optional dependency.
|
||||
|
||||
libplacebo can be built without the vulkan-sdk, but most features will
|
||||
be missing.
|
||||
vulkan-sdk and Mako are optional dependencies for vulkan support.
|
||||
|
||||
Mako must be built with python3 support.
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=libplacebo
|
||||
VERSION=${VERSION:-2.43.1}
|
||||
VERSION=${VERSION:-2.72.0}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
@ -78,14 +78,12 @@ else
|
|||
RELEASE=plain
|
||||
fi
|
||||
|
||||
# Use an older epoxy version.
|
||||
sed -i 's/1.4.0/1.3.1/' src/meson.build
|
||||
|
||||
# Fix the build with newer glslang versions.
|
||||
patch -p1 < $CWD/glslang.patch
|
||||
|
||||
# vulkan: get rid of deprecated enum members
|
||||
# https://code.videolan.org/videolan/libplacebo/-/issues/71
|
||||
# https://code.videolan.org/videolan/libplacebo/-/commit/45e19e7bbbbfceb197d8826c775e16ef536a4565
|
||||
patch -p1 < $CWD/vulkan.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
meson \
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
PRGNAM="libplacebo"
|
||||
VERSION="2.43.1"
|
||||
VERSION="2.72.0"
|
||||
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
|
||||
DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v2.43.1/libplacebo-v2.43.1.tar.gz"
|
||||
MD5SUM="2d9cad6e8155eccaed6e612520a20793"
|
||||
DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v2.72.0/libplacebo-v2.72.0.tar.gz"
|
||||
MD5SUM="dd6e7fca60c1dda53f2f6d5adf06fe69"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="meson vulkan-sdk"
|
||||
REQUIRES="meson"
|
||||
MAINTAINER="Hunter Sezen"
|
||||
EMAIL="orbea@riseup.net"
|
||||
|
|
|
@ -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.26.2
|
||||
|
Loading…
Reference in New Issue