diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-02-19 19:50:24 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-02-19 19:53:35 +0000 |
| commit | dda4f1f9bfc5207fe7d2346f05632d57c6904a15 (patch) | |
| tree | b8d39f6457926ed3d4d97a0653e88686d4af9c95 | |
| parent | 7817c5e1b92ed3ad496e2397dda57810f4ab6ac1 (diff) | |
| download | ports-dda4f1f9bfc5207fe7d2346f05632d57c6904a15.tar.gz ports-dda4f1f9bfc5207fe7d2346f05632d57c6904a15.zip | |
graphics/libplacebo: switch d5d4800631de to upstream fix
| -rw-r--r-- | graphics/libplacebo/Makefile | 6 | ||||
| -rw-r--r-- | graphics/libplacebo/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libplacebo/files/patch-src_vulkan_meson.build | 22 |
3 files changed, 5 insertions, 27 deletions
diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index 0abcefa24a07..47a502b7c419 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -4,6 +4,9 @@ DISTVERSION= 5.229.2 PORTREVISION= 1 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= baec0e53c959.patch:-p1 # https://code.videolan.org/videolan/libplacebo/-/issues/249 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Reusable library for GPU-accelerated video/image rendering WWW= https://code.videolan.org/videolan/libplacebo @@ -17,9 +20,6 @@ USE_LDCONFIG= yes GH_ACCOUNT= haasn MESON_ARGS= -Ddemos=false -# XXX https://code.videolan.org/videolan/libplacebo/-/issues/249 -GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.240:vkheaders/3rdparty/Vulkan-Headers - OPTIONS_DEFINE= LCMS2 LIBUNWIND OPENGL TEST VULKAN OPTIONS_DEFAULT=LCMS2 LIBUNWIND OPENGL SHADERC OPTIONS_SINGLE= VULKAN diff --git a/graphics/libplacebo/distinfo b/graphics/libplacebo/distinfo index 27d5062d6e75..9a7627c28d76 100644 --- a/graphics/libplacebo/distinfo +++ b/graphics/libplacebo/distinfo @@ -1,7 +1,7 @@ TIMESTAMP = 1672849094 SHA256 (haasn-libplacebo-v5.229.2_GH0.tar.gz) = 1c67bec76832c7a42242570798cc96a3f58a70be79daa84ade628d5bce749c84 SIZE (haasn-libplacebo-v5.229.2_GH0.tar.gz) = 673761 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 98734513f4847254ef5bdd31a9c897f64938dac0733b9aea9e4b3fd339d82281 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 1810650 SHA256 (Dav1dde-glad-v2.0.1_GH0.tar.gz) = bbdfb8a2c8ea7fbad747dd91424fc9fc7bb22e1b95c7a5b451e68c3d9bd96d95 SIZE (Dav1dde-glad-v2.0.1_GH0.tar.gz) = 581028 +SHA256 (baec0e53c959.patch) = 9a76a9f79658fef0bc41c3633cda2238c7ea7ea4606a21cd57c8745bc49a720b +SIZE (baec0e53c959.patch) = 5828 diff --git a/graphics/libplacebo/files/patch-src_vulkan_meson.build b/graphics/libplacebo/files/patch-src_vulkan_meson.build deleted file mode 100644 index 4a65f04088b5..000000000000 --- a/graphics/libplacebo/files/patch-src_vulkan_meson.build +++ /dev/null @@ -1,22 +0,0 @@ -Workaround for https://code.videolan.org/videolan/libplacebo/-/issues/249 - ---- src/vulkan/meson.build.orig 2023-01-04 16:18:14 UTC -+++ src/vulkan/meson.build -@@ -4,17 +4,10 @@ registry_xml = get_option('vulkan-registry') - vulkan_headers = disabler() - registry_xml = get_option('vulkan-registry') - --if vulkan_loader.found() -- vulkan_headers = vulkan_loader.partial_dependency(includes: true, compile_args: true) --# Probe for <vulkan/vulkan.h> as a fallback for the vulkan headers --elif cc.has_header_symbol('vulkan/vulkan_core.h', 'VK_VERSION_1_2') -- vulkan_headers = declare_dependency() --elif fs.is_dir(thirdparty/'Vulkan-Headers/include') - vulkan_inc = include_directories('../../3rdparty/Vulkan-Headers/include') - vulkan_headers = declare_dependency(include_directories: vulkan_inc) - # Force the use of this vk.xml because it has to be in sync with the headers - registry_xml = thirdparty/'Vulkan-Headers/registry/vk.xml' --endif - - build_deps += vulkan_headers - if not vulkan_headers.found() |