/[gentoo-x86]/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
Gentoo

Contents of /x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Mon Jun 24 15:41:20 2013 UTC (6 years, 8 months ago) by xmw
Branch: MAIN
File MIME type: text/x-diff
Revbump to add IUSE=opengl (bug 470274, thanks Oliver Freyermuth). Make opengl default to auto and improve --help output. Replace configuration patches with setup.py --with/--without syntax. IUSE=sound adopted from upstream, but untested.

(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

1 --- xpra-0.9.5/xpra/scripts/config.py
2 +++ xpra-0.9.5/xpra/scripts/config.py
3 @@ -117,9 +117,10 @@
4 if e.args[0]==errno.EACCES:
5 return "VirtualBox is present (VBoxMiniRdrDN)"
6 return None
7 -OPENGL_DEFAULT = False
8 -#if OpenGL_safety_check() is not None:
9 -# OPENGL_DEFAULT = False
10 +if OpenGL_safety_check() is not None:
11 + OPENGL_DEFAULT = False
12 +else:
13 + OPENGL_DEFAULT = None
14
15
16
17 @@ -452,6 +453,13 @@
18 else:
19 warn("Warning: cannot parse value '%s' for '%s' as a boolean" % (v, k))
20
21 +def print_bool(k, v):
22 + if type(v)==type(None):
23 + return 'auto'
24 + if type(v)==bool:
25 + return v and 'yes' or 'no'
26 + warn("Warning: cannot print value '%s' for '%s' as a boolean" % (v, k))
27 +
28 def parse_number(numtype, k, v, auto=-1):
29 if type(v)==str:
30 v = v.lower()
31 --- xpra-0.9.5/xpra/scripts/main.py
32 +++ xpra-0.9.5/xpra/scripts/main.py
33 @@ -24,7 +24,7 @@
34 get_default_socket_dir,
35 init as platform_init)
36 from xpra.bytestreams import TwoFileConnection, SocketConnection
37 -from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool
38 +from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool, print_bool
39 from wimpiggy.gobject_compat import import_gobject
40
41 SIGNAMES = {signal.SIGINT:"SIGINT", signal.SIGTERM:"SIGTERM"}
42 @@ -253,7 +253,7 @@
43 "These options control client features that affect the appearance or the keyboard.")
44 parser.add_option_group(group)
45 group.add_option("--opengl", action="store",
46 - dest="opengl", default=defaults.opengl,
47 + dest="opengl", default=print_bool('opengl', defaults.opengl),
48 help="Use OpenGL accelerated rendering, options: yes,no,auto. Default: %default.")
49 group.add_option("--no-windows", action="store_false",
50 dest="windows", default=defaults.windows,

  ViewVC Help
Powered by ViewVC 1.1.20