Ticket #1425: enc_vpx-osx-disable.patch

setup.py

@@ -2390 +2390 @@
               }
     make_constants("xpra", "codecs", "vpx", "constants", **kwargs)
     vpx_pkgconfig = pkgconfig("vpx")
-    cython_add(Extension("xpra.codecs.vpx.encoder",
-                ["xpra/codecs/vpx/encoder.pyx"]+membuffers_c,
-                **vpx_pkgconfig))
+    if not OSX:
+        #this codec causes crashes on OSX
+        cython_add(Extension("xpra.codecs.vpx.encoder",
+                    ["xpra/codecs/vpx/encoder.pyx"]+membuffers_c,
+                    **vpx_pkgconfig))
     cython_add(Extension("xpra.codecs.vpx.decoder",
                 ["xpra/codecs/vpx/decoder.pyx"]+membuffers_c,
                 **vpx_pkgconfig))

xpra/codecs/loader.py

@@ -7 +7 @@
 import sys
 import os.path
 
+from xpra.os_util import OSX
 from xpra.util import envbool
 from xpra.log import Logger
 log = Logger("codec", "loader")
@@ -154 +155 @@
         codec_import_check("enc_jpeg", "JPEG decoder", "xpra.codecs.jpeg", "xpra.codecs.jpeg.encoder", "encoder")
         add_codec_version("enc_jpeg", "xpra.codecs.jpeg.encoder")
 
-        codec_import_check("enc_vpx", "vpx encoder", "xpra.codecs.vpx", "xpra.codecs.vpx.encoder", "Encoder")
-        add_codec_version("vpx", "xpra.codecs.vpx.decoder")
+        if not OSX:
+            #causes crashes with osx shadow servers, disabled in setup.py:
+            codec_import_check("enc_vpx", "vpx encoder", "xpra.codecs.vpx", "xpra.codecs.vpx.encoder", "Encoder")
+            add_codec_version("vpx", "xpra.codecs.vpx.decoder")
 
         codec_import_check("enc_x264", "x264 encoder", "xpra.codecs.enc_x264", "xpra.codecs.enc_x264.encoder", "Encoder")
         add_codec_version("x264", "xpra.codecs.enc_x264.encoder")