From nobody Tue Oct 10 12:24:06 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 4S4Zny3jq8z4wh7j; Tue, 10 Oct 2023 12:24:06 +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 4S4Zny2kJzz3gdX; Tue, 10 Oct 2023 12:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696940646; 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=tku2nCGUQXP9324QevPUMRi+GSgYbTV3nCDYtkRBEZw=; b=NnMivcvBrN6enNvi3lVnIW1shLeNSI3h82p1mu8WHdUyOkZssSjc/QsNX7GQiRn2/UV6wi GgI6ezFkOx7nAsFnTTyVqHZAar24OR4XpQ6kuvuuEVsc1O9l3sI606ev7pK6F7JcBfdFMv AMgEbX8gIxWMC4VH+dx/EPVLnbMZkPMgCCob12paWvBmjKQc4rK/113boDfofiXn8YdYH5 NsdkmLim0wwgIqZGSq0S8e+IwAjBoT3QAvtGNNm0niITyA9wXtQ/coKfikWES8ZL6QWP2b xbhz51bNZZPH1sZauOiHVVX17KXhZslF7ajVTzx77sb9VvFXLq88FwuSb7sgiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696940646; a=rsa-sha256; cv=none; b=RncqgvwjiwM7jH6nAEzCjPCCsChWDOX/h89Qrm2o6+fwkRRDd3Zb7iErIqabf84+R5FCPF HGIGUv0fxWUkbAQ2oL2MQE6wt7g+8jIoIoB3LuR8KVV//pi2q/p+f9PDEUmVk2KW0w7R0m 4/p+vvOpLPzBxY0o3xAy4N/kFRLfC/CaTXfZm61G48G1Z4uFYEn8GDIrtBAKyQTes+4NdU AbPMJsvACGApJC0FiwYP2UmAtyl5IU96x4nBYufihl3aTXx42108YJPoaiBH8WBFgTn6zB H6LVkx5wuQxSaMBCKKNnvqsLDnf1G6HZAHSkmS3W6oVnyf4Cmri6Dl1HSkB75A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696940646; 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=tku2nCGUQXP9324QevPUMRi+GSgYbTV3nCDYtkRBEZw=; b=LA4GI5QDtpm1qdb28nwmqz3SPtNIZXGdL+5icgNG+Q23xj5IBPf+evcZOsOA8Zy55qOHpg sizwhSKIaO312IFnWy02HYSLR5KOhjmICM+Fc5WJWZ2115StCrBnSwUdW18r8IEYylip47 tfc8P5cb16z2IIBaArMlxnfTYPRGKmSuUCGEonueEg/9LK1DuToYiLi/2piUc0Bdj+YDgG toxsVnjXT3MOD6HnwBGyg4Plxdk1mwkgrX3CPyxdcicOQAqX6t+pvtEqTL+BnFTZEsgdoJ Bk9OUKpb/t0o6REV7WNeXxP1NmmgOPCaXInmAcxgeV+jM87Jky4kti8KmFf1AA== 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 4S4Zny1mddzdh8; Tue, 10 Oct 2023 12:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39ACO69Z087876; Tue, 10 Oct 2023 12:24:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ACO6sm087873; Tue, 10 Oct 2023 12:24:06 GMT (envelope-from git) Date: Tue, 10 Oct 2023 12:24:06 GMT Message-Id: <202310101224.39ACO6sm087873@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 3f85c64afc47 - main - net-im/signal-desktop: Fix build on aarch64 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f85c64afc478f6352b311dcb10b1453f8039fed Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f85c64afc478f6352b311dcb10b1453f8039fed commit 3f85c64afc478f6352b311dcb10b1453f8039fed Author: Mikael Urankar AuthorDate: 2023-10-10 12:22:48 +0000 Commit: Mikael Urankar CommitDate: 2023-10-10 12:23:47 +0000 net-im/signal-desktop: Fix build on aarch64 libvk_swiftshader is x86 only Reported by: jhibbits --- net-im/signal-desktop/Makefile | 10 +++++++++- net-im/signal-desktop/pkg-plist | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 1080025b1e84..6c4dc5af9a03 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -104,6 +104,14 @@ PLIST_SUB= NODE_ARCH=${NODE_ARCH} \ YARN_TIMESTAMP= 1661146515 +.include + +.if ${ARCH} == aarch64 +PLIST_SUB+= NOT_AARCH64="@comment " +.elif ${ARCH} == amd64 +PLIST_SUB+= NOT_AARCH64="" +.endif + fetch-yarn: if [ ! -f ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz ]; then \ ${MKDIR} /tmp/signal-desktop; \ @@ -230,4 +238,4 @@ create-caches-tarball: cd ${WRKDIR} && \ ${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm -.include +.include diff --git a/net-im/signal-desktop/pkg-plist b/net-im/signal-desktop/pkg-plist index c50aff9eebad..3b6939e8b8f3 100644 --- a/net-im/signal-desktop/pkg-plist +++ b/net-im/signal-desktop/pkg-plist @@ -8,7 +8,7 @@ share/pixmaps/signal-desktop.png %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libffmpeg.so -%%DATADIR%%/libvk_swiftshader.so +%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%DATADIR%%/libvulkan.so %%DATADIR%%/locales/af-ZA.pak %%DATADIR%%/locales/af.pak