#3457 we can't build against older versions easily enough

Xpra-org · Feb 15, 2022 · 9187c7f · 9187c7f
1 parent 2b79f7e
commit 9187c7f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/packaging/debian/xpra/control b/packaging/debian/xpra/control
@@ -31,11 +31,9 @@ Build-Depends: debhelper (>= 8)
               ,libsystemd-dev
               ,libpam-dev
               ,pandoc
-#hirsute:              ,libavif-dev
-#impish:              ,libavif-dev
 #jammy:              ,libavif-dev
 #bookworm:              ,libavif-dev
-#bullseye:              ,libavif-dev
+#sid:              ,libavif-dev
 Standards-Version: 3.9.3
 Homepage: https://xpra.org/
 Vcs-Git: https://github.com/Xpra-org/xpra

diff --git a/packaging/rpm/rpms.txt b/packaging/rpm/rpms.txt
@@ -3,7 +3,7 @@ libfakeXinerama
 xorg-x11-drv-dummy
 gstreamer1-plugin-timestamp
 x264-xpra
-ffmpeg-xpra
+#ffmpeg-xpra
 python3-pbr
 python3-rencode
 python3-pycuda

diff --git a/setup.py b/setup.py
@@ -192,7 +192,7 @@ def is_RH():
 webp_ENABLED            = DEFAULT and pkg_config_version("0.5", "libwebp")
 jpeg_encoder_ENABLED    = DEFAULT and pkg_config_version("1.2", "libturbojpeg")
 jpeg_decoder_ENABLED    = DEFAULT and pkg_config_version("1.4", "libturbojpeg")
-avif_ENABLED            = DEFAULT and pkg_config_version("0.8", "libavif")
+avif_ENABLED            = DEFAULT and pkg_config_version("0.9", "libavif")
 vpx_ENABLED             = DEFAULT and pkg_config_version("1.4", "vpx")
 enc_ffmpeg_ENABLED      = DEFAULT and BITS==64 and pkg_config_version("58.18", "libavcodec")
 #opencv currently broken on 32-bit windows (crashes on load):

diff --git a/xpra/codecs/avif/decoder.pyx b/xpra/codecs/avif/decoder.pyx
@@ -143,8 +143,7 @@ def decompress(data, options=None, yuv=False):
             pixels = getbuf(width*4*height)
             rgb.pixels = <uint8_t *> pixels.get_mem()
             rgb.rowBytes = stride
-            if AVIF_VERSION_MAJOR>0 or AVIF_VERSION_MINOR>8:
-                rgb.alphaPremultiplied = 1
+            rgb.alphaPremultiplied = 1
             r = avifImageYUVToRGB(image, &rgb)
             check(r, "Conversion from YUV failed")
             if rgb.depth>8:

diff --git a/xpra/codecs/avif/encoder.pyx b/xpra/codecs/avif/encoder.pyx
@@ -110,8 +110,7 @@ def encode(coding, image, options=None):
     rgb.format = INPUT_PIXEL_FORMATS.get(pixel_format)
     rgb.chromaUpsampling = AVIF_CHROMA_UPSAMPLING_FASTEST
     rgb.ignoreAlpha = not alpha
-    if AVIF_VERSION_MAJOR>0 or AVIF_VERSION_MINOR>8:
-        rgb.alphaPremultiplied = alpha
+    rgb.alphaPremultiplied = alpha
     rgb.rowBytes = image.get_rowstride()
 
     cdef avifResult r