Merge branch 'keycloak' into keycloak-fixes

.gitignore

@@ -127,6 +127,8 @@ tests/unittests/test-file*
 /xpra/codecs/avif/encoder.c
 /xpra/codecs/avif/decoder.c
 /xpra/codecs/nvjpeg/encoder.c
+/xpra/codecs/nvjpeg/decoder.c
+/xpra/codecs/nvjpeg/common.c
 /xpra/gtk_common/gdk_atoms.c
 /xpra/gtk_common/gtk3/gdk_atoms.c
 /xpra/gtk_common/gtk3/gdk_bindings.c

docs/CHANGELOG.md

@@ -1899,7 +1899,7 @@ v0.13.5-3 2014-06-14
 * key mappings: try to reset modifier keys as well as regular keys
 * key mappings: apply keymap using Cython code rather than execing xmodmap
 * key mappings: fire change callbacks only once when all the work is done
-* use dbus for tray notifications if available, prefered to pynotify
+* use dbus for tray notifications if available, preferred to pynotify
 * show full version information in about dialog
 
 

fs/etc/xpra/conf.d/55_server_x11.conf.in

@@ -43,13 +43,8 @@ fake-xinerama = %(fake_xinerama)s
 #        +extension GLX +extension Composite \
 #        -auth $XAUTHORITY \
 #        -screen 8192x4096x24+32
-# - Xdummy (better with DPI patch):
-# xvfb = /usr/bin/Xorg -noreset -nolisten tcp \
-#        +extension GLX +extension RANDR +extension RENDER \
-#        -auth $XAUTHORITY \
-#        -logfile ${XPRA_SESSION_DIR}/Xorg.log \
-#        -configdir "${XPRA_SESSION_DIR}/xorg.conf.d/$PID" \
-#        -config %(conf_dir)s/xorg.conf
+# - Xdummy (better with version 0.4.0 or later):
+#xvfb = %(xdummy_command)s
 #
 # Selecting virtual X server:
 xvfb = %(xvfb_command)s

fs/etc/xpra/content-type/50_class.conf

@@ -32,6 +32,7 @@ class-instance:evince.*=text
 class-instance:evolution=text
 class-instance:Firefox=browser
 class-instance:file-roller=text
+class-instance:ffplay=video
 class-instance:geany=text
 class-instance:gcm-picker=picture
 class-instance:gcm-import=text

fs/etc/xpra/xorg-randr1.6.conf

@@ -0,0 +1,81 @@
+# This xorg configuration file is meant to be used by xpra
+# to start a dummy X11 server.
+# For details, please see:
+# https://xpra.org/Xdummy.html
+
+Section "ServerFlags"
+  Option "DontVTSwitch" "true"
+  Option "AllowMouseOpenFail" "true"
+  Option "PciForceNone" "true"
+  Option "AllowEmptyInput" "true"
+  Option "AutoEnableDevices" "false"
+  Option "AutoAddDevices" "false"
+EndSection
+
+Section "Device"
+  Identifier "dummy_videocard"
+  Driver "dummy"
+  DacSpeed 3000
+  Option "ConstantDPI" "true"
+  #VideoRam 2048000
+  #VideoRam 1024000
+  VideoRam 768000
+  #VideoRam 512000
+  #VideoRam 384000
+  #VideoRam 256000
+  #VideoRam 192000
+EndSection
+
+Section "Monitor"
+  Identifier "dummy_monitor"
+  HorizSync   1.0 - 30000.0
+  VertRefresh 1.0 - 300.0
+EndSection
+
+Section "Screen"
+  Identifier "dummy_screen"
+  Device "dummy_videocard"
+  Monitor "dummy_monitor"
+  DefaultDepth 24
+  SubSection "Display"
+    Viewport 0 0
+    Depth 8
+    #requires more ram:
+    #Modes "16000x15000" "15000x15000" "16384x8192"  ..
+    Modes "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "3840x2160" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    #Virtual 16384 16384
+    Virtual 11520 6318
+  EndSubSection
+  SubSection "Display"
+    Viewport 0 0
+    Depth 16
+    #requires more ram:
+    #Modes "16000x15000" "15000x15000" "16384x8192"  ..
+    Modes "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "3840x2160" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    #Virtual 16384 16384
+    Virtual 11520 6318
+  EndSubSection
+  SubSection "Display"
+    Viewport 0 0
+    Depth 24
+    #requires more ram:
+    #Modes "16000x15000" "15000x15000" "16384x8192"  ..
+    Modes "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "3840x2160" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    #Virtual 16384 16384
+    Virtual 11520 6318
+  EndSubSection
+  SubSection "Display"
+    Viewport 0 0
+    Depth 30
+    #requires more ram:
+    #Modes "16000x15000" "15000x15000" "16384x8192"  ..
+    Modes "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "3840x2160" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    #Virtual 16384 16384
+    Virtual 11520 6318
+  EndSubSection
+EndSection
+
+Section "ServerLayout"
+  Identifier   "dummy_layout"
+  Screen       "dummy_screen"
+EndSection

