xpra icon
Bug tracker and wiki

Ticket #1694: load-pillow-last.patch

File load-pillow-last.patch, 2.2 KB (added by Antoine Martin, 2 years ago)

I don't think this is needed as long as pillow doesn't link with libwebp

  • xpra/codecs/loader.py

     
    149149
    150150    if encoders:
    151151        show += list(ENCODER_CODECS)
    152         codec_import_check("enc_pillow", "Pillow encoder", "xpra.codecs.pillow", "xpra.codecs.pillow.encode", "encode")
    153         add_codec_version("enc_pillow", "xpra.codecs.pillow.encode")
    154152
    155153        codec_import_check("enc_webp", "webp encoder", "xpra.codecs.webp", "xpra.codecs.webp.encode", "compress")
    156154        add_codec_version("enc_webp", "xpra.codecs.webp.encode")
     
    173171        codec_import_check("enc_ffmpeg", "ffmpeg encoder", "xpra.codecs.enc_ffmpeg", "xpra.codecs.enc_ffmpeg.encoder", "Encoder")
    174172        add_codec_version("ffmpeg", "xpra.codecs.enc_ffmpeg.encoder")
    175173
     174        codec_import_check("enc_pillow", "Pillow encoder", "xpra.codecs.pillow", "xpra.codecs.pillow.encode", "encode")
     175        add_codec_version("enc_pillow", "xpra.codecs.pillow.encode")
     176
    176177    if csc:
    177178        show += list(CSC_CODECS)
    178179        codec_import_check("csc_swscale", "swscale colorspace conversion", "xpra.codecs.csc_swscale", "xpra.codecs.csc_swscale.colorspace_converter", "ColorspaceConverter")
     
    183184
    184185    if decoders:
    185186        show += list(DECODER_CODECS)
    186         codec_import_check("dec_pillow", "Pillow decoder", "xpra.codecs.pillow", "xpra.codecs.pillow.decode", "decode")
    187         add_codec_version("dec_pillow", "xpra.codecs.pillow.decode")
    188187
    189188        codec_import_check("dec_webp", "webp decoder", "xpra.codecs.webp", "xpra.codecs.webp.decode", "decompress")
    190189        add_codec_version("dec_webp", "xpra.codecs.webp.decode")
     
    198197        codec_import_check("dec_avcodec2", "avcodec2 decoder", "xpra.codecs.dec_avcodec2", "xpra.codecs.dec_avcodec2.decoder", "Decoder")
    199198        add_codec_version("avcodec2", "xpra.codecs.dec_avcodec2.decoder")
    200199
     200        codec_import_check("dec_pillow", "Pillow decoder", "xpra.codecs.pillow", "xpra.codecs.pillow.decode", "decode")
     201        add_codec_version("dec_pillow", "xpra.codecs.pillow.decode")
     202
    201203    #not really a codec, but gets used by codecs, so include version info:
    202204    add_codec_version("numpy", "numpy")
    203205    try: