From nobody Mon Apr 10 08:35:20 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 4Pw2NS5Y3Mz44y9B; Mon, 10 Apr 2023 08:35:20 +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 4Pw2NS4ntBz4TVD; Mon, 10 Apr 2023 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681115720; 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=neaAQplv1VprfjheWLGHWteyGknZUauzeUXZQAmZ2K4=; b=HeEEc6crMnA/WlyGKEhAejlJbtiNmVleMX+T1VoEWkz1FcRyPGdVv6e5EkpJ/nGLxBsQKH GFdpOQ9seoZXWfwAaCfPvw5caM76dy9Bf0K/hKlue/tprU8wnxvxKjdjbiSqg+SEYPHyrB 4KNJGLruNH8H3rSsA9NYYQ64J1jZHHBIpLWN0Xf2OPGsGjo6OZdD+NVZErw4TJNoRaxalw QHPX0YaCK4PitWc+WfQsJU/4Lxjv4+bg7r62QX3YwQ0AjeRLJf8EHdJ4Ee8/4vt/6A8mSt /IzC7khB4te6Ulg7qJZwZGgghuzfhNWaJxUNq09t60pljWLyqDrtozPURXrIiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681115720; 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=neaAQplv1VprfjheWLGHWteyGknZUauzeUXZQAmZ2K4=; b=HL07MaiEcNvoWaLpTIvLdaA2nFYe4ZQ+fIwcgshnwpZ8u5Vl1oBoCyP8uJzsiB48sOSX36 xxiXsZcOWxkRFNE1K1nqI5gUeAKNwqtR8wUcH92WFIfXIEYBN70BHpCztKMfIhP6Otaz20 a3aEQMUJess+dzSXEXGusqc3MtUmHfrCl8prvifMBzCngsz+iTrvI0dY1aqbPT7d5PTyQi S4BUkbZ7lc3rE1CrAIqmCnzPbGNH1co1l9f/OG9HxZ+MZk7hyHXYw9k9D1K9M59uOyfsiJ BAYSL4OoSMusZY5WG3wlxaDsuxD+WKeE++ysgtCEgQoV0uFskTYM3Lv1aLdAeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681115720; a=rsa-sha256; cv=none; b=ceECL9tFtC2s3KXQmy/Oz07pQhR4WdYM7T2ojAH88Xn294+0NxOqv1bWjRREaYaJQm7zPc cCWWY8tjRcXl3ktChZWleaM+K0KyWLzTYhEOPWn9J5m2+ipbd0Fxk5k2TQrG7f9mVIY2Sv dN8bYDmIPEugzPwKlTxJBQtliElJyOi+ZPYWAiW//EZC8hzr+Fd+YXKzsyGu1nKEYH8vIA 0D9CipF8Rf+g3GWv+NzOrmQ6ojZ4iIQG7WAYoikqGE/DLX9oVb+HUHGlhJg8MVvMIq7oys 4SwrB9Dg2dms1l9mTXnyDk80LtZfwbGFNLcJPoyy/YzTmOdZHnySbCRZ9hBrXw== 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 4Pw2NS3WgMzk2H; Mon, 10 Apr 2023 08:35:20 +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 33A8ZKaT066003; Mon, 10 Apr 2023 08:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A8ZKck066002; Mon, 10 Apr 2023 08:35:20 GMT (envelope-from git) Date: Mon, 10 Apr 2023 08:35:20 GMT Message-Id: <202304100835.33A8ZKck066002@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 284339db15d2 - main - net/guacamole-server: Use upstream release archive and fix build with FFmpeg 6.0 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 284339db15d25aae9c32a820bd5a6295686373ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=284339db15d25aae9c32a820bd5a6295686373ed commit 284339db15d25aae9c32a820bd5a6295686373ed Author: Daniel Engberg AuthorDate: 2023-04-10 08:30:03 +0000 Commit: Daniel Engberg CommitDate: 2023-04-10 08:33:39 +0000 net/guacamole-server: Use upstream release archive and fix build with FFmpeg 6.0 Use upstream release archive as recommended by Porters Handbook Backport upstream commit 5cf408ebbba9544fb5dfb297d98d5a1e1751a56d to fix build with FFmpeg 6.0 References: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261302#c46 https://github.com/apache/guacamole-server/commit/5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch PR: 270313 Reported by: antoine (via exp-run) Reviewed by: ultima (maintainer) --- net/guacamole-server/Makefile | 7 ++++--- net/guacamole-server/distinfo | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index 19d180d766e0..fa515db30220 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -1,6 +1,10 @@ PORTNAME= guacamole-server DISTVERSION= 1.5.0 CATEGORIES= net +MASTER_SITES= APACHE/guacamole/${DISTVERSION}/source/ + +PATCH_SITES= https://github.com/apache/${PORTNAME}/commit/ +PATCHFILES= 5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch:-p1 MAINTAINER= ultima@FreeBSD.org COMMENT= HTML5 Clientless Remote Desktop @@ -17,9 +21,6 @@ CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USES= autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \ shebangfix -USE_GITHUB= yes -GH_ACCOUNT= apache - USE_GNOME= cairo USE_LDCONFIG= yes USE_RC_SUBR= guacd diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo index fb4a0a5d296e..394a47a08829 100644 --- a/net/guacamole-server/distinfo +++ b/net/guacamole-server/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1676996246 -SHA256 (apache-guacamole-server-1.5.0_GH0.tar.gz) = f300427bf5119d85ea3831039211474e643c15617a8fb064afb0ed02e2b123b0 -SIZE (apache-guacamole-server-1.5.0_GH0.tar.gz) = 554772 +TIMESTAMP = 1679141585 +SHA256 (guacamole-server-1.5.0.tar.gz) = c6c09e4056f1edd88a3c425ef05043ff835da5c1c92348bbdbf5a99e512f5fd4 +SIZE (guacamole-server-1.5.0.tar.gz) = 1102862 +SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083 +SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222