[winswitch] [ANNOUNCE] xpra 0.10.1 (bug fixes) FTBFS/libav-9.8 [patch]

[Dmitry Smirnov]

On Wed, 21 Aug 2013 12:08:34 Antoine Martin wrote:
> I've had crashes at runtime with libav 9.8 (as found in sid).

Although I only tested it little xpra worked very stable with
libav-9.8 for me...

> I was about to pull the packages until someone figures out how to make
> it work with the latest libav
> [...]
> Try old-libav-no0RGB.patch

Thank you for this advise. Patch didn't apply at first but it worked
very well when I modified it to the following (below). I only needed
this patch to build with libav-9.8.

-- 
Best wishes,
 Dmitry Smirnov
 GPG key : 4096R/53968D1B

:::::::::

Last-Update: 2013-08-23
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
From: Antoine Martin <antoine at devloop.org.uk>
Description: fix FTBFS with libav-9.8:
    xpra/codecs/dec_avcodec/decoder.c: In function ‘initdecoder’:
    xpra/codecs/dec_avcodec/decoder.c:8359:39: error: ‘PIX_FMT_0RGB’ undeclared (first use in this function)
    xpra/codecs/dec_avcodec/decoder.c:8359:39: note: each undeclared identifier is reported only once for each function it appears in
    xpra/codecs/dec_avcodec/decoder.c:8371:39: error: ‘PIX_FMT_BGR0’ undeclared (first use in this function)

--- a/xpra/codecs/csc_swscale/colorspace_converter.pyx
+++ b/xpra/codecs/csc_swscale/colorspace_converter.pyx
@@ -80,10 +80,10 @@
 FORMAT_OPTIONS = [
     ("AV_PIX_FMT_RGB24",    (3, 0, 0, 0),       (1, 0, 0, 0),       "RGB"   ),
     ("AV_PIX_FMT_BGR24",    (3, 0, 0, 0),       (1, 0, 0, 0),       "BGR"   ),
     ("AV_PIX_FMT_0RGB",     (4, 0, 0, 0),       (1, 0, 0, 0),       "XRGB"  ),
-    ("AV_PIX_FMT_BGR0",     (4, 0, 0, 0),       (1, 0, 0, 0),       "BGRX"  ),
-    ("AV_PIX_FMT_ARGB",     (4, 0, 0, 0),       (1, 0, 0, 0),       "XRGB"  ),
+#    ("AV_PIX_FMT_BGR0",     (4, 0, 0, 0),       (1, 0, 0, 0),       "BGRX"  ),
+#    ("AV_PIX_FMT_ARGB",     (4, 0, 0, 0),       (1, 0, 0, 0),       "XRGB"  ),
     ("AV_PIX_FMT_BGRA",     (4, 0, 0, 0),       (1, 0, 0, 0),       "BGRX"  ),
     ("AV_PIX_FMT_YUV420P",  (1, 0.5, 0.5, 0),   (1, 0.5, 0.5, 0),   "YUV420P"),
     ("AV_PIX_FMT_YUV422P",  (1, 0.5, 0.5, 0),   (1, 1, 1, 0),       "YUV422P"),
     ("AV_PIX_FMT_YUV444P",  (1, 1, 1, 0),       (1, 1, 1, 0),       "YUV444P"),
--- a/xpra/codecs/csc_swscale/constants.txt
+++ b/xpra/codecs/csc_swscale/constants.txt
@@ -13,10 +13,10 @@
 AV_PIX_FMT_YUV420P
 AV_PIX_FMT_YUV422P
 AV_PIX_FMT_YUV444P
 AV_PIX_FMT_RGB24
-AV_PIX_FMT_0RGB
-AV_PIX_FMT_BGR0
+#AV_PIX_FMT_0RGB
+#AV_PIX_FMT_BGR0
 AV_PIX_FMT_ARGB
 AV_PIX_FMT_BGRA
 AV_PIX_FMT_GBRP
 AV_PIX_FMT_RGB24
--- a/xpra/codecs/dec_avcodec/constants.txt
+++ b/xpra/codecs/dec_avcodec/constants.txt
@@ -13,10 +13,10 @@
 AV_PIX_FMT_YUV420P
 AV_PIX_FMT_YUV422P
 AV_PIX_FMT_YUV444P
 AV_PIX_FMT_RGB24
-AV_PIX_FMT_0RGB
-AV_PIX_FMT_BGR0
+#AV_PIX_FMT_0RGB
+#AV_PIX_FMT_BGR0
 AV_PIX_FMT_ARGB
 AV_PIX_FMT_BGRA
 AV_PIX_FMT_GBRP
 
--- a/xpra/codecs/dec_avcodec/decoder.pyx
+++ b/xpra/codecs/dec_avcodec/decoder.pyx
@@ -113,10 +113,10 @@
             "YUV420P"   : "AV_PIX_FMT_YUV420P",
             "YUV422P"   : "AV_PIX_FMT_YUV422P",
             "YUV444P"   : "AV_PIX_FMT_YUV444P",        
             "RGB"       : "AV_PIX_FMT_RGB24",
-            "XRGB"      : "AV_PIX_FMT_0RGB",
-            "BGRX"      : "AV_PIX_FMT_BGR0",
+            "XRGB"      : "AV_PIX_FMT_ARGB",
+            "BGRX"      : "AV_PIX_FMT_BGRA",
             "ARGB"      : "AV_PIX_FMT_ARGB",
             "BGRA"      : "AV_PIX_FMT_BGRA",
             "GBRP"      : "AV_PIX_FMT_GBRP",
          }.items():