From nobody Tue Nov 7 00:20:37 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 4SPTQG1lTTz50nrY; Tue, 7 Nov 2023 00:20:38 +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 4SPTQG0x2mz4TnZ; Tue, 7 Nov 2023 00:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316438; 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=dIXFIsHrEJW5w/uykZQvm+xJGKjhIvGimXfFl3yXJ+4=; b=u8Zad6Qhvh8VRmqHWj74gjOMW4XKaumcDzsj45ATUsUnw7B1XAYZcftn0+nCiluq50Wuy+ 97CNK4fQOA8a9q97ltuhYVVmHLg+VBjPrJ2MtGRofPoOqeCHdQX0PzgD31r0LyjXfTfVe+ FjTIE0dhymX8b9HWQfGNdy93B24N2ZTiuNPZMf/9tOUVN9J9MEnTrS2oHQme7HffdE9bPP qaWf3Z3jRfYEbZx30LYG/cSSzGzuXRieeLj6Ru/ZihsclCZMvZXaL2TjsTPqR8PYzPTbWN HH84TonzPxPfaegwsdt8GE+Y9LadBCX2n/2yrwKP5n8oH0ErR0QDqdIGDZyKog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316438; 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=dIXFIsHrEJW5w/uykZQvm+xJGKjhIvGimXfFl3yXJ+4=; b=CTKHdncuDWbCB7Nkg8OBKtfuNW9UkyXSq4kbDRYulW5RU+PzF6tOVNf0FAKkGqa8Yowsdb K0YtpApoHFNitr1vFekvlvFE5Bb3oPqJUuOIyI5WnZJdnACUL76CMeESZvG0R+qzTlXaQN 4YdO6oFjdcA1j1+Vn7Ma7tlahBXQZMxOQMzREYFONSQHnDs7Yq9Z/+PUIzVWijM/UutzGZ JwZgopq7R5ofYJGaUinwTmTwJl/QVrIcUVaFEjVO0NucdVcQGcKGSTVuEecnA4UB3Es6hG ZoolD1nKQQ2rCmnB/fF5iN2NA88c9++GvLTvZHhTGKyFVbyEp6I1Ul/j62WxGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699316438; a=rsa-sha256; cv=none; b=QWdZzhXbFbcF+dUDs/b3ShZlmCFJ/VRXXVlGgM+qSwr8oEPU23GG85g1HQ4n0pcndMzckE mc7eK96PZWSy/g2leA+mMLNsgfnInyWtSkh8w7VXEn4nW63WGCfOmb76fZmbD1nJ5VcA4+ KSWCi7QgeJaPYzHsTUQtQJxmFFZ+2lNQ+Mdq+IpVzlCVF+BYIkFXA3kjb9vTsvWaNMfEqQ WTpcNmxuPFNsTDnJRiq9GxqLizlgaJw9/ysrIfLoINvDBcnUsYVrujeziN4ZgX2mwscWlO jZgwbC/rhvo7gPf0SWf6rcbjNPte6+6pj2tSEvjx18zcEb3RZXTIac/MBwBE5A== 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 4SPTQF73CjzD6Z; Tue, 7 Nov 2023 00:20:37 +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 3A70KbPP022514; Tue, 7 Nov 2023 00:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A70KbAh022511; Tue, 7 Nov 2023 00:20:37 GMT (envelope-from git) Date: Tue, 7 Nov 2023 00:20:37 GMT Message-Id: <202311070020.3A70KbAh022511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 87f3f099796e - main - games/moonlight-qt: Fix build error for 12.4-RELEASE 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87f3f099796e80d9b44ef03fc2f63bdc52fa30fa Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=87f3f099796e80d9b44ef03fc2f63bdc52fa30fa commit 87f3f099796e80d9b44ef03fc2f63bdc52fa30fa Author: Armin Zhu AuthorDate: 2023-10-29 13:41:39 +0000 Commit: Robert Clausecker CommitDate: 2023-11-07 00:16:49 +0000 games/moonlight-qt: Fix build error for 12.4-RELEASE There is openssl.pc in /usr/libdata/pkgconf on FreeBSD 13.2-RELEASE. But there is nothing on 12.4-RELEASE.So 'PKGCONF += openssl' in .pro file will fail on it. Openssl 1.1.1q is the native part of the system. It should check for the existence of this dependency without limiting the openssl version. I have deleted PKGCONF += openssl and manual add appropriate LDFLAGS on 12.4-RELEASE PR: 274791 --- games/moonlight-qt/Makefile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/games/moonlight-qt/Makefile b/games/moonlight-qt/Makefile index 3bc21934a1c1..92090eef0dd5 100644 --- a/games/moonlight-qt/Makefile +++ b/games/moonlight-qt/Makefile @@ -33,13 +33,27 @@ PLIST_FILES= bin/moonlight-qt \ share/metainfo/com.moonlight_stream.Moonlight.appdata.xml \ share/icons/hicolor/scalable/apps/moonlight.svg \ +.include + +# fix ssl dependency lack on 12.x releases +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -lssl -lcrypto +.endif + post-patch: - @${REINPLACE_CMD} -e 's@^ TARGET = moonlight.*@ TARGET = ${PORTNAME}${PKGNAMESUFFIX}@' \ - ${WRKSRC}/app/app.pro @${REINPLACE_CMD} -e 's@Exec=moonlight.*@Exec=${PORTNAME}${PKGNAMESUFFIX}@' \ ${WRKSRC}/app/deploy/linux/com.moonlight_stream.Moonlight.desktop + @${REINPLACE_CMD} -e 's@^ TARGET = moonlight.*@ TARGET = ${PORTNAME}${PKGNAMESUFFIX}@' \ + ${WRKSRC}/app/app.pro + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 + @${REINPLACE_CMD} -e 's@openssl @@' \ + ${WRKSRC}/app/app.pro + @${REINPLACE_CMD} -e '/openssl/ d' \ + ${WRKSRC}/moonlight-common-c/moonlight-common-c.pro +.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} -.include +.include