diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index 0abcefa24a07..47a502b7c419 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -1,67 +1,67 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v 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 LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 localbase:ldflags meson pkgconfig python:3.6+,build USE_GITHUB= yes 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 OPTIONS_SINGLE_VULKAN= GLSLANG SHADERC OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Narmv[67]:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/} OPTIONS_SUB= yes GLSLANG_DESC= glslang SPIR-V compiler GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang GLSLANG_MESON_ENABLED= glslang GLSLANG_IMPLIES= VULKAN LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms LIBUNWIND_DESC= Use libunwind for stacktraces LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_MESON_ENABLED= unwind OPENGL_GH_TUPLE= Dav1dde:glad:v2.0.1:glad/3rdparty/glad OPENGL_MESON_ENABLED= opengl SHADERC_DESC= libshaderc SPIR-V compiler SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc SHADERC_MESON_ENABLED= shaderc SHADERC_IMPLIES= VULKAN TEST_MESON_TRUE= tests VULKAN_DESC= Vulkan-based renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_MESON_ENABLED= vulkan post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/src/vulkan/utils_gen.py # Extract (snapshot) version from port version instead of meson.build @${REINPLACE_CMD} "s/version_pretty/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/src/meson.build pre-install-TEST-on: do-test .include 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 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()