diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2020-04-02 17:23:35 +0800 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2020-04-02 17:23:35 +0800 |
| commit | 16661b58650165c3d9da66ca35c833c5dbbec90a (patch) | |
| tree | 19c1f7acc11c5381aa1747e31696506134ff6a6f /x11 | |
| parent | 84c8a189a88388d040965849ed7ba72be2640856 (diff) | |
| download | freebsd-ports-gnome-16661b58650165c3d9da66ca35c833c5dbbec90a.tar.gz freebsd-ports-gnome-16661b58650165c3d9da66ca35c833c5dbbec90a.tar.zst freebsd-ports-gnome-16661b58650165c3d9da66ca35c833c5dbbec90a.zip | |
x11/xpra: Fix GSTREAMER option. Make Xpra call "pythonX.Y" executable instead of "python3".
Submitted by: Geoff Roberts <geoff@strategicict.com.au>
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xpra/Makefile | 4 | ||||
| -rw-r--r-- | x11/xpra/files/patch-xpra_platform_xposix_paths.py | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 8580f66c0f9e..a73072d82d61 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -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:print/py-pycups@${PY_FLAVOR} 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 diff --git a/x11/xpra/files/patch-xpra_platform_xposix_paths.py b/x11/xpra/files/patch-xpra_platform_xposix_paths.py new file mode 100644 index 000000000000..5afff29f0a03 --- /dev/null +++ b/x11/xpra/files/patch-xpra_platform_xposix_paths.py @@ -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"] |