aboutsummaryrefslogtreecommitdiff
path: root/x11/xpra
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2021-10-24 12:37:28 +0000
committerGleb Popov <arrowd@FreeBSD.org>2021-10-24 12:38:16 +0000
commit73111d0acf1e4014404801599ab652f00082efcd (patch)
tree409746e4f43118821623f2545f0e9a7b62b0bcf6 /x11/xpra
parent38371efb77500242a3b91b030ae4cf1d6d061fbe (diff)
downloadports-73111d0acf1e4014404801599ab652f00082efcd.tar.gz
ports-73111d0acf1e4014404801599ab652f00082efcd.zip
x11/xpra: Update to 4.2.3
Bring OPTIONS_DEFAULT in line with upstream. Apply cosmetic fixes to the Makefile.
Diffstat (limited to 'x11/xpra')
-rw-r--r--x11/xpra/Makefile20
-rw-r--r--x11/xpra/distinfo6
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 <bsd.port.options.mk>
@@ -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 <bsd.port.pre.mk>
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