fs/etc/xpra/xorg.conf

@@ -15,7 +15,7 @@ EndSection
 Section "Device"
   Identifier "dummy_videocard"
   Driver "dummy"
-  DacSpeed 1800
+  DacSpeed 3000
   Option "ConstantDPI" "true"
   #VideoRam 2048000
   #VideoRam 1024000
@@ -28,7 +28,7 @@ EndSection
 
 Section "Monitor"
   Identifier "dummy_monitor"
-  HorizSync   1.0 - 20000.0
+  HorizSync   1.0 - 30000.0
   VertRefresh 1.0 - 300.0
   #To add your own modes here, use a modeline calculator, like:
   # cvt:

fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules

@@ -1,4 +1,4 @@
 # allow xpra to use fine grained scrolling
 
-ACTION=="add|change", ATTRS{name}=="Xpra Virtual Pointer*", PROGRAM="/bin/xpra_udev_product_version", ENV{MOUSE_WHEEL_CLICK_ANGLE}="1", ENV{MOUSE_WHEEL_CLICK_COUNT}="360", MODE="0660", OWNER="%c", GROUP="xpra"
-ACTION=="add|change", ATTRS{name}=="Xpra Virtual Touchpad*", PROGRAM="/bin/xpra_udev_product_version", ENV{MOUSE_WHEEL_CLICK_ANGLE}="1", ENV{MOUSE_WHEEL_CLICK_COUNT}="360", MODE="0660", OWNER="%c", GROUP="xpra"
+ACTION=="add|change", ATTRS{name}=="Xpra Virtual Pointer*", PROGRAM="/usr/libexec/xpra/xpra_udev_product_version", ENV{MOUSE_WHEEL_CLICK_ANGLE}="1", ENV{MOUSE_WHEEL_CLICK_COUNT}="360", MODE="0660", OWNER="%c", GROUP="xpra"
+ACTION=="add|change", ATTRS{name}=="Xpra Virtual Touchpad*", PROGRAM="/usr/libexec/xpra/xpra_udev_product_version", ENV{MOUSE_WHEEL_CLICK_ANGLE}="1", ENV{MOUSE_WHEEL_CLICK_COUNT}="360", MODE="0660", OWNER="%c", GROUP="xpra"

fs/libexec/xpra/gnome-open

@@ -0,0 +1 @@
+xdg-open

fs/libexec/xpra/gvfs-open

@@ -0,0 +1 @@
+xdg-open

fs/share/man/man1/xpra.1

@@ -1104,7 +1104,7 @@ The only ciphers supported at present are:
 For servers, this allows the client to choose any of the modes
 it wants to use.
 For clients, this is an alias for \fIAES-CBC\fP and
-using a more specific mode should be prefered.
+using a more specific mode should be preferred.
 .IP \fBAES-CBC\fP
 \fIAES\fP in \fIcipher block chaining\fP mode
 .IP \fBAES-GCM\fP

packaging/debian/build.sh

@@ -9,4 +9,5 @@ if [ `arch` == "x86_64" ]; then
 	$BASH ./libcuda1.sh
 	$BASH ./libnvidia-fbc1.sh
 fi
+$BASH ./xserver-xorg-video-dummy.sh
 $BASH ./xpra.sh

packaging/debian/xpra/control

@@ -6,6 +6,7 @@ X-Python3-Version: >= 3.6
 Build-Depends: debhelper (>= 8)
               ,xz-utils
               ,lsb-release
+              ,xserver-xorg-video-dummy
               ,libx11-dev
               ,libxcomposite-dev
               ,libxdamage-dev
@@ -63,7 +64,12 @@ Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
         ,openssl
 #we need a vfb: either Xdummy or Xvfb
 #        ,xserver-xorg-video-dummy | xserver-xorg-video-dummy-hwe
-        ,xvfb
+        ,xvfb,
+#buster:        ,xserver-xorg-video-dummy
+#bullseye:        ,xserver-xorg-video-dummy
+#bookworm:        ,xserver-xorg-video-dummy
+#trixie:        ,xserver-xorg-video-dummy
+#sid:        ,xserver-xorg-video-dummy
         ,keyboard-configuration
 # for notifications forwarding and dbus server / proxying:
 Recommends: python3-dbus

packaging/debian/xpra/rules

@@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 NPROC := $(shell nproc 2> /dev/null || echo 1)
 
-BUILDOPTS := --without-Xdummy --without-Xdummy_wrapper --pkg-config-path=/usr/lib/xpra/pkgconfig --rpath=/usr/lib/xpra/ $(EXTRA_BUILDOPTS)
+BUILDOPTS := --pkg-config-path=/usr/lib/xpra/pkgconfig --rpath=/usr/lib/xpra/ $(EXTRA_BUILDOPTS)
 
 %:
 	dh $@ --with python3 --with systemd --without=build-stamp

