From nobody Tue Oct 10 13:20:12 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 4S4c2h4P3Zz4wl6g; Tue, 10 Oct 2023 13:20:12 +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 4S4c2h3zVjz4Gv6; Tue, 10 Oct 2023 13:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696944012; 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=h7LCCHGaDU8v5PjHkm7KC7sCbE+fFKyUB/8f2cBD0q8=; b=NYJNOOAt/HuL8dU4zCGqtx/kL8A0Bl16yHjgG0iiqDHBwz2DrJ+JUN6DInAAC8XI75OO0m LBV6BFoKA07J4wgi2Wkcm1bJ3tNvhJl2rJqoQ/nY4ygO0BePYKQGoY+iMeBg4nrrleW7KI gFXwU3/fHcAjW/vv+A2E0RmSIcUOA15p3ijC7aLMuw69obE75kmyrAa/rk1MrSEkj8+VGk Jbst5rC7xsRmdAVlJGb8m6b1zyNYriooIheRD+teGjDZAJPAxR4GmNwDl2JQd6rgl0BnCM LdeGOWOIZgv5VTUVB8Jh3qd3dh0t6WUPBkgyE9I/GyCY1AMhgu9Rkn21SRlIYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696944012; a=rsa-sha256; cv=none; b=KPr+fMbvq9DdOvVA71US7zUELOiTidn90svtPS3x/f99b9zXBsnA5nbxhDhRgL/kVXeL0M upXFO1ksez40oPdAgPoZ0Fc9Ub8NkqI5Y5OBPdsHOrsWz9NrqtNAuQUhtYXvuSP0lcsDr3 TkWjVQ7f6Kc2Rjehnc/RwZqztFjU7fW3lQx63znIm3SxZLU9jsBDDtek1A5kGEYMTwsDjd 2siu16xit6TttWMBhMqgXiuJ984n+IvMRffDviSvgM/CXNfsPQvdRBbzQwQ4l5sedYxUx7 UMyxGqq9Q/uHwTvKO8iaYHECbx5qgp4saMgxYT5tYPdm2GhES5L99a/rIxsLbQ== 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=1696944012; 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=h7LCCHGaDU8v5PjHkm7KC7sCbE+fFKyUB/8f2cBD0q8=; b=oJJ61yYsSx3YSmCu43r6x2wuBmwVRbqpFO/Y2/Ono6kxCgq0t/35ODZB4c0gxLvwOl+x29 MXzOYsLoTnPdoOFTf1kDQF4I2kdR0BibCldbVQRLv49DqGsSWFAFdfmeeId4wIrAPqxdIr bcDjjfKlzcy73eZyrlDtVRX7hRgmcnYI0Ibv9zoGFqdoqzo4cqy+xC9R5OTIAKfQ8eUDyX f4EcZTNynwleyFvmf/ImhdLW2cjzB12OuZj6mtSu9WHe19NNqGEV6956TyzXWZHrEYYhya EJ2u3LtVXjpsioplPYw1YQMswXZos93mOa/4NBggR4eoz4bj9h/E5MT2EfGrNQ== 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 4S4c2h34BzzfVx; Tue, 10 Oct 2023 13:20:12 +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 39ADKCwH078012; Tue, 10 Oct 2023 13:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ADKCcW078008; Tue, 10 Oct 2023 13:20:12 GMT (envelope-from git) Date: Tue, 10 Oct 2023 13:20:12 GMT Message-Id: <202310101320.39ADKCcW078008@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: 7834c5e34c75 - 2023Q4 - net-im/signal-desktop: Fix build on aarch64 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 7834c5e34c75214ddb8117037df5526037bf322c Auto-Submitted: auto-generated The branch 2023Q4 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=7834c5e34c75214ddb8117037df5526037bf322c commit 7834c5e34c75214ddb8117037df5526037bf322c Author: Mikael Urankar AuthorDate: 2023-10-10 12:22:48 +0000 Commit: Mikael Urankar CommitDate: 2023-10-10 13:19:46 +0000 net-im/signal-desktop: Fix build on aarch64 libvk_swiftshader is x86 only Reported by: jhibbits (cherry picked from commit 3f85c64afc478f6352b311dcb10b1453f8039fed) --- 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