From nobody Sun Feb 19 19:54:14 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PKbpv1zy0z3rw7R; Sun, 19 Feb 2023 19:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PKbpv1W4wz42Hy; Sun, 19 Feb 2023 19:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676836455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NVmIdxSvkjFgU4GPoXwkqw7cRGUf+xo/JQTBmGaXxU=; b=IRozjK7xa3AvscvLY7c6tjzLv18R3qsG+5j5kjbIhdn/g3kW0LVMbvbS6FQjrfs4QjVk8R jvArQmuL6kwHlJjKaktyt9rCnFQYgGSCe0LmvxBL8Z5HlLeUTMDpgB03/kz7e95haJRF6k 1jTRCVp2Y3hJbIbNQIf0l62M1YI1jjsXspLg1lTak41kWoi4d0EfXZ0oo0tnrMZapCRRSp t0lgLHIqvdRfNtX47iheu/HvQGx6gfK/bGR3beQ0FA+wrU0wkFyaiLpJcgjgXqiqwmRfPB cJH9cGE2UaagAApxC/y87a+s5GEgKJiluu5m7+013CnvuZvc1EVM+01eaCe70A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676836455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NVmIdxSvkjFgU4GPoXwkqw7cRGUf+xo/JQTBmGaXxU=; b=JDeNhWryHr7CSdYJh4SjXUV2vQA/Td+OuAsRK1NCpav/tWKCN6IFTY+9KXdPN9kidpBKso ig3X3MofwYv2/fr9jI1wCl27gh7et+up6GegJy4wtzs892zjrf8ckedpstWDcEO2N8KqJK zrhQO09tMYjf+nwu89AwmHM1+O/7qZqvgCigqYgo7oRRUBa+I1NihdirX6unO7cciQa82h vwnwTxtJHmlMut9h02xzUxgyfUMRjIjpiOyy1mLPZ/maqc89SSrztux/zry7SBUar2I/ui QTAz71JxQ5YzOqpvwkpULjkZNg5QNrtFhlciSyGJJYCp+XHEw7NdD3+JcWr99g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676836455; a=rsa-sha256; cv=none; b=mJXLM2mzjwD2PcwOwZMLeA+CUPOzEZLzReZLcL1OO5Cz41vqlt6yf3WEqP6W8EVBUTOfis xzYUjsP/Mh/H3TZTR+vzWVrAS2c1tnbUIXchDbuwuxz14VS6RrsnyctSb3GW2fZUa/dsK5 xvvBBozhRn7WHqxfoxtXT82qG/cKN5q1Z26YwUYqNqN5WXmfkViOMj/kV0tPkVP5ZPr9oa dEN+3uPhTf5IO/TiU+zhqfnckANEJOgZtPqWeX7ekMfJtJcFGa7CSdzRT/SVp/j9UrMUc2 h2XSutjSmseQvPDdM7dlR7eVEFtkkedXsRGUDbRTd7b9YG+WCOafjKvLHWNzgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PKbpv0T5gz1CxW; Sun, 19 Feb 2023 19:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31JJsEAB008272; Sun, 19 Feb 2023 19:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31JJsEN6008271; Sun, 19 Feb 2023 19:54:14 GMT (envelope-from git) Date: Sun, 19 Feb 2023 19:54:14 GMT Message-Id: <202302191954.31JJsEN6008271@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: dda4f1f9bfc5 - main - graphics/libplacebo: switch d5d4800631de to upstream fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dda4f1f9bfc5207fe7d2346f05632d57c6904a15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dda4f1f9bfc5207fe7d2346f05632d57c6904a15 commit dda4f1f9bfc5207fe7d2346f05632d57c6904a15 Author: Jan Beich AuthorDate: 2023-02-19 19:50:24 +0000 Commit: Jan Beich CommitDate: 2023-02-19 19:53:35 +0000 graphics/libplacebo: switch d5d4800631de to upstream fix --- graphics/libplacebo/Makefile | 6 +++--- graphics/libplacebo/distinfo | 4 ++-- .../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 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()