From b89ed18a344a30780b69a3288f8e741287e81e0e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 27 Jul 2024 23:21:41 +0700 Subject: [PATCH] csc_cython is the only option for some bit depths --- packaging/debian/xpra/rules | 2 +- packaging/debian/xpra/xpra-codecs.files | 1 + packaging/rpm/xpra.spec | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packaging/debian/xpra/rules b/packaging/debian/xpra/rules index 396609eba3..f483148576 100755 --- a/packaging/debian/xpra/rules +++ b/packaging/debian/xpra/rules @@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all NPROC := $(shell nproc 2> /dev/null || echo 1) -BUILDOPTS := $(EXTRA_BUILDOPTS) --without-csc_cython +BUILDOPTS := $(EXTRA_BUILDOPTS) %: dh $@ --with python3 --with systemd --without=build-stamp diff --git a/packaging/debian/xpra/xpra-codecs.files b/packaging/debian/xpra/xpra-codecs.files index 76557f7eb9..906b0afa22 100644 --- a/packaging/debian/xpra/xpra-codecs.files +++ b/packaging/debian/xpra/xpra-codecs.files @@ -8,3 +8,4 @@ usr/lib/python3*/*/xpra/codecs/spng usr/lib/python3*/*/xpra/codecs/v4l2 usr/lib/python3*/*/xpra/codecs/vpx usr/lib/python3*/*/xpra/codecs/webp +usr/lib/python3*/*/xpra/codecs/csc_cython diff --git a/packaging/rpm/xpra.spec b/packaging/rpm/xpra.spec index 55636f0acd..23afa57e0c 100644 --- a/packaging/rpm/xpra.spec +++ b/packaging/rpm/xpra.spec @@ -31,13 +31,13 @@ autoprov: no %endif %define CFLAGS -O2 -%define DEFAULT_BUILD_ARGS --with-Xdummy --without-Xdummy_wrapper --without-csc_cython --without-evdi --without-cuda_rebuild +%define DEFAULT_BUILD_ARGS --with-Xdummy --without-Xdummy_wrapper --without-evdi --without-cuda_rebuild %if 0%{?fedora}>=39 %global debug_package %{nil} %endif %if 0%{?el10} %global debug_package %{nil} -%define DEFAULT_BUILD_ARGS --with-Xdummy --without-Xdummy_wrapper --without-csc_cython --without-evdi --without-cuda_rebuild --without-docs +%define DEFAULT_BUILD_ARGS --with-Xdummy --without-Xdummy_wrapper --without-evdi --without-cuda_rebuild --without-docs %endif %global gnome_shell_extension input-source-manager@xpra_org @@ -647,6 +647,7 @@ rm -rf $RPM_BUILD_ROOT %{python3_sitearch}/xpra/x11/ %files -n %{package_prefix}-codecs +%{python3_sitearch}/xpra/codecs/csc_cython %{python3_sitearch}/xpra/codecs/drm #/xpra/codecs/evdi %{python3_sitearch}/xpra/codecs/jpeg