From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gIdtEmtJ914fUgAA0tVLHw (envelope-from ) for ; Sat, 27 Jun 2020 13:28:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kNpUDmtJ916vUAAA1q6Kng (envelope-from ) for ; Sat, 27 Jun 2020 13:28:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A10099404C7 for ; Sat, 27 Jun 2020 13:28:09 +0000 (UTC) Received: from localhost ([::1]:49392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpAsI-000290-R4 for larch@yhetil.org; Sat, 27 Jun 2020 09:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpAsE-00028k-Vm for guix-patches@gnu.org; Sat, 27 Jun 2020 09:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpAsE-0005zx-N6 for guix-patches@gnu.org; Sat, 27 Jun 2020 09:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpAsE-0002Nu-Ip for guix-patches@gnu.org; Sat, 27 Jun 2020 09:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42081] [PATCH] Upgrade xpra to 4.0.2 Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jun 2020 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42081@debbugs.gnu.org Cc: rhelling@mykolab.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15932644529119 (code B ref -1); Sat, 27 Jun 2020 13:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jun 2020 13:27:32 +0000 Received: from localhost ([127.0.0.1]:43709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpArb-0002Mp-UN for submit@debbugs.gnu.org; Sat, 27 Jun 2020 09:27:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:48082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpArQ-0002MY-Jl for submit@debbugs.gnu.org; Sat, 27 Jun 2020 09:27:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpArQ-00024s-DF for guix-patches@gnu.org; Sat, 27 Jun 2020 09:27:12 -0400 Received: from mout-y-209.mailbox.org ([91.198.250.237]:38506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jpArL-0005nv-8E for guix-patches@gnu.org; Sat, 27 Jun 2020 09:27:12 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-y-209.mailbox.org (Postfix) with ESMTPS id 49vF0P64fTzQlH9; Sat, 27 Jun 2020 15:27:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1593264419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0w/x9kNjXbxN4clFa31Q7ohGuiNyOS1nSNcKLxFx0U=; b=m704VA9kPJqfkAgkfPA94O0QjktTYn3FkOrfKXvUQy35gUSD6fUgaBy9uZ7X8tSqitGwa2 ea89v7R1uv4/05kY6D11QQL1mW6vLeNmE3fH4h0y3hg3DjUSOlM/Oj9I0kHpRFS0k2Dyf2 aKIoE3a5iXu5qNULAHQsQAezZ1bGeJ01Jbdz0duwYnLxnenjReQ6bAn1YsD8nmo3TBgExJ 707c0J5X6Mak73tKK7DFp6xOpNa0UE1TQHBWmhiUefYw6P1dLZwq+YWSZBnHuu+0J/vm8k 42HbZ5JSVwUx5r+a9XWedB1gvRkbzbGp1TPJo3N+Ya4vFbOMYjMPBveofK8DGQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id tPox-hIPCz7p; Sat, 27 Jun 2020 15:26:57 +0200 (CEST) Date: Sat, 27 Jun 2020 15:26:55 +0200 From: Lars-Dominik Braun Message-ID: <20200627132655.GA1396@noor.fritz.box> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="qDbXVdCdHGoSgWSk" Content-Disposition: inline Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: 0 X-Rspamd-Score: -4.73 / 15.00 / 15.00 X-Rspamd-Queue-Id: 6817A1789 X-Rspamd-UID: 46577a Received-SPF: pass client-ip=91.198.250.237; envelope-from=lars@6xq.net; helo=mout-y-209.mailbox.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/27 09:27:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.3 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=6xq.net header.s=MBO0001 header.b=m704VA9k; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.59 X-TUID: b1OVSPyfmfKC --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi, the following patchset upgrade xpra to version 4.0.2, which will finally use Python 3 and GTK 3. It removes the Python 2 variants of PyOpenGL, because xpra is the only dependent. I’ve been running this package for a week now and connected to both version 4 and version 3 on an Ubuntu machine, which still works. OpenGL also works, despite failing tests for PyOpenGL. Rutger: You have been working on xpra in the past. Could you take a look and make sure I did not break any use case? Cheers, Lars --qDbXVdCdHGoSgWSk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-Add-python-pyopengl.patch" >From 03f07d5544f5c4ef9baffe5924a14386d2128eff Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:06:14 +0200 Subject: [PATCH 1/6] gnu: Add python-pyopengl. * gnu/packages/python-xyz.scm (python-pyopengl): New variable. --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 300277f045..d6966dceeb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15362,6 +15362,52 @@ library.") (description "This is the Cython-coded accelerator module for PyOpenGL."))) +(define-public python-pyopengl + (package + (name "python-pyopengl") + (version "3.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyOpenGL" version)) + (sha256 + (base32 + "091lp9bpqi8yf1nmyg19xmvw611lrzq2q94cl1k5gnlh0c6vl1s1")))) + (build-system python-build-system) + (inputs + `(("mesa" ,mesa) + ("freeglut" ,freeglut) + ("glu" ,glu))) + (arguments + `(#:tests? #f ; Tests fail: AttributeError: 'GLXPlatform' object has no + ;attribute 'OSMesa' + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("OpenGL/platform/ctypesloader.py") + (("filenames_to_try = \\[\\]") "filenames_to_try = [name]")) + (substitute* '("OpenGL/platform/glx.py" "tests/check_glut_load.py") + (("'GL'") + (string-append "'" (assoc-ref inputs "mesa") "/lib/libGL.so'")) + (("'GLU'") + (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'")) + (("'glut',") + (string-append "'" (assoc-ref inputs "freeglut") "/lib/libglut.so',")) + (("'GLESv1_CM'") + (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv1_CM.so'")) + (("'GLESv2'") + (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'"))) + ;; Not providing libgle. It seems to be very old. + #t))))) + (home-page "http://pyopengl.sourceforge.net") + (synopsis "Standard OpenGL bindings for Python") + (description + "PyOpenGL is the most common cross platform Python binding to OpenGL and +related APIs. The binding is created using the standard @code{ctypes} +library.") + (license license:bsd-3))) + (define-public python-rencode (package (name "python-rencode") -- 2.26.2 --qDbXVdCdHGoSgWSk Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0004-gnu-xpra-Upgrade-to-4.0.2.patch" Content-Transfer-Encoding: 8bit >From c78e6e9371c37b91e796ed71451150d332ce40a9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:11:05 +0200 Subject: [PATCH 4/6] gnu: xpra: Upgrade to 4.0.2. * gnu/packages/xorg.scm (xpra)[version]: Upgrade. [source]: Add patch. [inputs]: Adjust to use Python 3 dependencies. [arguments]: Use Python 3, add phases to patch hardcoded binary paths. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/patches/xpra-4.0.1-systemd-run.patch: New file. --- gnu/local.mk | 1 + .../patches/xpra-4.0.1-systemd-run.patch | 34 ++++ gnu/packages/xorg.scm | 153 ++++++++++-------- 3 files changed, 123 insertions(+), 65 deletions(-) create mode 100644 gnu/packages/patches/xpra-4.0.1-systemd-run.patch diff --git a/gnu/local.mk b/gnu/local.mk index 396629cc93..c4a37a4514 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1623,6 +1623,7 @@ dist_patch_DATA = \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ + %D%/packages/patches/xpra-4.0.1-systemd-run.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ diff --git a/gnu/packages/patches/xpra-4.0.1-systemd-run.patch b/gnu/packages/patches/xpra-4.0.1-systemd-run.patch new file mode 100644 index 0000000000..1ea11830a5 --- /dev/null +++ b/gnu/packages/patches/xpra-4.0.1-systemd-run.patch @@ -0,0 +1,34 @@ +Disable systemd-run if the command is not found. + +diff -Naur xpra-4.0.1/xpra/scripts/main.py xpra-4.0.1.patched/xpra/scripts/main.py +--- xpra-4.0.1/xpra/scripts/main.py 2020-05-17 18:12:15.000000000 +0200 ++++ xpra-4.0.1.patched/xpra/scripts/main.py 2020-06-01 12:12:18.500257507 +0200 +@@ -312,16 +312,18 @@ + if not is_systemd_pid1(): + return False + #test it: +- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] +- proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) +- r = pollwait(proc, timeout=1) +- if r is None: +- try: +- proc.terminate() +- except Exception: +- pass +- return r==0 +- ++ try: ++ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] ++ proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) ++ r = pollwait(proc, timeout=1) ++ if r is None: ++ try: ++ proc.terminate() ++ except Exception: ++ pass ++ return r==0 ++ except FileNotFoundError: ++ return False + + def run_mode(script_file, error_cb, options, args, mode, defaults): + #configure default logging handler: diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f02d459d28..6eaf733bbd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6276,7 +6276,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.5.3") + (version "4.0.2") (source (origin (method url-fetch) @@ -6284,85 +6284,108 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys")))) + "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x")) + (patches (search-patches "xpra-4.0.1-systemd-run.patch")))) (build-system python-build-system) - (inputs `(("ffmpeg" ,ffmpeg) - ("flac" ,flac) - ("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet + ;; see also http://xpra.org/trac/wiki/Dependencies + (inputs `( + ;; Essential dependencies. ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libvpx" ,libvpx) - ("libx264" ,libx264) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxi" ,libxi) - ("libxkbfile" ,libxkbfile) + ("libwebp" ,libwebp) + ("ffmpeg" ,ffmpeg) + ("libx11" ,libx11) ("libxrandr" ,libxrandr) ("libxtst" ,libxtst) - ("lzo" ,lzo) - ("python2-cryptography" ,python2-cryptography) - ("python2-dbus" ,python2-dbus) - ("python2-lz4" ,python2-lz4) - ("python2-lzo" ,python2-lzo) - ("python2-netifaces" ,python2-netifaces) - ("python2-numpy" ,python2-numpy) - ("python2-pillow" ,python2-pillow) - ("python2-pycairo" ,python2-pycairo) - ("python2-pycrypto" ,python2-pycrypto) - ("python2-pygobject" ,python2-pygobject) - ("python2-pyopengl" ,python2-pyopengl) - ("python2-pyopengl-accelerate" ,python2-pyopengl-accelerate) - ("python2-pygtk" ,python2-pygtk) - ("python2-rencode" ,python2-rencode) - ("xorg-server" ,xorg-server))) + ("libxfixes" ,libxfixes) + ("libxkbfile" ,libxkbfile) + ("libxcomposite" ,libxcomposite) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("gtk+" ,gtk+) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("xauth" ,xauth) + ("xorg-server" ,xorg-server) + ("xf86-video-dummy" ,xf86-video-dummy) + ("xf86-input-mouse" ,xf86-input-mouse) + ("xf86-input-keyboard" ,xf86-input-keyboard) + ("python-pillow" ,python-pillow) + ;; Optional dependencies. + ("python-rencode" ,python-rencode) ; For speed. + ("python-numpy", python-numpy) + ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration. + ("python-pyopengl-accelerate" ,python-pyopengl-accelerate) ; Same. + ("python-paramiko" ,python-paramiko) ; Tunneling over SSH. + ("python-dbus" ,python-dbus) ; For desktop notifications. + ("dbus" ,dbus) ; For dbus-launch command. + ("python-lz4" ,python-lz4) ; Faster compression than zlib. + ("python-netifaces" ,python-netifaces))) (native-inputs `(("pkg-config" ,pkg-config) - ("python2-cython" ,python2-cython))) + ("python-cython" ,python-cython))) (arguments - `(#:python ,python-2 ;; no full Python 3 support yet - #:configure-flags '("--with-tests" - "--with-bundle_tests" - "--without-Xdummy" ;; We use Xvfb instead. - "--without-Xdummy_wrapper" - "--without-strict") + `(#:configure-flags '("--without-Xdummy" + "--without-Xdummy_wrapper" + "--with-opengl" + "--without-debug" + "--without-strict") ; Ignore compiler warnings. #:modules ((guix build python-build-system) (guix build utils)) - + #:tests? #f ; Do not run test-cases. This would rebuild all modules and + ; they seem to require python2. #:phases (modify-phases %standard-phases + ;; built by 'install phase (delete 'build) - (delete 'check) ;; There's no test suite at the moment. - - ;; Remove BUILD_CPU, BUILD_DATE, BUILD_TIME from build info to - ;; prevent deterministic issues. Also correct some directories and - ;; use the xvfb binary instead of xorg-server (which doesn't seem to - ;; work). - (add-before 'install 'remove-timestamps&set-file-names + (add-before 'install 'fix-paths (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "add_build_info.py" - ((".*\"BUILD_CPU\", get_cpuinfo.*") "")) - (substitute* "add_build_info.py" - ((".*\"BUILD_DATE\", datetime.*") "")) - (substitute* "add_build_info.py" - ((".*\"BUILD_TIME\", datetime.*") "")) - (substitute* "setup.py" - (("/etc/init.d/") - (string-append (assoc-ref outputs "out") - "/etc/init.d/"))) - (substitute* "setup.py" - (("/usr/lib/") - (string-append (assoc-ref outputs "out") "/lib/"))) - ;; Use Xvfb with '-nolisten local' to disable abstract X11 sockets. - (substitute* "./xpra/scripts/config.py" - ((":.*join.*xvfb.*") - (string-append ": \"" (assoc-ref inputs "xorg-server") - "/bin/Xvfb +extension Composite" - " -screen 0 5760x2560x24+32 -dpi 96 -nolisten" - " tcp -nolisten local -noreset -auth" - " $XAUTHORITY\",\n"))) + ;; Fix binary paths. + (substitute* '("xpra/scripts/config.py" "xpra/x11/vfb_util.py") + (("\"Xvfb\"") + (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xvfb\"")) + (("\"Xorg\"") + (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xorg\"")) + (("\"xauth\"") + (string-append "\"" (assoc-ref inputs "xauth") "/bin/xauth\""))) + ;; Fix directory of config files. + (substitute* '("xpra/scripts/config.py" "xpra/platform/xposix/paths.py") + (("\"/etc/xpra/?\"") + (string-append "\"" (assoc-ref outputs "out") "/etc/xpra/\""))) + ;; XXX: Stolen from (gnu packages linux) + (define (append-to-file name body) + (let ((file (open-file name "a"))) + (display body file) + (close-port file))) + ;; Add Xorg module paths. + (append-to-file + "etc/xpra/xorg.conf" + (string-append "\nSection \"Files\"\nModulePath \"" + (assoc-ref inputs "xf86-video-dummy") "/lib/xorg/modules," + (assoc-ref inputs "xf86-input-mouse") "/lib/xorg/modules," + (assoc-ref inputs "xf86-input-keyboard") "/lib/xorg/modules," + (assoc-ref inputs "xorg-server") "/lib/xorg/modules\"\n" + "EndSection\n\n")) + (substitute* '("xpra/scripts/config.py" + "etc/xpra/conf.d/60_server.conf.in" + "unittests/unit/server/mixins/notification_test.py") + ;; The trailing -- is intentional, so we only replace it inside + ;; a command line. + (("dbus-launch --") + (string-append (assoc-ref inputs "dbus") "/bin/dbus-launch --"))) + ;; /run/user does not exist on guix system (substitute* "./xpra/scripts/config.py" (("socket-dir.*: \"\",") "socket-dir\" : \"~/.xpra\",")) - #t))))) + #t)) + ;; GTK3 will not be found, if GI can’t find its typelibs. + (add-after + 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/xpra"))) + ;; XXX: only export typelibs in inputs + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) (home-page "https://www.xpra.org/") (synopsis "Remote access to individual applications or full desktops") (description "Xpra is a persistent remote display server and client for -- 2.26.2 --qDbXVdCdHGoSgWSk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-Add-python-pyopengl-accelerate.patch" >From d0d12814ae00154a20ad6d8bd9504a20f7d86161 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:07:01 +0200 Subject: [PATCH 2/6] gnu: Add python-pyopengl-accelerate. * gnu/packages/python-xyz.scm (gnu/packages/python-xyz.scm): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d6966dceeb..318d55360b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15408,6 +15408,31 @@ related APIs. The binding is created using the standard @code{ctypes} library.") (license license:bsd-3))) +(define-public python-pyopengl-accelerate + (package + (inherit python-pyopengl) + (name "python-pyopengl-accelerate") + (version "3.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyOpenGL-accelerate" version)) + (sha256 + (base32 + "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j")))) + (inputs + `(("mesa" ,mesa) + ("python-numpy" ,python-numpy))) ; for cython module + ; numpy_formathandler, thus not propagated + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'fix-paths)))) + (synopsis "Acceleration code for PyOpenGL") + (description + "This is the Cython-coded accelerator module for PyOpenGL."))) + (define-public python-rencode (package (name "python-rencode") -- 2.26.2 --qDbXVdCdHGoSgWSk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0006-gnu-python2-pyopengl-Remove.patch" >From cb4b362f34c1be34bf1e084bca19f8fec65e20e4 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:15:03 +0200 Subject: [PATCH 6/6] gnu: python2-pyopengl: Remove. * gnu/packages/python-xyz.scm (python2-pyopengl): Remove variable. --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c4eb1cd4f8..afa0bb21c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15324,28 +15324,6 @@ functionality like full case-folding for case-insensitive matches in Unicode.") (define-public python2-regex (package-with-python2 python-regex)) -(define-public python2-pyopengl - (package - (name "python2-pyopengl") - (version "3.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyOpenGL" version)) - (sha256 - (base32 - "1byxjj6a8rwzhxhjqlc588zdad2qwxdd7vlam2653ylll31waiwv")))) - (arguments - `(#:python ,python-2)) - (build-system python-build-system) - (home-page "http://pyopengl.sourceforge.net") - (synopsis "Standard OpenGL bindings for Python") - (description - "PyOpenGL is the most common cross platform Python binding to OpenGL and -related APIs. The binding is created using the standard @code{ctypes} -library.") - (license license:bsd-3))) - (define-public python-pyopengl (package (name "python-pyopengl") -- 2.26.2 --qDbXVdCdHGoSgWSk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0003-gnu-Add-xf86-video-dummy.patch" >From b520f8dcde2dd916b4c94b8e9691292be258af2f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:08:02 +0200 Subject: [PATCH 3/6] gnu: Add xf86-video-dummy. * gnu/packages/xorg.scm (xf86-video-dummy): New variable. --- gnu/packages/xorg.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9b663aa158..f02d459d28 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2827,10 +2827,26 @@ X server.") X server.") (license license:x11))) - -;; non-free license -;; (define-public xf86-video-dummy - +(define-public xf86-video-dummy + (package + (name "xf86-video-dummy") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/driver/" + "xf86-video-dummy-" version ".tar.bz2")) + (sha256 + (base32 "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip")))) + (build-system gnu-build-system) + (inputs `(("xorg-server" ,xorg-server))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "https://www.x.org/wiki/") + (synopsis "Dummy video driver for X server") + (description + "Virtual/offscreen frame buffer driver for the Xorg X server.") + ;; per https://lists.freedesktop.org/archives/xorg/2020-June/060316.html + (license license:x11))) (define-public xf86-video-fbdev (package -- 2.26.2 --qDbXVdCdHGoSgWSk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0005-gnu-python2-pyopengl-accelerate-Remove.patch" >From ca8c4504f025ddd6ad67cf0fe4471c2dd1fa89c9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 27 Jun 2020 15:14:25 +0200 Subject: [PATCH 5/6] gnu: python2-pyopengl-accelerate: Remove. * gnu/packages/python-xyz.scm (python2-pyopengl-accelerate): Remove variable. --- gnu/packages/python-xyz.scm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 318d55360b..c4eb1cd4f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15346,22 +15346,6 @@ related APIs. The binding is created using the standard @code{ctypes} library.") (license license:bsd-3))) -(define-public python2-pyopengl-accelerate - (package - (inherit python2-pyopengl) - (name "python2-pyopengl-accelerate") - (version "3.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyOpenGL-accelerate" version)) - (sha256 - (base32 - "0464c1ifzk0k92lyndikmvzjgnx1y25r7bkkc8pnxm4kp1q4czwj")))) - (synopsis "Acceleration code for PyOpenGL") - (description - "This is the Cython-coded accelerator module for PyOpenGL."))) - (define-public python-pyopengl (package (name "python-pyopengl") -- 2.26.2 --qDbXVdCdHGoSgWSk--