From nobody Wed Jul 31 05:06:31 2024
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 4WYg6w0244z5R9Sp;
Wed, 31 Jul 2024 05:06:32 +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 "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WYg6v6JTVz4cv0;
Wed, 31 Jul 2024 05:06:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1722402391;
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=wts2PsWp+icHY36toMF7znJ3LEtkIUQHgAiyrFKElh4=;
b=w/3RtLh5HTBSEo2yGq4EGJcV0BfWASWvwR9gqj9vaL+LHlv/wWkAXmaMOFgPMkMGEJv5MU
Z4MWmNi7p7n6L/oqUGrtxF+wOF1z6pIY8e1TZISYCGoaH2HsRrZZBVGY9JjsmRCkPNX9mI
1xXzgqlK0X6qxrJduk+IUGfidyp66fWrVeLjExYLkDrYyNzIy94WQnm+W23hkqWNJekYOu
xvnevb6au6oO46RnCX7Db2nqUwD9VyqwJdzHRVjO+5DO+ZBtZ3XigcVnObuw/O9N0v7QMc
ZAinoLbObDbZ4+8dEnuL9HUcXZxx+almF3yinpQNYNE0YXclmKwPVKavAPAu6w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722402391; a=rsa-sha256; cv=none;
b=XG11+m0LPHMOkTU6gwmpBCNtjgVb8RIPPTDIBquFvcF/AqYwRC5mSHsdHx1RYBUYeheyE+
Es7kooBTeS2kZJa+dfmT8nMrc3gU6RTIOqWZMDtt56D1320HVzM1rTCdJ32rE7K0/Q3DZ5
+FLsJ5AeOQE3wr3JK+BwQ7K6wdOEvrOIQmpXVgdrEpMaMoAtf8rfs/7/cry2NOHh2qqa7b
CeXfk4YA/f3HUt38oGcUoOsFKECCW6wRDjAsZjAcFF3i5smBwZqZ9jO2ogs61mFxRSbBxA
kOUCeFzinmxYJi2fewIOa4bsBn3+Tqv9tRzpQqWxeCCVjyu5jWdOtcl03b9b6A==
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=1722402391;
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=wts2PsWp+icHY36toMF7znJ3LEtkIUQHgAiyrFKElh4=;
b=nBMIBW/XLI3yRr7d+S5dgo/01ggDcYiWLZckswW0RjOVLrfqNDmdXJgTulNaXSJgmzFNGY
GdauxZv1JYFBkIvy+qYTHmyDJRXea9NsUDTwT+kskJFoQ9k/oKdbkV4Zgd4q3J8QKMTeTy
GA8ML3uVeQKEDp4sMUPzfZiKmQMcIaVZRc/xiz9MAivNssjnphiBPMlahfnqC3vKrs8JHJ
hEbcGgSBxrLPQMBXdfQqBPEGW5/SP44ESiIABY0ibwbej9mAaqKY/ov/ic1ipUamKUAJom
QhtdQiv4s40nfI3sxQhq3zwAJpi7dfnunpg17m5p6pwmkW41ClqTHzJUwhckdw==
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 4WYg6v5nbbznts;
Wed, 31 Jul 2024 05:06:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46V56VAQ019760;
Wed, 31 Jul 2024 05:06:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46V56VAa019757;
Wed, 31 Jul 2024 05:06:31 GMT
(envelope-from git)
Date: Wed, 31 Jul 2024 05:06:31 GMT
Message-Id: <202407310506.46V56VAa019757@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Koichiro Iwao
Subject: git: 3d472dc668c6 - main - net/tigervnc-*: Update to 1.14.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:
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-dev-commits-ports-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: meta
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 3d472dc668c6b9181505049e0bf7a38defd5364f
Auto-Submitted: auto-generated
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3d472dc668c6b9181505049e0bf7a38defd5364f
commit 3d472dc668c6b9181505049e0bf7a38defd5364f
Author: Koichiro Iwao
AuthorDate: 2024-07-31 02:17:14 +0000
Commit: Koichiro Iwao
CommitDate: 2024-07-31 04:35:56 +0000
net/tigervnc-*: Update to 1.14.0
Changes: https://github.com/TigerVNC/tigervnc/releases/tag/v1.14.0
A prominent change that affects FreeBSD port is:
* The viewers and servers now follow the XDG Base Directory
Specification, like "~/.config", for storing files in the home
directory. Existing users will continue using the legacy "~/.vnc"
directory, but new users will get the XDG directories.
While here,
- Adjust BUILD_DEPENDS and LIB_DEPENDS reported in stage-qa
---
net/tigervnc-server/Makefile | 18 +++++++-----------
net/tigervnc-server/Makefile.common.mk | 2 +-
net/tigervnc-server/distinfo | 6 +++---
net/tigervnc-viewer-java/Makefile | 1 -
net/tigervnc-viewer/Makefile | 10 +++-------
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile
index 8846bcf4c58f..94e7e0910730 100644
--- a/net/tigervnc-server/Makefile
+++ b/net/tigervnc-server/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 4
PKGNAMESUFFIX= -server
COMMENT= TigerVNC Server
@@ -7,18 +6,19 @@ WWW= https://tigervnc.org/
PATCH_DEPENDS+= ${NONEXISTENT}:x11-servers/xorg-server:patch
BUILD_DEPENDS+= ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
+ ${LOCALBASE}/include/libxcvt/libxcvt.h:x11/libxcvt \
bash:shells/bash
LIB_DEPENDS= libxshmfence.so:x11/libxshmfence \
- libxcvt.so:x11/libxcvt \
libnettle.so:security/nettle \
- libgmp.so:math/gmp
+ libgmp.so:math/gmp \
+ libavcodec.so:multimedia/ffmpeg
# almost equivalent to x11-servers/xorg-server's
RUN_DEPENDS+= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
xkbcomp:x11/xkbcomp
USES+= autoreconf:build compiler:c11 gl jpeg libtool perl5 pkgconfig ssl shebangfix xorg
USE_LDCONFIG= yes
-USE_GL+= gl
+USE_GL+= gbm gl
USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont2 \
xkbfile xorg-macros xorgproto xrandr xrender xtrans xtst
@@ -30,10 +30,7 @@ OPTIONS_DEFAULT= GNUTLS PAM
OPTIONS_SUB= yes
GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS
GNUTLS_CONFIGURE_ARGS= --enable-glx-tls
-GNUTLS_LIB_DEPENDS= libtasn1.so:security/libtasn1 \
- libgcrypt.so:security/libgcrypt \
- libgpg-error.so:security/libgpg-error \
- libgnutls.so:security/gnutls
+GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
PAM_CMAKE_BOOL= ENABLE_PAM
CONFIGURE_ARGS+= \
@@ -70,13 +67,12 @@ CFLAGS+= -I${LOCALBASE}/include/libdrm
# - server is not internationalized
CMAKE_ARGS+= -DBUILD_VIEWER:BOOL=false -DENABLE_NLS:BOOL=false
-TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g
+# TIGERVNC_XOG_PATCH_VER will be 21 when xorg-server 21.1.13
+TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:R
XORG_WRKSRC= ${MAKE} -C ${.CURDIR}/../../x11-servers/xorg-server -VWRKSRC
pre-patch:
${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/
- # workaround: upstream changed patch naming
- ${LN} -sf ${WRKSRC}/unix/xserver21.1.1.patch ${WRKSRC}/unix/xserver211.patch
post-patch:
# do not build tests
diff --git a/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk
index 0dcb4abe7c15..476901ee66e5 100644
--- a/net/tigervnc-server/Makefile.common.mk
+++ b/net/tigervnc-server/Makefile.common.mk
@@ -1,6 +1,6 @@
PORTNAME= tigervnc
DISTVERSIONPREFIX= v
-DISTVERSION= 1.13.1
+DISTVERSION= 1.14.0
CATEGORIES= net x11-servers
MAINTAINER?= meta@FreeBSD.org
diff --git a/net/tigervnc-server/distinfo b/net/tigervnc-server/distinfo
index b60061a5e3b7..2f99534df03d 100644
--- a/net/tigervnc-server/distinfo
+++ b/net/tigervnc-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678235423
-SHA256 (TigerVNC-tigervnc-v1.13.1_GH0.tar.gz) = b7c5b8ed9e4e2c2f48c7b2c9f21927db345e542243b4be88e066b2daa3d1ae25
-SIZE (TigerVNC-tigervnc-v1.13.1_GH0.tar.gz) = 1989081
+TIMESTAMP = 1722387402
+SHA256 (TigerVNC-tigervnc-v1.14.0_GH0.tar.gz) = 5700f9919802a2f0529cc058b8caded03281cdbf0335581f2dcc7df03f783419
+SIZE (TigerVNC-tigervnc-v1.14.0_GH0.tar.gz) = 2090452
diff --git a/net/tigervnc-viewer-java/Makefile b/net/tigervnc-viewer-java/Makefile
index cc05684b4145..0a9ae19cc674 100644
--- a/net/tigervnc-viewer-java/Makefile
+++ b/net/tigervnc-viewer-java/Makefile
@@ -1,5 +1,4 @@
PKGNAMESUFFIX= -viewer-java
-PORTREVISION= 1
CATEGORIES= net java
COMMENT= TigerVNC Viewer
diff --git a/net/tigervnc-viewer/Makefile b/net/tigervnc-viewer/Makefile
index 259078c5f632..e9161161ec94 100644
--- a/net/tigervnc-viewer/Makefile
+++ b/net/tigervnc-viewer/Makefile
@@ -1,5 +1,4 @@
PKGNAMESUFFIX= -viewer
-PORTREVISION= 2
CATEGORIES= net
COMMENT= TigerVNC Viewer
@@ -9,10 +8,10 @@ USES+= gnome iconv jpeg magick:7,build xorg
USE_XORG+= ice pixman sm x11 xcursor xext xfixes xft xi xinerama xrender xrandr
LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
- libpng.so:graphics/png \
libfltk.so:x11-toolkits/fltk \
libnettle.so:security/nettle \
- libgmp.so:math/gmp
+ libgmp.so:math/gmp \
+ libavcodec.so:multimedia/ffmpeg
OPTIONS_DEFINE= DOCS GNUTLS NLS
OPTIONS_DEFAULT= GNUTLS
@@ -20,10 +19,7 @@ OPTIONS_SUB= yes
NLS_CMAKE_BOOL= ENABLE_NLS
NLS_USES= gettext
GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS
-GNUTLS_LIB_DEPENDS= libtasn1.so:security/libtasn1 \
- libgcrypt.so:security/libgcrypt \
- libgpg-error.so:security/libgpg-error \
- libgnutls.so:security/gnutls
+GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \
"${PORTNAME}" "vncviewer" "Network;" false