x11/xpra: Update to 5.0.4

x11/xpra/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	xpra
-PORTVERSION=	4.4.5
+PORTVERSION=	5.0.4
 CATEGORIES=	x11
 MASTER_SITES=	https://xpra.org/src/
 
@@ -10,10 +10,14 @@ WWW=		https://xpra.org/
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
-LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libbrotlidec.so:archivers/brotli \
+		libdrm.so:graphics/libdrm \
 		libharfbuzz.so:print/harfbuzz \
 		liblz4.so:archivers/liblz4 \
-		libwebp.so:graphics/webp
+		libopenh264.so:multimedia/openh264 \
+		libwebp.so:graphics/webp \
+		libx264.so:multimedia/libx264
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}bencode.py>1:converters/py-bencode.py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}brotli>1:archivers/py-brotli@${PY_FLAVOR} \
@@ -46,11 +50,9 @@ SHEBANG_FILES=	fs/lib/cups/backend/xpraforwarder fs/libexec/xpra/auth_dialog \
 		fs/libexec/xpra/xdg-open fs/libexec/xpra/xpra_signal_listener \
 		fs/libexec/xpra/xpra_udev_product_version
 
-OPTIONS_DEFINE=		AVAHI AVCODEC CUPS DOCS FFMPEG GSTREAMER LIBYUV SWSCALE \
-			WEBCAM X265
-OPTIONS_DEFAULT=	AVAHI CUPS GSTREAMER X264
-OPTIONS_RADIO=		CODEC
-OPTIONS_RADIO_CODEC=	VPX X264
+OPTIONS_DEFINE=		AVAHI CUPS DOCS GSTREAMER LIBYUV SWSCALE \
+			WEBCAM
+OPTIONS_DEFAULT=	AVAHI CUPS GSTREAMER
 OPTIONS_SUB=		yes
 
 AVCODEC_DESC=	Enable avcodec2 (FFmpeg) decoder
@@ -59,42 +61,29 @@ FFMPEG_DESC=	Enable FFmpeg encoder
 GSTREAMER_DESC=	Enable GStreamer for sound forwarding
 LIBYUV_DESC=	Enable libyuv CSC module (fastest)
 SWSCALE_DESC=	Enable swscale (FFmpeg) CSC module
-VPX_DESC=	Enable VP8 and VP9 codec
 WEBCAM_DESC=	Enable webcam forwarding (client only)
-X264_DESC=	Enable X264 encoder
-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_USES=			gstreamer
 GSTREAMER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
 GSTREAMER_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
 GSTREAMER_USE=			GSTREAMER=flac,lame,mpg123,ogg,opus,pulse,vorbis,wavpack
 GSTREAMER_VARS=			XPRA_OPTIONS+=sound
 LIBYUV_LIB_DEPENDS=		libyuv.so:graphics/libyuv
 LIBYUV_VARS=			XPRA_OPTIONS+=csc_libyuv
-SWSCALE_LIB_DEPENDS=		libswscale.so:multimedia/ffmpeg
 SWSCALE_VARS=			XPRA_OPTIONS+=csc_swscale
-VPX_LIB_DEPENDS=		libvpx.so:multimedia/libvpx
-VPX_VARS=			XPRA_OPTIONS+=vpx
 WEBCAM_RUN_DEPENDS=		opencv>2:graphics/opencv
 WEBCAM_VARS=			XPRA_OPTIONS+=webcam
-X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
-X264_VARS=			XPRA_OPTIONS+=enc_x264
-X265_LIB_DEPENDS=		libx265.so:multimedia/x265
-X265_VARS=			XPRA_OPTIONS+=enc_x265
 
 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=	strict uinput Xdummy Xdummy_wrapper
+			enc_x264 \
+			mdns printing vpx webcam
+XPRA_OPTIONS=		dec_avcodec2 enc_ffmpeg enc_x264
+XPRA_OPTIONS_DISABLED=	pam strict uinput vpx Xdummy Xdummy_wrapper
 
 .include <bsd.port.options.mk>
 
@@ -111,6 +100,7 @@ PYDISTUTILS_ARGS+=	--with-${opt}
 PYDISTUTILS_BUILDARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_CONFIGUREARGS+=	${PYDISTUTILS_ARGS}
 PYDISTUTILS_INSTALLARGS+=	${PYDISTUTILS_ARGS}
+#MAKE_ENV=	pkgdir=${STAGEDIR}${PREFIX}/
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
@@ -119,11 +109,14 @@ post-patch:
 	    ${WRKSRC}/fs/etc/xpra/conf.d/16_printing.conf.in
 
 post-install:
-	@${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${CP} -r ${STAGEDIR}/etc ${STAGEDIR}${PREFIX} && ${RM} -r ${STAGEDIR}/etc
+	${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \
 	    ${STAGEDIR}${ETCDIR}/xorg.conf.sample
-	@${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \
+	${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
-	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \
+	${CP} -r ${STAGEDIR}${PREFIX}/etc/dbus-1 ${STAGEDIR}${PREFIX}/share && ${RM} -r ${STAGEDIR}${PREFIX}/dbus-1
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \
 	    -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>

x11/xpra/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1685894416
-SHA256 (xpra-4.4.5.tar.xz) = a36bc33f36568291057b4cb3363c2db8b3c73b419f59b4ac70a8ef21f4e2e91a
-SIZE (xpra-4.4.5.tar.xz) = 3056300
+TIMESTAMP = 1702802876
+SHA256 (xpra-5.0.4.tar.xz) = a0a2c2f8c8241628b9222b4ba9ffa3c5e3168534acf53481abba65999b4a647d
+SIZE (xpra-5.0.4.tar.xz) = 8357956

x11/xpra/files/patch-setup.py

@@ -0,0 +1,20 @@
+--- setup.py.orig	2023-10-03 11:21:49 UTC
++++ setup.py
+@@ -269,7 +269,7 @@ evdi_ENABLED            = DEFAULT and LINUX and pkg_co
+ keyboard_ENABLED        = DEFAULT
+ v4l2_ENABLED            = DEFAULT and (not WIN32 and not OSX and not FREEBSD and not OPENBSD)
+ evdi_ENABLED            = DEFAULT and LINUX and pkg_config_version("1.9", "evdi")
+-drm_ENABLED             = DEFAULT and LINUX and pkg_config_version("2.4", "libdrm")
++drm_ENABLED             = DEFAULT and (LINUX or FREEBSD) and pkg_config_version("2.4", "libdrm")
+ #ffmpeg 3.1 or later is required
+ dec_avcodec2_ENABLED    = ffmpeg_ENABLED and pkg_config_version("57", "libavcodec")
+ csc_swscale_ENABLED     = ffmpeg_ENABLED and pkg_config_ok("--exists", "libswscale")
+@@ -2043,7 +2002,7 @@ if data_ENABLED:
+     if not is_openSUSE():
+         add_data_files(share_xpra,                  ["README.md", "COPYING"])
+     add_data_files(share_xpra,                      ["fs/share/xpra/bell.wav"])
+-    if LINUX:
++    if LINUX or FREEBSD:
+         add_data_files(share_xpra,                  ["fs/share/xpra/autostart.desktop"])
+     ICONS = glob.glob("fs/share/xpra/icons/*.png")
+     if OSX: