From d0000f9fc761affffc79d201758cf0cc15eb5e76 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 31 May 2023 14:08:34 -0400 Subject: [PATCH] xpra: update to 4.4.5. --- srcpkgs/xpra/patches/setup.patch | 16 ++++++++-------- srcpkgs/xpra/template | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/xpra/patches/setup.patch b/srcpkgs/xpra/patches/setup.patch index 39e06365462..237f04308b1 100644 --- a/srcpkgs/xpra/patches/setup.patch +++ b/srcpkgs/xpra/patches/setup.patch @@ -2,9 +2,9 @@ Make sure the build script pulls the right CFLAGS and prevent -Werror. In addition, remove a stray CUDA README that is only supposed to installed when CUDA is actually available. ---- ./setup.py -+++ ./setup.py -@@ -710,7 +710,7 @@ +--- a/setup.py ++++ b/setup.py +@@ -750,7 +750,7 @@ #we have to add the python cflags: if not (is_Fedora() or is_Debian() or is_CentOS() or is_RedHat() or is_AlmaLinux() or is_RockyLinux() or is_OracleLinux() or is_openSUSE()): import sysconfig @@ -13,7 +13,7 @@ CUDA is actually available. add_to_keywords(kw, 'extra_compile_args', cflag) def add_tokens(s, add_to="extra_link_args"): -@@ -769,7 +769,7 @@ +@@ -809,7 +809,7 @@ #as of Cython 0.26 + clang 4.0. Other version combinations may require #(un)commenting other switches. if not hascflag("-Wno-error"): @@ -22,7 +22,7 @@ CUDA is actually available. addcflags( "-Wno-deprecated-register", "-Wno-unused-command-line-argument", -@@ -783,7 +783,7 @@ +@@ -823,7 +823,7 @@ ) else: if not hascflag("-Wno-error"): @@ -31,12 +31,12 @@ CUDA is actually available. if NETBSD: #see: http://trac.cython.org/ticket/395 addcflags("-fno-strict-aliasing") -@@ -2213,8 +2213,6 @@ +@@ -2252,8 +2252,6 @@ if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll")) -add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) - - tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc") + tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc", + extra_compile_args="-Wno-error=sign-compare" if get_gcc_version()<(8, ) else None) - toggle_packages(argb_ENABLED, "xpra.codecs.argb") diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 38f83283b1e..ee8ce4ec78a 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=4.4.4 +version=4.4.5 revision=1 build_style=python3-module make_build_args="--without-cuda_kernels --without-cuda_rebuild" @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md" distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz" -checksum=63f6b82efde9393a42bbeefc1a35926d636decf32f9b2076800b999d7b418cfc +checksum=591bd39953cebbfba1a4543bab280b7c1065c3179318f37a41539e954d0709a2 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*" # Tests don't run properly without package installed make_check=no