packaging/debian/xpra/xpra.install

@@ -2,14 +2,14 @@ usr/lib/tmpfiles.d/xpra.conf
 usr/lib/sysusers.d/xpra.conf
 usr/bin/xpra
 usr/bin/xpra_launcher
-usr/bin/xpra_signal_listener
-usr/bin/xpra_udev_product_version
 usr/bin/run_scaled
 usr/lib/cups/backend/xpraforwarder
-usr/lib/xpra/xdg-open
-usr/lib/xpra/gnome-open
-usr/lib/xpra/gvfs-open
-usr/lib/xpra/auth_dialog
+usr/libexec/xpra/xpra_signal_listener
+usr/libexec/xpra/xpra_udev_product_version
+usr/libexec/xpra/xdg-open
+usr/libexec/xpra/gnome-open
+usr/libexec/xpra/gvfs-open
+usr/libexec/xpra/auth_dialog
 usr/share/applications/xpra.desktop
 usr/share/applications/xpra-gui.desktop
 usr/share/applications/xpra-launcher.desktop

packaging/debian/xserver-xorg-video-dummy.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -z "${REPO_ARCH_PATH}" ]; then
+	REPO_ARCH_PATH="`pwd`/../repo"
+fi
+
+DUMMY_TAR_XZ=`ls ../pkgs/xf86-video-dummy-*.tar.xz`
+dirname=`echo ${DUMMY_TAR_XZ} | sed 's+../pkgs/++g' | sed 's/.tar.xz//'`
+rm -fr "./${dirname}"
+tar -Jxf ${DUMMY_TAR_XZ}
+pushd "./${dirname}"
+ln -sf ../xserver-xorg-video-dummy ./debian
+
+#install build dependencies:
+mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --yes' debian/control
+rm -f xserver-xorg-video-dummy-build-deps*
+
+debuild -us -uc -b
+ls -la ../xserver-xorg-video-dummy*deb
+mv ../xserver-xorg-video-dummy*deb ../xserver-xorg-video-dummy*changes "$REPO_ARCH_PATH"
+popd

packaging/debian/xserver-xorg-video-dummy/changelog

@@ -0,0 +1,28 @@
+xserver-xorg-video-dummy (1:0.4.0-2) UNRELEASED; urgency=low
+  * added disconnect patch
+
+ -- Antoine Martin <antoine@xpra.org>  Fri, 15 Apr 2022 21:16:07 +0700
+
+xserver-xorg-video-dummy (1:0.4.0-1) UNRELEASED; urgency=low
+  * new upstream release
+
+ -- Antoine Martin <antoine@xpra.org>  Wed, 13 Apr 2022 13:34:40 +0700
+
+xserver-xorg-video-dummy (1:0.3.8-5) UNRELEASED; urgency=low
+
+  * add fix pointer limits patch
+
+ -- Antoine Martin <antoine@xpra.org>  Fri, 23 Dec 2016 12:15:18 +0700
+
+xserver-xorg-video-dummy (1:0.3.8-4) UNRELEASED; urgency=low
+
+  * packaging file path fix
+
+ -- Antoine Martin <antoine@xpra.org>  Thu, 22 Dec 2016 18:59:20 +0700
+
+xserver-xorg-video-dummy (1:0.3.8-2) UNRELEASED; urgency=low
+
+  * DPI fixes for xpra
+  * 30-bit display support
+
+ -- Antoine Martin <antoine@xpra.org>  Sat, 17 Dec 2016 17:03:38 +0700

packaging/debian/xserver-xorg-video-dummy/compat

@@ -0,0 +1 @@
+9

packaging/debian/xserver-xorg-video-dummy/control

@@ -0,0 +1,35 @@
+Source: xserver-xorg-video-dummy
+Section: x11
+Priority: optional
+Maintainer: Antoine Martin <antoine@xpra.org>
+Uploaders: Antoine Martin <antoine@xpra.org>
+Build-Depends:
+ debhelper,
+ quilt,
+ pkg-config,
+ xserver-xorg-dev,
+ x11proto-video-dev,
+ x11proto-xf86dga-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ xutils-dev
+Standards-Version: 3.9.8
+
+Package: xserver-xorg-video-dummy
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+Description: X.Org X server -- dummy display driver
+ This package provides a 'dummy' display driver, which does not actually
+ display anything.
+ .
+ More information about X.Org can be found at:
+ <URL:https://www.X.org>
+ .
+ This package is built from the X.org xf86-video-dummy driver module.

packaging/debian/xserver-xorg-video-dummy/copyright

@@ -0,0 +1,26 @@
+This package was downloaded from
+https://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.