[patch] x11-wm/xpra/files/xpra-4.0-sound-module.patch

xpra-4.0-sound-module.patch (text/plain), 2.11 KB, created by mehw on 2020-06-07 22:44:53 UTC

This closes the Ticket #2801:
http://xpra.org/trac/ticket/2801

When running setup.py with the options '--with-opengl --without-sound'
there will be an error starting the client:

$ xpra start :7
$ xpra attach :7

Warning: cannot import native OpenGL module
 No module named 'xpra.sound'

The changeset 25991 introduced the use of the function force_enabled
imported from the sound module in gl_check.py. Despite the fact that
it requires one argument, it is used without when checking OpenGL. I
believe that force_enable is meant to be used instead, which doesn't
require to import the sound module. Hence OpenGL can be checked with
no sound module.
https://xpra.org/trac/changeset/25991/xpra/trunk/src/xpra/client/gl/gl_check.py

diff -Nuar a/xpra/client/gl/gl_check.py b/xpra/client/gl/gl_check.py
--- a/xpra/client/gl/gl_check.py	2020-05-10 19:00:53.000000000 +0200
+++ b/xpra/client/gl/gl_check.py	2020-06-07 21:28:48.167122367 +0200
@@ -12,7 +12,6 @@
 from xpra.os_util import POSIX, OSX, bytestostr
 from xpra.log import Logger, CaptureHandler
 from xpra.client.gl.gl_drivers import WHITELIST, GREYLIST, VERSION_REQ, BLACKLIST, OpenGLFatalError
-from xpra.sound.gstreamer_util import force_enabled
 
 log = Logger("opengl")
 
@@ -130,7 +129,7 @@
         from OpenGL.GL import GL_VERSION, GL_EXTENSIONS
         from OpenGL.GL import glGetString, glGetIntegerv
         gl_version_str = glGetString(GL_VERSION)
-        if gl_version_str is None and not force_enabled:
+        if gl_version_str is None and not force_enable:
             raise_fatal_error("OpenGL version is missing - cannot continue")
             return props
         #b'4.6.0 NVIDIA 440.59' -> ['4', '6', '0 NVIDIA...']
@@ -147,7 +146,7 @@
             props["opengl"] = gl_major, gl_minor
             MIN_VERSION = (1,1)
             if (gl_major, gl_minor) < MIN_VERSION:
-                if not force_enabled:
+                if not force_enable:
                     raise_fatal_error("OpenGL output requires version %s or greater, not %s.%s" %
                                   (".".join([str(x) for x in MIN_VERSION]), gl_major, gl_minor))
                     return props