From nobody Sun May 21 03:14:08 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 4QP5Jw51MTz4BvLy; Sun, 21 May 2023 03:14:08 +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 4QP5Jw4Mndz3Cf4; Sun, 21 May 2023 03:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684638848; 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=z0emCiJ489bP+wUPmo5EO4XYozqgkEASqzuaUkkIdkI=; b=ZExaM80OPBs67NZxcm/ALSzy0fVfB69UvwwZwFfRqmGz8XmNr3Za1d8BR9c44hl3PoQmfm fZSQxJ6kEvZp/lZW8gYl+klLCTlY3zdsABX5FCtcfyUrj157IwLjbQuXewPCpYEDeOK5Ip 3N2fV4HqmxgFo1g4O43BE53tCHKI88400F9KMgn2mAjnr/meIkgNxbh7xNCeSNEy3vrkCS 85Cw+OVpogURftpHehYe4RerfYpilurAyUEKZMOHTy0xeX15Umj9t04b2/20EgId3+d2mT blHVT5ZUkiDbkrLTr5HHdV9NzhClrEgT4/vI3B5I5rirKxXH8bErCpeFpGLZXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684638848; 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=z0emCiJ489bP+wUPmo5EO4XYozqgkEASqzuaUkkIdkI=; b=R6iw0YFI4QJm4CfLoVu/lIP0lizfQXQPuDw83SlphFInbCng2iNIjYnMSbDmTstI/GXO2M ZJNoull390dtmT3ZgqIeeMJDDKPYm8Bk2gfeT4YOhLaOoyIDRgKjgn0ct+lH1UFfYbuCiW DCwQyAp0YKZYNMJm6Z6IBqeRJcrIuoS6SqotIEVi/TczCjCgOWx6q0VKUi8aiVNLZF9ipu Wmo4HEbPNtUlOtRI0mENaL/S58UAGZv9f6Qqdn7HG3MlRr4gt+z66sQFSNgYDfkIWc1wQS cRJowWQYMoO9ACg1/7dY+kUsJrlFWMcey/MpCbNxGHj7w5nLGPWVxHBOG2treA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684638848; a=rsa-sha256; cv=none; b=iSHjmmp1HmvpwNjGTRPN+yH/QllncX9qEagwuOVBn25gpKSPg+6a8QNrZtmSvwLcOgcWHt WcIubUMZtKBOm2F1iaozHh/2jD/7tdwfF/Y6fT2WEooQkXuV1MZ+u7QrN9U4osNySXJ59p jdkErvnZId1RMkKLpU5WJO0Fzj28wKq14maLpY511BZe4QgdpvOpO0f4xG92mBmiyWwsxW o+AGFyfHDsp8n+dI1uI56pS3TgKzgZVMlkVkDW6R3qShVt0lXG5rR+JNH2UQng2tKHV5px pcUGdy9CFgJHJljuEtApde9h2HodrBx8TF4okoplSVsA/LjHTswg7Kc4YTuj/Q== 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 4QP5Jw3TvFzbnF; Sun, 21 May 2023 03:14:08 +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 34L3E84w065487; Sun, 21 May 2023 03:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34L3E8xB065486; Sun, 21 May 2023 03:14:08 GMT (envelope-from git) Date: Sun, 21 May 2023 03:14:08 GMT Message-Id: <202305210314.34L3E8xB065486@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 1885fe5b0cd6 - 2023Q2 - graphics/libplacebo: unbreak GLSLANG=on after 1801dc29cec9 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 1885fe5b0cd69e136a5bf5e51cd203dfdc44c37d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1885fe5b0cd69e136a5bf5e51cd203dfdc44c37d commit 1885fe5b0cd69e136a5bf5e51cd203dfdc44c37d Author: Jan Beich AuthorDate: 2023-05-21 02:57:13 +0000 Commit: Jan Beich CommitDate: 2023-05-21 03:13:59 +0000 graphics/libplacebo: unbreak GLSLANG=on after 1801dc29cec9 compiler.find_library(static: true) ignores LDFLAGS and LIBRARY_PATH as Meson uses --print-search-dirs instead of trying to link. src/glsl/meson.build:34:4: ERROR: C++ static library 'SPIRV' not found src/glsl/meson.build:45:12: ERROR: C++ static library 'MachineIndependent' not found PR: 270221 Reported by: Philipp Ost Regressed by: https://code.videolan.org/videolan/libplacebo/-/commit/980f2574aa0f (cherry picked from commit 506f67ea200f6858dd4f49efb28ccdd33456e0d9) --- graphics/libplacebo/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index 220a7927fd5d..cc4a7928ac08 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -54,6 +54,9 @@ VULKAN_MESON_ENABLED= vulkan post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/src/vulkan/utils_gen.py +# https://github.com/mesonbuild/meson/issues/7746 + @${REINPLACE_CMD} "s,static:,dirs: '${LOCALBASE}/lib'\, &," \ + ${WRKSRC}/src/glsl/meson.build # Extract (snapshot) version from port version instead of meson.build @${REINPLACE_CMD} "s/version_pretty/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/src/meson.build