diff --git a/srcpkgs/xpra/patches/setup.patch b/srcpkgs/xpra/patches/setup.patch new file mode 100644 index 00000000000..39e06365462 --- /dev/null +++ b/srcpkgs/xpra/patches/setup.patch @@ -0,0 +1,42 @@ +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 @@ + #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 +- for cflag in shlex.split(sysconfig.get_config_var('CFLAGS') or ''): ++ for cflag in shlex.split(sysconfig.get_config_var('BUILD_CFLAGS') or ''): + add_to_keywords(kw, 'extra_compile_args', cflag) + + def add_tokens(s, add_to="extra_link_args"): +@@ -769,7 +769,7 @@ + #as of Cython 0.26 + clang 4.0. Other version combinations may require + #(un)commenting other switches. + if not hascflag("-Wno-error"): +- addcflags("-Werror") ++ addcflags("-Wno-error") + addcflags( + "-Wno-deprecated-register", + "-Wno-unused-command-line-argument", +@@ -783,7 +783,7 @@ + ) + else: + if not hascflag("-Wno-error"): +- addcflags("-Werror") ++ addcflags("-Wno-error") + if NETBSD: + #see: http://trac.cython.org/ticket/395 + addcflags("-fno-strict-aliasing") +@@ -2213,8 +2213,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") + + toggle_packages(argb_ENABLED, "xpra.codecs.argb") diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index c63eed77fe0..71b7fab2f46 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,9 +1,10 @@ # Template file for 'xpra' pkgname=xpra -version=4.4.2 +version=4.4.3 revision=1 build_style=python3-module -make_install_args="$(vopt_with docs)" +make_build_args="--without-cuda_kernels --without-cuda_rebuild" +make_install_args="$(vopt_with docs) ${make_build_args}" hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)" makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel libvpx-devel libwebp-devel libxkbfile-devel python3-gobject-devel x264-devel @@ -17,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=19555b8e89f4304023e7ad6d0e342038f0e06bd37824144dff32c32ed8544cca +checksum=fc394c5b346791cc941c8917bbdd44bb26be76a021e497fa6f661e62cc4dd57a 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 @@ -40,11 +41,6 @@ if [ -z "$CROSS_BUILD" ]; then esac fi -post_patch() { - vsed -i setup.py -e 's/-Werror/-Wno-error/g' \ - -e "/sysconfig.get_config_var/s/'CFLAGS'/'BUILD_CFLAGS'/" -} - post_install() { vsed -e "s:${DESTDIR/\/\//\/}::" -i ${DESTDIR}/etc/xpra/conf.d/55_server_x11.conf rm -rf ${DESTDIR}/etc/init.d