From d1c14e94a73fba924761cdad7298f3e48c6bc160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jul 2024 08:00:51 +0100 Subject: gentoo auto-resync : 01:07:2024 - 08:00:50 --- x11-wm/Manifest.gz | Bin 9144 -> 9142 bytes x11-wm/mutter/Manifest | 2 +- x11-wm/mutter/mutter-9999.ebuild | 2 +- x11-wm/xpra/Manifest | 6 +- x11-wm/xpra/xpra-6.0.1-r1.ebuild | 377 +++++++++++++++++++++++++++++++++++++++ x11-wm/xpra/xpra-6.0.1.ebuild | 376 -------------------------------------- x11-wm/xpra/xpra-6.9999.ebuild | 1 + x11-wm/xpra/xpra-9999.ebuild | 1 + 8 files changed, 384 insertions(+), 381 deletions(-) create mode 100644 x11-wm/xpra/xpra-6.0.1-r1.ebuild delete mode 100644 x11-wm/xpra/xpra-6.0.1.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index d5536e09ff89..c82dcefdd147 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 0c492d8f4b5a..6e1309f7bb28 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -9,5 +9,5 @@ EBUILD mutter-45.2-r1.ebuild 7271 BLAKE2B 47dd9d2e527a3ec275ddfb30f03bc32dbac84d EBUILD mutter-45.4.ebuild 7068 BLAKE2B 48a72d702edf822680a340ff739a6a779f10adf245a5aaff21463f50aa220c8949cfe5d33952eda85ebb1f1f21d9537af41009d870e38b53336b75b70dfab6da SHA512 162014d375b4dd556bc8fb853ae40b82eb7883eeb26e3d3ecf552226eb37886a946d27dd0976378129a2541179f5f9ae866b2c548c6413b5457d717b1c54da6b EBUILD mutter-45.5.ebuild 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7 EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6 -EBUILD mutter-9999.ebuild 7108 BLAKE2B a91ea047d22a4a79d164d30d5a5a0d966cb652061c1a97fa17762262e6736c45949993b5805ab90d63e07bcb5ba7a50d625783d1aa1a2e5c818347bbae4c5286 SHA512 f6490a571afc2c25b9c22d38858b9a02d0167f49f789d7f20ca4724580ed38b1bbaa794722a42e7141f49e44adac31cf4b77f374dd29dc703caed0d56e61e2a0 +EBUILD mutter-9999.ebuild 7110 BLAKE2B 451332ba76a0ad31666b81fab02573348e6c80de1c4b79208f732dcf97746987bb2cefed69612e2e1dca847c9f04ad358e7195e5f50753e0e0c689b6853622eb SHA512 2af7a4175faaa345cf9d16d744c2ccad0edf6c45110dcc5dfd5af20bd7e17a8837d63b325964db42591732fd800eb65048213d9b1cbf19d48de5fb781ebfa3d7 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 43f515815af1..2ec64dde579a 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -52,7 +52,7 @@ DEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 - media-libs/libdisplay-info + media-libs/libdisplay-info:= gnome? ( gnome-base/gnome-desktop:4= ) diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 00d67e04bec9..1f00e8c6afcb 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -4,7 +4,7 @@ AUX xpra-9999-pep517.patch 282 BLAKE2B 5e94bc5c882ae768bc1e8f89e2077b551b2841801 DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8 SHA512 273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b8aaaa0a75cd5a90f4858419 DIST xpra-6.0.1.tar.gz 17214848 BLAKE2B 81a26cd9aa9a61241ba47bc6712cd225499a82a8743c4f5655f4529d525788789452daaa0894a2cb9292caa7fd9aa64f82ce5b347c9c168815198e18145629b9 SHA512 3520dec19bb6999fc19ffcd3c385545f4a61f7cf50d4d6930eb39dec1341c79f6c4c8c45d526f43b33ed78d5359524103fcf1608dc705b40e330a7eb53de2475 EBUILD xpra-4.4.6-r2.ebuild 5811 BLAKE2B 2ae6c3eee1bbd1a72881b4a4c0d7057d14784543850cae09d339fd69145f81abfceb5c6f9bc1d087ead8949217d0f795398d2e218334322495a6486187e906a4 SHA512 6b453de91ec1d28b7e1cb589aeae2833501456837cf08c4a8572f1afa07b22de13fb6a0b4d3704e6ea05f7b5acad269963d311469b16f0bc98c4323ef1e4b952 -EBUILD xpra-6.0.1.ebuild 9697 BLAKE2B 8261e51d9b7691caf64e342992ac3435110bf2076ed09a9cdbe9a42f6a59e01c85b0a169296148466ad58eb7d481b11053bbd7356f9cdad6795527a424471aeb SHA512 40a85033d5ec37836e428c151638e8e5eb7c1c2470030ef236c1b81bdb465d6af29ff1aa112f78ece7058c2ceb30134609a8207ef116727b39e94c91a62e8cff -EBUILD xpra-6.9999.ebuild 9697 BLAKE2B 8261e51d9b7691caf64e342992ac3435110bf2076ed09a9cdbe9a42f6a59e01c85b0a169296148466ad58eb7d481b11053bbd7356f9cdad6795527a424471aeb SHA512 40a85033d5ec37836e428c151638e8e5eb7c1c2470030ef236c1b81bdb465d6af29ff1aa112f78ece7058c2ceb30134609a8207ef116727b39e94c91a62e8cff -EBUILD xpra-9999.ebuild 9697 BLAKE2B 8261e51d9b7691caf64e342992ac3435110bf2076ed09a9cdbe9a42f6a59e01c85b0a169296148466ad58eb7d481b11053bbd7356f9cdad6795527a424471aeb SHA512 40a85033d5ec37836e428c151638e8e5eb7c1c2470030ef236c1b81bdb465d6af29ff1aa112f78ece7058c2ceb30134609a8207ef116727b39e94c91a62e8cff +EBUILD xpra-6.0.1-r1.ebuild 9728 BLAKE2B d546cd1b6e57acf2dd93ff17d7ac4ccbe2ddb88f4b77074b6e94709f9ea1b128637f8e797c4358b6a9fb5db6c01f157e307273b669b95f74777a89888f2fcded SHA512 6180333d88c68ead6d59cb523d826d9203f5f673bf27a042b6e68e9fbd8410c653187be3d4e0646b743580b30a956599cae6df26a32f741a881fd74f91329986 +EBUILD xpra-6.9999.ebuild 9728 BLAKE2B d546cd1b6e57acf2dd93ff17d7ac4ccbe2ddb88f4b77074b6e94709f9ea1b128637f8e797c4358b6a9fb5db6c01f157e307273b669b95f74777a89888f2fcded SHA512 6180333d88c68ead6d59cb523d826d9203f5f673bf27a042b6e68e9fbd8410c653187be3d4e0646b743580b30a956599cae6df26a32f741a881fd74f91329986 +EBUILD xpra-9999.ebuild 9728 BLAKE2B d546cd1b6e57acf2dd93ff17d7ac4ccbe2ddb88f4b77074b6e94709f9ea1b128637f8e797c4358b6a9fb5db6c01f157e307273b669b95f74777a89888f2fcded SHA512 6180333d88c68ead6d59cb523d826d9203f5f673bf27a042b6e68e9fbd8410c653187be3d4e0646b743580b30a956599cae6df26a32f741a881fd74f91329986 MISC metadata.xml 1568 BLAKE2B c794d61c51c7b638bdd8338ea7209eb6a3dd4c03ff0051250828860b082dd2e3f1710621e19213c07f173279b298fb6c30c8bafeb3b6d5d75fe8029312a64239 SHA512 dc8996bbc124dd2e2e6b627ed432c387d611c80d92e0ca148c110e2c2c61bc530db6b0039266c6aaca2625d7a483abb83143e795c49df483d6fabd5a6d95c42e diff --git a/x11-wm/xpra/xpra-6.0.1-r1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild new file mode 100644 index 000000000000..44f903773195 --- /dev/null +++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" + if [[ ${PV} = 6.9999* ]]; then + EGIT_BRANCH="v6.x" + fi + inherit git-r3 +else + inherit pypi + KEYWORDS="~amd64 ~x86" +fi + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_EXT=1 + +inherit cuda xdg distutils-r1 prefix tmpfiles udev + +DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" +HOMEPAGE="https://xpra.org/" +LICENSE="GPL-2 BSD" +SLOT="0" +IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama " +IUSE+=" video_cards_nvidia" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( client gtk3 server ) + cups? ( dbus ) + oauth? ( server ) + opengl? ( client ) + clipboard? ( gtk3 ) + gtk3? ( client ) + test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama ) +" + +TEST_DEPEND=" + $(python_gen_cond_dep ' + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) + ') + html? ( www-apps/xpra-html5 ) + server? ( + x11-base/xorg-server[-minimal,xvfb] + x11-drivers/xf86-input-void + x11-drivers/xf86-video-dummy + ) + webcam? ( media-video/v4l2loopback ) + xinerama? ( x11-libs/libfakeXinerama ) +" +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) + sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + gtk3? ( + dev-python/pygobject:3[cairo] + ) + ') + dev-libs/xxhash + avif? ( media-libs/libavif ) + brotli? ( app-arch/brotli ) + client? ( + x11-libs/gtk+:3[X?,introspection] + ) + jpeg? ( media-libs/libjpeg-turbo ) + mdns? ( dev-libs/mdns ) + openh264? ( media-libs/openh264:= ) + pulseaudio? ( + media-plugins/gst-plugins-pulse:1.0 + media-plugins/gst-plugins-opus + ) + qrcode? ( media-gfx/qrencode ) + sound? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + vpx? ( media-libs/libvpx ) + webp? ( media-libs/libwebp ) + X? ( + x11-apps/xrandr + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXres + x11-libs/libXtst + x11-libs/libxkbfile + ) + x264? ( media-libs/x264 ) +" +# nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) +RDEPEND=" + ${DEPEND} + ${TEST_DEPEND} + $(python_gen_cond_dep ' + crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) + cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) + lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) + lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) + oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + webcam? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + media-libs/opencv[${PYTHON_USEDEP},python] + ) + ') + acct-group/xpra + virtual/ssh + x11-apps/xauth + x11-apps/xmodmap + ibus? ( app-i18n/ibus ) + pinentry? ( app-crypt/pinentry ) + trayicon? ( dev-libs/libayatana-appindicator ) + udev? ( virtual/udev ) +" +DEPEND+=" + test? ( + ${TEST_DEPEND} + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + doc? ( virtual/pandoc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9999-pep517.patch" +) + +src_prepare() { + default + + sed \ + -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \ + -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \ + -e '/setup.py install/d' \ + -i "${S}/tests/unittests/run" || die +} + +python_prepare_all() { + distutils-r1_python_prepare_all + + hprefixify xpra/scripts/config.py + + sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ + -i setup.py || die + + if use minimal; then + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ + -i setup.py || die + fi +} + +python_configure_all() { + sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ + -i setup.py || die + + DISTUTILS_ARGS=( + --with-PIC + "$(use_with avif)" + "$(use_with brotli)" + "$(use_with sound audio)" + "$(use_with client)" + "$(use_with clipboard)" + "$(use_with csc csc_cython)" + --without-csc_libyuv + # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv + "$(use_with cuda cuda_rebuild)" + "$(use_with cuda cuda_kernels)" + "$(use_with dbus)" + "$(use_with debug)" + "$(use_with doc docs)" + --without-evdi + # "$(use_with evdi)" x11-drivers/evdi::guru + "$(use_with examples example)" + "$(use_with gstreamer)" + "$(use_with gstreamer gstreamer_audio)" + "$(use_with gstreamer gstreamer_video)" + "$(use_with gtk3)" + "$(use_with html http)" + "$(use_with mdns)" + "$(use_with video_cards_nvidia nvidia)" + --without-nvdec + --without-nvenc + --without-nvfbc + # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK + "$(use_with opengl)" + "$(use_with openh264)" + "$(use_with cups printing)" + --without-pandoc_lua + "$(use_with qrcode qrencode)" + --without-quic + # "$(use_with quic)" # https://github.com/aiortc/aioquic + "$(use_with systemd sd_listen)" + "$(use_with server)" + "$(use_with systemd service)" + "$(use_with server shadow)" + "$(use_with vpx)" + "$(use_with webcam)" + "$(use_with webp)" + "$(use_with X x11)" + "$(use_with X Xdummy)" + + "$(use_with test tests)" + --with-strict + # --with-verbose + # --with-warn + # --with-cythonize_more + + --pkg-config-path="${S}/fs/lib/pkgconfig" + ) + + if use server; then + DISTUTILS_ARGS+=( + "$(use_with jpeg jpeg_encoder)" + "$(use_with vpx vpx_encoder)" + "$(use_with openh264 openh264_encoder)" + "$(use_with cuda nvjpeg_encoder)" + "$(use_with avif avif_encoder)" + "$(use_with webp webp_encoder)" + --without-spng_encoder + # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_encoder + --without-vpx_encoder + --without-openh264_encoder + --without-nvjpeg_encoder + --without-avif_encoder + --without-webp_encoder + --without-spng_encoder + ) + fi + + if use client || use gtk3; then + DISTUTILS_ARGS+=( + "$(use_with vpx vpx_decoder)" + "$(use_with openh264 openh264_decoder)" + "$(use_with cuda nvjpeg_decoder)" + "$(use_with jpeg jpeg_decoder)" + "$(use_with avif avif_decoder)" + "$(use_with webp webp_decoder)" + --without-spng_decoder + # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_decoder + --without-vpx_decoder + --without-openh264_decoder + --without-nvjpeg_decoder + --without-avif_decoder + --without-webp_decoder + --without-spng_decoder + ) + fi + + DISTUTILS_ARGS+=( + # Arguments from user + "${MYDISTUTILS_ARGS[@]}" + ) + + export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra" +} + +python_compile() { + if use cuda; then + export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" + fi + + PYTHONPATH="${S}" distutils-r1_python_compile +} + +python_test() { + einfo "${BUILD_DIR}/install/$(python_get_sitedir)" + + use cuda && cuda_add_sandbox -w + addwrite /dev/dri/renderD128 + + addpredict /dev/dri/card0 + addpredict /dev/fuse + addpredict /dev/tty0 + addpredict /dev/vga_arbiter + addpredict /proc/mtrr + addpredict /var/run/utmp + + addpredict "$(python_get_sitedir)" + + if [[ -d "/sys/devices/virtual/video4linux" ]]; then + local devices + readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )" + for device in "${devices[@]}"; do + addwrite "/dev/$(basename "${device}" || die )" + done + fi + + xdg_environment_reset + + export XAUTHORITY=${T}/.Xauthority + touch "${XAUTHORITY}" || die + + local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests" + + tests/unittests/run \ + --skip-fail unit.client.mixins.audioclient_test \ + --skip-fail unit.client.x11_client_test \ + --skip-fail unit.net.net_util_test \ + --skip-fail unit.notifications.common_test \ + --skip-fail unit.server.mixins.shadow_option_test \ + --skip-fail unit.server.mixins.start_option_test \ + --skip-fail unit.server.mixins.startdesktop_option_test \ + --skip-fail unit.server.server_auth_test \ + --skip-fail unit.server.shadow_server_test \ + --skip-fail unit.x11.x11_server_test \ + --skip-slow unit.client.mixins.webcam_test \ + --skip-slow unit.server.server_sockets_test \ + --skip-slow unit.server.source.source_mixins_test \ + || die -n + + # remove test file + rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die +} + +python_install_all() { + distutils-r1_python_prepare_all + + mv -v "${ED}"/usr/etc "${ED}"/ || die + + sed -e "s#/.*data/etc#/etc#g" \ + -i "${ED}/etc/xpra/conf.d/"* || die + + # Move udev dir to the right place if necessary. + if use udev; then + local dir + dir=$(get_udevdir) + if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + fi + else + rm -vr "${ED}"/usr/lib/udev || die + rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die + fi +} + +pkg_postinst() { + tmpfiles_process xpra.conf + xdg_pkg_postinst + use udev && udev_reload +} + +pkg_postrm() { + xdg_pkg_postinst + use udev && udev_reload +} diff --git a/x11-wm/xpra/xpra-6.0.1.ebuild b/x11-wm/xpra/xpra-6.0.1.ebuild deleted file mode 100644 index bfe892db2a2a..000000000000 --- a/x11-wm/xpra/xpra-6.0.1.ebuild +++ /dev/null @@ -1,376 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" - if [[ ${PV} = 6.9999* ]]; then - EGIT_BRANCH="v6.x" - fi - inherit git-r3 -else - inherit pypi - KEYWORDS="~amd64 ~x86" -fi - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_EXT=1 - -inherit cuda xdg distutils-r1 prefix tmpfiles udev - -DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" -HOMEPAGE="https://xpra.org/" -LICENSE="GPL-2 BSD" -SLOT="0" -IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama " -IUSE+=" video_cards_nvidia" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client gtk3 server ) - cups? ( dbus ) - oauth? ( server ) - opengl? ( client ) - clipboard? ( gtk3 ) - gtk3? ( client ) - test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama ) -" - -TEST_DEPEND=" - $(python_gen_cond_dep ' - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) - ') - html? ( www-apps/xpra-html5 ) - server? ( - x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) - webcam? ( media-video/v4l2loopback ) - xinerama? ( x11-libs/libfakeXinerama ) -" -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) - gtk3? ( - dev-python/pygobject:3[cairo] - ) - ') - dev-libs/xxhash - avif? ( media-libs/libavif ) - brotli? ( app-arch/brotli ) - client? ( - x11-libs/gtk+:3[X?,introspection] - ) - jpeg? ( media-libs/libjpeg-turbo ) - mdns? ( dev-libs/mdns ) - openh264? ( media-libs/openh264:= ) - pulseaudio? ( - media-plugins/gst-plugins-pulse:1.0 - media-plugins/gst-plugins-opus - ) - qrcode? ( media-gfx/qrencode ) - sound? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - vpx? ( media-libs/libvpx ) - webp? ( media-libs/libwebp ) - X? ( - x11-apps/xrandr - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXres - x11-libs/libXtst - x11-libs/libxkbfile - ) - x264? ( media-libs/x264 ) -" -# nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) -RDEPEND=" - ${DEPEND} - ${TEST_DEPEND} - $(python_gen_cond_dep ' - crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) - cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) - lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) - lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) - oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) - webcam? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - media-libs/opencv[${PYTHON_USEDEP},python] - ) - ') - acct-group/xpra - virtual/ssh - x11-apps/xauth - x11-apps/xmodmap - ibus? ( app-i18n/ibus ) - pinentry? ( app-crypt/pinentry ) - trayicon? ( dev-libs/libayatana-appindicator ) - udev? ( virtual/udev ) -" -DEPEND+=" - test? ( - ${TEST_DEPEND} - $(python_gen_cond_dep ' - dev-python/paramiko[${PYTHON_USEDEP}] - ') - ) -" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - doc? ( virtual/pandoc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-9999-pep517.patch" -) - -src_prepare() { - default - - sed \ - -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \ - -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \ - -e '/setup.py install/d' \ - -i "${S}/tests/unittests/run" || die -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - hprefixify xpra/scripts/config.py - - sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ - -i setup.py || die - - if use minimal; then - sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ - -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ - -i setup.py || die - fi -} - -python_configure_all() { - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ - -i setup.py || die - - DISTUTILS_ARGS=( - --with-PIC - "$(use_with avif)" - "$(use_with brotli)" - "$(use_with sound audio)" - "$(use_with client)" - "$(use_with clipboard)" - "$(use_with csc csc_cython)" - --without-csc_libyuv - # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv - "$(use_with cuda cuda_rebuild)" - "$(use_with cuda cuda_kernels)" - "$(use_with dbus)" - "$(use_with debug)" - "$(use_with doc docs)" - --without-evdi - # "$(use_with evdi)" x11-drivers/evdi::guru - "$(use_with examples example)" - "$(use_with gstreamer)" - "$(use_with gstreamer gstreamer_audio)" - "$(use_with gstreamer gstreamer_video)" - "$(use_with gtk3)" - "$(use_with html http)" - "$(use_with mdns)" - "$(use_with video_cards_nvidia nvidia)" - --without-nvdec - --without-nvenc - --without-nvfbc - # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK - # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK - # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK - "$(use_with opengl)" - "$(use_with openh264)" - "$(use_with cups printing)" - --without-pandoc_lua - "$(use_with qrcode qrencode)" - --without-quic - # "$(use_with quic)" # https://github.com/aiortc/aioquic - "$(use_with systemd sd_listen)" - "$(use_with server)" - "$(use_with systemd service)" - "$(use_with server shadow)" - "$(use_with vpx)" - "$(use_with webcam)" - "$(use_with webp)" - "$(use_with X x11)" - "$(use_with X Xdummy)" - - "$(use_with test tests)" - --with-strict - # --with-verbose - # --with-warn - # --with-cythonize_more - - --pkg-config-path="${S}/fs/lib/pkgconfig" - ) - - if use server; then - DISTUTILS_ARGS+=( - "$(use_with jpeg jpeg_encoder)" - "$(use_with vpx vpx_encoder)" - "$(use_with openh264 openh264_encoder)" - "$(use_with cuda nvjpeg_encoder)" - "$(use_with avif avif_encoder)" - "$(use_with webp webp_encoder)" - --without-spng_encoder - # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng - ) - else - DISTUTILS_ARGS+=( - --without-jpeg_encoder - --without-vpx_encoder - --without-openh264_encoder - --without-nvjpeg_encoder - --without-avif_encoder - --without-webp_encoder - --without-spng_encoder - ) - fi - - if use client || use gtk3; then - DISTUTILS_ARGS+=( - "$(use_with vpx vpx_decoder)" - "$(use_with openh264 openh264_decoder)" - "$(use_with cuda nvjpeg_decoder)" - "$(use_with jpeg jpeg_decoder)" - "$(use_with avif avif_decoder)" - "$(use_with webp webp_decoder)" - --without-spng_decoder - # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng - ) - else - DISTUTILS_ARGS+=( - --without-jpeg_decoder - --without-vpx_decoder - --without-openh264_decoder - --without-nvjpeg_decoder - --without-avif_decoder - --without-webp_decoder - --without-spng_decoder - ) - fi - - DISTUTILS_ARGS+=( - # Arguments from user - "${MYDISTUTILS_ARGS[@]}" - ) - - export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra" -} - -python_compile() { - if use cuda; then - export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" - fi - - PYTHONPATH="${S}" distutils-r1_python_compile -} - -python_test() { - einfo "${BUILD_DIR}/install/$(python_get_sitedir)" - - use cuda && cuda_add_sandbox -w - addwrite /dev/dri/renderD128 - - addpredict /dev/dri/card0 - addpredict /dev/fuse - addpredict /dev/tty0 - addpredict /dev/vga_arbiter - addpredict /proc/mtrr - addpredict /var/run/utmp - - addpredict "$(python_get_sitedir)" - - if [[ -d "/sys/devices/virtual/video4linux" ]]; then - local devices - readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )" - for device in "${devices[@]}"; do - addwrite "/dev/$(basename "${device}" || die )" - done - fi - - xdg_environment_reset - - export XAUTHORITY=${T}/.Xauthority - touch "${XAUTHORITY}" || die - - local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests" - - tests/unittests/run \ - --skip-fail unit.client.mixins.audioclient_test \ - --skip-fail unit.client.x11_client_test \ - --skip-fail unit.net.net_util_test \ - --skip-fail unit.notifications.common_test \ - --skip-fail unit.server.mixins.shadow_option_test \ - --skip-fail unit.server.mixins.start_option_test \ - --skip-fail unit.server.mixins.startdesktop_option_test \ - --skip-fail unit.server.server_auth_test \ - --skip-fail unit.server.shadow_server_test \ - --skip-fail unit.x11.x11_server_test \ - --skip-slow unit.client.mixins.webcam_test \ - --skip-slow unit.server.server_sockets_test \ - --skip-slow unit.server.source.source_mixins_test \ - || die -n - - # remove test file - rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die -} - -python_install_all() { - distutils-r1_python_prepare_all - - mv -v "${ED}"/usr/etc "${ED}"/ || die - - sed -e "s#/.*data/etc#/etc#g" \ - -i "${ED}/etc/xpra/conf.d/"* || die - - # Move udev dir to the right place if necessary. - if use udev; then - local dir - dir=$(get_udevdir) - if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die - fi - else - rm -vr "${ED}"/usr/lib/udev || die - rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die - fi -} - -pkg_postinst() { - tmpfiles_process xpra.conf - xdg_pkg_postinst - use udev && udev_reload -} - -pkg_postrm() { - xdg_pkg_postinst - use udev && udev_reload -} diff --git a/x11-wm/xpra/xpra-6.9999.ebuild b/x11-wm/xpra/xpra-6.9999.ebuild index bfe892db2a2a..44f903773195 100644 --- a/x11-wm/xpra/xpra-6.9999.ebuild +++ b/x11-wm/xpra/xpra-6.9999.ebuild @@ -51,6 +51,7 @@ TEST_DEPEND=" server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void + x11-drivers/xf86-video-dummy ) webcam? ( media-video/v4l2loopback ) xinerama? ( x11-libs/libfakeXinerama ) diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index bfe892db2a2a..44f903773195 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -51,6 +51,7 @@ TEST_DEPEND=" server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void + x11-drivers/xf86-video-dummy ) webcam? ( media-video/v4l2loopback ) xinerama? ( x11-libs/libfakeXinerama ) -- cgit v1.2.3