Date: Thu, 2 Apr 2020 09:23:36 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530267 - in head/x11/xpra: . files Message-ID: <202004020923.0329NaJ2040658@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Thu Apr 2 09:23:35 2020 New Revision: 530267 URL: https://svnweb.freebsd.org/changeset/ports/530267 Log: x11/xpra: Fix GSTREAMER option. Make Xpra call "pythonX.Y" executable instead of "python3". Submitted by: Geoff Roberts <geoff@strategicict.com.au> Added: head/x11/xpra/files/patch-xpra_platform_xposix_paths.py (contents, props changed) Modified: head/x11/xpra/Makefile Modified: head/x11/xpra/Makefile ============================================================================== --- head/x11/xpra/Makefile Thu Apr 2 09:17:30 2020 (r530266) +++ head/x11/xpra/Makefile Thu Apr 2 09:23:35 2020 (r530267) @@ -2,6 +2,7 @@ PORTNAME= xpra PORTVERSION= 3.0.7 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ @@ -65,7 +66,8 @@ CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:pri CUPS_VARS= XPRA_OPTIONS+=printing 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} +GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR} \ + gstreamer1-plugins-pulse>1:audio/gstreamer1-plugins-pulse GSTREAMER_USE= GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack GSTREAMER_VARS= XPRA_OPTIONS+=sound HTML5_VARS= XPRA_OPTIONS+=html5 Added: head/x11/xpra/files/patch-xpra_platform_xposix_paths.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xpra/files/patch-xpra_platform_xposix_paths.py Thu Apr 2 09:23:35 2020 (r530267) @@ -0,0 +1,17 @@ +--- xpra/platform/xposix/paths.py.orig 2019-09-24 13:54:00 UTC ++++ xpra/platform/xposix/paths.py +@@ -177,12 +177,12 @@ def do_get_default_log_dirs(): + def do_get_sound_command(): + from xpra.platform.paths import get_xpra_command + if SOUND_PYTHON3: +- return ["python3"]+get_xpra_command() ++ return ["python%i.%i" % (sys.version_info.major, sys.version_info.minor)]+get_xpra_command() + return get_xpra_command() + + def do_get_xpra_command(): + #try to use the same "xpra" executable that launched this server, + #whilst also preserving the python interpreter version: + if sys.argv and sys.argv[0].lower().endswith("/xpra"): +- return ["python%i" % sys.version_info[0], sys.argv[0]] ++ return ["python%i.%i" % (sys.version_info.major, sys.version_info.minor), sys.argv[0]] + return ["xpra"]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004020923.0329NaJ2040658>