From nobody Sun Oct 24 12:38:36 2021 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 A59BF181166E; Sun, 24 Oct 2021 12:38:36 +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 4Hcd18466Mz4SrZ; Sun, 24 Oct 2021 12:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6DAE715B87; Sun, 24 Oct 2021 12:38:36 +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 19OCcaSp075672; Sun, 24 Oct 2021 12:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19OCcaNv075671; Sun, 24 Oct 2021 12:38:36 GMT (envelope-from git) Date: Sun, 24 Oct 2021 12:38:36 GMT Message-Id: <202110241238.19OCcaNv075671@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 73111d0acf1e - main - x11/xpra: Update to 4.2.3 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73111d0acf1e4014404801599ab652f00082efcd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=73111d0acf1e4014404801599ab652f00082efcd commit 73111d0acf1e4014404801599ab652f00082efcd Author: Gleb Popov AuthorDate: 2021-10-24 12:37:28 +0000 Commit: Gleb Popov CommitDate: 2021-10-24 12:38:16 +0000 x11/xpra: Update to 4.2.3 Bring OPTIONS_DEFAULT in line with upstream. Apply cosmetic fixes to the Makefile. --- x11/xpra/Makefile | 20 ++++++-------------- x11/xpra/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index e05a7e660785..4c83b13194e7 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -1,6 +1,5 @@ PORTNAME= xpra -PORTVERSION= 4.2.2 -PORTREVISION= 1 +PORTVERSION= 4.2.3 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ @@ -32,7 +31,7 @@ RUN_DEPENDS= ${PY_PILLOW} \ Xvfb:x11-servers/xorg-vfbserver USES= desktop-file-utils gettext-runtime gnome pkgconfig \ - python:3.6+ shared-mime-info shebangfix xorg + python:3.6+ shared-mime-info shebangfix tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtk30 pygobject3 USE_PYTHON= cython distutils noflavors @@ -43,15 +42,10 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \ SHEBANG_FILES= fs/lib/cups/xpraforwarder fs/bin/auth_dialog fs/bin/xdg-open \ fs/bin/xpra_udev_product_version fs/bin/gnome-open \ fs/bin/gvfs-open -SHEBANG_LANG= sh -sh_OLD_CMD= /usr/bin/sh -sh_CMD= /bin/sh -MAKE_ENV= XPRA_USE_PROCESS_POLLING=1 OPTIONS_DEFINE= AVAHI AVCODEC CUPS FFMPEG GSTREAMER LIBYUV SWSCALE VPX \ WEBCAM X264 X265 -OPTIONS_DEFAULT= AVAHI AVCODEC CUPS FFMPEG GSTREAMER LIBYUV SWSCALE VPX \ - X264 X265 +OPTIONS_DEFAULT= AVAHI CUPS GSTREAMER OPTIONS_SUB= yes AVCODEC_DESC= Enable avcodec2 (FFmpeg) decoder @@ -67,9 +61,11 @@ X265_DESC= Enable X265 encoder AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR} AVAHI_VARS= XPRA_OPTIONS+=mdns +AVCODEC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR} CUPS_VARS= XPRA_OPTIONS+=printing +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg GSTREAMER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR} GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR} \ @@ -93,7 +89,7 @@ PYDISTUTILS_PKGNAME= xpra_all XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED} csc_libyuv csc_swscale \ dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 \ mdns printing sound vpx webcam -XPRA_OPTIONS_DISABLED= netdev service uinput Xdummy Xdummy_wrapper +XPRA_OPTIONS_DISABLED= uinput Xdummy Xdummy_wrapper .include @@ -105,10 +101,6 @@ PYDISTUTILS_ARGS+= --with-${opt} .endif .endfor -.if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg -.endif - .include PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS} diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo index 676e39f15f2e..eace3a348ef6 100644 --- a/x11/xpra/distinfo +++ b/x11/xpra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629213758 -SHA256 (xpra-4.2.2.tar.gz) = 26f1f60b7eb4eb672e7a0b33c827d24f0275548d0d99d25d2c0de17f804c7e5a -SIZE (xpra-4.2.2.tar.gz) = 3894227 +TIMESTAMP = 1635068834 +SHA256 (xpra-4.2.3.tar.xz) = c6664fe4ccfec95623af36289525b3d91c93aed3e321107599e22d8941c57bc7 +SIZE (xpra-4.2.3.tar.xz) = 2700956