Ticket #1425: enc_vpx-osx-disable.patch
File enc_vpx-osx-disable.patch, 2.0 KB (added by , 4 years ago) |
---|
-
setup.py
2390 2390 } 2391 2391 make_constants("xpra", "codecs", "vpx", "constants", **kwargs) 2392 2392 vpx_pkgconfig = pkgconfig("vpx") 2393 cython_add(Extension("xpra.codecs.vpx.encoder", 2394 ["xpra/codecs/vpx/encoder.pyx"]+membuffers_c, 2395 **vpx_pkgconfig)) 2393 if not OSX: 2394 #this codec causes crashes on OSX 2395 cython_add(Extension("xpra.codecs.vpx.encoder", 2396 ["xpra/codecs/vpx/encoder.pyx"]+membuffers_c, 2397 **vpx_pkgconfig)) 2396 2398 cython_add(Extension("xpra.codecs.vpx.decoder", 2397 2399 ["xpra/codecs/vpx/decoder.pyx"]+membuffers_c, 2398 2400 **vpx_pkgconfig)) -
xpra/codecs/loader.py
7 7 import sys 8 8 import os.path 9 9 10 from xpra.os_util import OSX 10 11 from xpra.util import envbool 11 12 from xpra.log import Logger 12 13 log = Logger("codec", "loader") … … 154 155 codec_import_check("enc_jpeg", "JPEG decoder", "xpra.codecs.jpeg", "xpra.codecs.jpeg.encoder", "encoder") 155 156 add_codec_version("enc_jpeg", "xpra.codecs.jpeg.encoder") 156 157 157 codec_import_check("enc_vpx", "vpx encoder", "xpra.codecs.vpx", "xpra.codecs.vpx.encoder", "Encoder") 158 add_codec_version("vpx", "xpra.codecs.vpx.decoder") 158 if not OSX: 159 #causes crashes with osx shadow servers, disabled in setup.py: 160 codec_import_check("enc_vpx", "vpx encoder", "xpra.codecs.vpx", "xpra.codecs.vpx.encoder", "Encoder") 161 add_codec_version("vpx", "xpra.codecs.vpx.decoder") 159 162 160 163 codec_import_check("enc_x264", "x264 encoder", "xpra.codecs.enc_x264", "xpra.codecs.enc_x264.encoder", "Encoder") 161 164 add_codec_version("x264", "xpra.codecs.enc_x264.encoder")