From nobody Sun May 21 03:13:46 2023 X-Original-To: dev-commits-ports-main@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 4QP5JV37lrz4BvK5; Sun, 21 May 2023 03:13:46 +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 4QP5JV2XSjz3CJ7; Sun, 21 May 2023 03:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684638826; 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=9KXsBUxu+cGuzcNhnYHH4Qsl5VX+KzzrCrDqhKYON2Q=; b=NP70rYooum/si+LerPfkhEPxdlDlI1WGFKHmfx8uVHlDW4bKiR5ro0AkzXZ44FtCyTRsVG SlkfFF6cn5rRHaLHkUs5LkfbweLOmlc3Wac/r0aG9jxy7kbIsZ5l0a+kmbXmbOvyRWmSA/ nkOXZmzozNgvWyCfCk/sG233/VcCG8DkUCtjB5eImfgBlK+e0X7oZKCMmaMdCjZ+9uvAEg tu/++0xK2+yPhm4A+La8yymbEYuDQ4LFoWNWIBDIhsOC2iBptRQVGn4DFuXJdIDYuro4TS WUOlhWWYZXQj1Jq7qQDv3cb6XOxJeUFITxSUBcfBoFoyJMU4wZPxP8b565ph9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684638826; 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=9KXsBUxu+cGuzcNhnYHH4Qsl5VX+KzzrCrDqhKYON2Q=; b=G+miTJ5D79Cc/SJPpGgiFREkExP1n/voAFSLJxaNmo/3NsCk8qn3TMgLxPbIATJipXTBNY 5M/ts0kNKP7OpcXi5VxualSt4v0I7K8dcW0IQIUQT6RD2Xow61qZUZE4khSTxi6JrZZtxO 7EXkcJDNfQZuau+BtqYlDsdZhUuHVFk2PkNl3INPYvS1b3BMB4iBS4hGmD/hh1IAr4LMeq uxPmTSSfmK4jRWQfBP5l1LJ/e8HW/k0y0NTyWZwkUmwcHJMPQx0tIdIlr2D+12QbwGzP1W G8bE/Ciewi+bZ5QMHbuGtHT9+s2F5kODnHVXZEd4kLTjCD6w5KoXGY/VZ1d8aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684638826; a=rsa-sha256; cv=none; b=O4ZEW5+1ZEGOHPe9odmxVuqwuOAfUMBA1sqNyGRSHWOMidMpTjFwvZSssmtv4h1rHJo1xG yMdiPwcqJZDjtFmiq8p3esCWt52OwhB35AZMx9lkAjih+DBQWszoSkPZZrRnKRZWhf8KiV LTCPgwsDPOT50Zdcx0jHoZZ8H0O7Qk4ger5NHttB9jr/SWg5U93o9MvaYRmwxPu+cKRn0y S/B5wpF31Twb4RfJVQGPzDiyE49/+JCfPRUzhI9222M0DysLxXhJ04GNFt4DhsDPGd3Pgw q6M6XTBnDEHETRO9qi0wCxSpyyDBPfnn2QVUQasPyOnnz3n3sLVSsvdnBHY+SA== 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 4QP5JV1bwZzbV6; Sun, 21 May 2023 03:13:46 +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 34L3DkBd065312; Sun, 21 May 2023 03:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34L3DkxR065311; Sun, 21 May 2023 03:13:46 GMT (envelope-from git) Date: Sun, 21 May 2023 03:13:46 GMT Message-Id: <202305210313.34L3DkxR065311@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: 506f67ea200f - main - graphics/libplacebo: unbreak GLSLANG=on after 1801dc29cec9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 506f67ea200f6858dd4f49efb28ccdd33456e0d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=506f67ea200f6858dd4f49efb28ccdd33456e0d9 commit 506f67ea200f6858dd4f49efb28ccdd33456e0d9 Author: Jan Beich AuthorDate: 2023-05-21 02:57:13 +0000 Commit: Jan Beich CommitDate: 2023-05-21 03:13:27 +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 --- 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