Unverified Commit f1901002 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #219371 from mausch/xpra 

xpra: 4.3.3 -> 4.4.3
parents 684306b2 7705b76c

pkgs/tools/X11/xpra/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
, librsvg

, libvpx

, libwebp

, lz4

, nv-codec-headers-10

, nvidia_x11 ? null

, pam
@@ -68,11 +69,11 @@ let 
  '';

in buildPythonApplication rec {

  pname = "xpra";

  version = "4.3.3";

  version = "4.4.3";



  src = fetchurl {

    url = "https://xpra.org/src/${pname}-${version}.tar.xz";

    hash = "sha256-J6zzkho0A1faCVzS/0wDlbgLtJmyPrnBkEcR7kDld7A=";

    hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8=";

  };



  patches = [
@@ -122,6 +123,7 @@ in buildPythonApplication rec { 
    librsvg

    libvpx

    libwebp

    lz4

    pam

    pango

    x264

pkgs/tools/X11/xpra/fix-122159.patch

+11 −11
Original line number Diff line number Diff line 
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py

index 6def9e0ad..031f8aba9 100755

index 031a41f9e..6232ba830 100755

--- a/xpra/scripts/main.py

+++ b/xpra/scripts/main.py

@@ -364,11 +364,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults):

         "shadow",

         ) and not display_is_remote:

         if use_systemd_run(options.systemd_run):

@@ -377,11 +377,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults):

         "seamless", "desktop", "shadow", "expand",

         "upgrade", "upgrade-seamless", "upgrade-desktop",

         ) and not display_is_remote and use_systemd_run(options.systemd_run):

-        #make sure we run via the same interpreter,

-        #inject it into the command line if we have to:

         argv = list(cmdline)

pkgs/tools/X11/xpra/fix-paths.patch

+0 −23
Original line number Diff line number Diff line 
diff --git a/setup.py b/setup.py

index fc67abb50a..c29db3a6d2 100755

--- a/setup.py

+++ b/setup.py

@@ -2348,17 +2348,7 @@ if v4l2_ENABLED:

             break

     constants_pxi = "xpra/codecs/v4l2/constants.pxi"

     if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi):

-        ENABLE_DEVICE_CAPS = 0

-        if os.path.exists(videodev2_h):

-            try:

-                with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h,

-                                     shell=True) as proc:

-                    ENABLE_DEVICE_CAPS = proc.wait()==0

-            except OSError:

-                with open(videodev2_h) as f:

-                    hdata = f.read()

-                ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0)

-                print("failed to detect device caps, assuming off")

+        ENABLE_DEVICE_CAPS = 1

         with open(constants_pxi, "wb") as f:

             f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS)

     add_cython_ext("xpra.codecs.v4l2.pusher",

diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py

index d5c1c8bb10..88c77e8142 100755

--- a/xpra/x11/fakeXinerama.py