From 26dc71673ad42f2512c29e6dc140bd63d8c19764 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 4 Mar 2024 19:14:27 +0700 Subject: [PATCH] #4100 split gstreamer so we can install audio without video --- packaging/MSWindows/BUILD.sh | 2 +- setup.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/MSWindows/BUILD.sh b/packaging/MSWindows/BUILD.sh index d8dd9fc3c3..3aad6d0ad8 100644 --- a/packaging/MSWindows/BUILD.sh +++ b/packaging/MSWindows/BUILD.sh @@ -38,7 +38,7 @@ DIST="./dist" if [ "${DO_FULL}" == "0" ]; then BUILD_OPTIONS="${BUILD_OPTIONS} --without-shadow --without-server --without-proxy" BUILD_OPTIONS="${BUILD_OPTIONS} --without-dbus" - BUILD_OPTIONS="${BUILD_OPTIONS} --without-enc_proxy --without-enc_x264 --without-openh264_encoder --without-webp_encoder --without-spng_encoder --without-jpeg_encoder --without-vpx_encoder --without-avif --without-argb_encoder" + BUILD_OPTIONS="${BUILD_OPTIONS} --without-enc_proxy --without-enc_x264 --without-openh264_encoder --without-webp_encoder --without-spng_encoder --without-jpeg_encoder --without-vpx_encoder --without-avif --without-argb_encoder --without-gstreamer_video" BUILD_OPTIONS="${BUILD_OPTIONS} --without-nvenc --without-nvfbc --without-cuda_kernels" BUILD_OPTIONS="${BUILD_OPTIONS} --without-csc_cython" # gstreamer? diff --git a/setup.py b/setup.py index df1cd8d2ca..2c1e967946 100755 --- a/setup.py +++ b/setup.py @@ -336,6 +336,8 @@ def has_header_file(name, isdir=False): cuda_rebuild_ENABLED = None if (nvidia_ENABLED and not WIN32) else False csc_libyuv_ENABLED = DEFAULT and pkg_config_ok("--exists", "libyuv") gstreamer_ENABLED = DEFAULT +gstreamer_audio_ENABLED = gstreamer_ENABLED +gstreamer_video_ENABLED = gstreamer_ENABLED example_ENABLED = DEFAULT win32_tools_ENABLED = WIN32 and DEFAULT @@ -368,7 +370,8 @@ def has_header_file(name, isdir=False): "jpeg_encoder", "jpeg_decoder", "avif", "argb", "argb_encoder", "v4l2", "evdi", "drm", - "csc_cython", "csc_libyuv", "gstreamer", + "csc_cython", "csc_libyuv", + "gstreamer", "gstreamer_audio", "gstreamer_video", ] SWITCHES = [ "cython", "cython_tracing", "cythonize_more", @@ -400,6 +403,7 @@ def has_header_file(name, isdir=False): "webp" : ("webp_encoder", "webp_decoder"), "openh264": ("openh264", "openh264_decoder", "openh264_encoder"), "nvidia": ("nvidia", "nvenc", "nvdec", "nvfbc", "nvjpeg_encoder", "nvjpeg_decoder", "cuda_kernels", "cuda_rebuild"), + "gstreamer": ("gstreamer_audio", "gstreamer_video"), "cython": ( "cython", "codecs", "server", "client", "shadow", @@ -2398,7 +2402,8 @@ def bundle_tests(): toggle_packages(vpx_encoder_ENABLED or vpx_decoder_ENABLED, "xpra.codecs.vpx") tace(vpx_encoder_ENABLED, "xpra.codecs.vpx.encoder", "vpx") tace(vpx_decoder_ENABLED, "xpra.codecs.vpx.decoder", "vpx") -toggle_packages(gstreamer_ENABLED, "xpra.codecs.gstreamer", "xpra.gstreamer") +toggle_packages(gstreamer_ENABLED, "xpra.gstreamer") +toggle_packages(gstreamer_video_ENABLED, "xpra.codecs.gstreamer") toggle_packages(v4l2_ENABLED, "xpra.codecs.v4l2") tace(v4l2_ENABLED, "xpra.codecs.v4l2.virtual")