diff options
Diffstat (limited to 'extra/source/tigervnc/patches')
6 files changed, 68 insertions, 30 deletions
diff --git a/extra/source/tigervnc/patches/tigervnc.pam.d.diff b/extra/source/tigervnc/patches/tigervnc.pam.d.diff new file mode 100644 index 000000000..775820b06 --- /dev/null +++ b/extra/source/tigervnc/patches/tigervnc.pam.d.diff @@ -0,0 +1,15 @@ +--- ./unix/vncserver/tigervnc.pam.orig 2021-11-09 01:51:28.000000000 -0600 ++++ ./unix/vncserver/tigervnc.pam 2021-11-15 14:58:09.273033740 -0600 +@@ -1,11 +1,8 @@ + #%PAM-1.0 +-# pam_selinux.so close should be the first session rule +--session required pam_selinux.so close + session required pam_loginuid.so + -session required pam_selinux.so open + session required pam_namespace.so + session optional pam_keyinit.so force revoke + session required pam_limits.so +--session optional pam_systemd.so ++session optional pam_elogind.so + session required pam_unix.so +--session optional pam_reauthorize.so prepare diff --git a/extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff b/extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff deleted file mode 100644 index 4eff6b66b..000000000 --- a/extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- ./unix/xserver/hw/vnc/xvnc.c.orig 2019-12-20 01:02:02.000000000 -0600 -+++ ./unix/xserver/hw/vnc/xvnc.c 2020-02-09 16:48:59.587362042 -0600 -@@ -295,6 +295,15 @@ - } - #endif - -+#if INPUTTHREAD -+/** This function is called in Xserver/os/inputthread.c when starting -+ the input thread. */ -+void -+ddxInputThreadInit(void) -+{ -+} -+#endif -+ - void ddxUseMsg(void) - { - vncPrintBanner(); diff --git a/extra/source/tigervnc/patches/tigervnc13_link_png.patch b/extra/source/tigervnc/patches/tigervnc13_link_png.patch deleted file mode 100644 index e5f3374aa..000000000 --- a/extra/source/tigervnc/patches/tigervnc13_link_png.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4689566..e3475f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -265,6 +265,7 @@ if(UNIX AND NOT APPLE) - if(X11_Xcursor_FOUND) - set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB}) - endif() -+ set(FLTK_LIBRARIES ${FLTK_LIBRARIES} png) - endif() - - if(FLTK_FOUND) diff --git a/extra/source/tigervnc/patches/vncserver.no.rfbwait.diff b/extra/source/tigervnc/patches/vncserver.no.rfbwait.diff new file mode 100644 index 000000000..c3b0bf23b --- /dev/null +++ b/extra/source/tigervnc/patches/vncserver.no.rfbwait.diff @@ -0,0 +1,11 @@ +--- ./vncserver.orig 2019-12-20 01:02:02.000000000 -0600 ++++ ./vncserver 2021-11-15 15:52:29.648106674 -0600 +@@ -205,7 +205,7 @@ + $default_opts{geometry} = $geometry if ($geometry); + $default_opts{depth} = $depth if ($depth); + $default_opts{pixelformat} = $pixelformat if ($pixelformat); +-$default_opts{rfbwait} = 30000; ++#$default_opts{rfbwait} = 30000; + $default_opts{rfbauth} = "$vncUserDir/passwd"; + $default_opts{rfbport} = $vncPort; + $default_opts{fp} = $fontPath if ($fontPath); diff --git a/extra/source/tigervnc/patches/xorg-server/06_use-intel-only-on-pre-gen4.diff b/extra/source/tigervnc/patches/xorg-server/06_use-intel-only-on-pre-gen4.diff new file mode 100644 index 000000000..4994492f6 --- /dev/null +++ b/extra/source/tigervnc/patches/xorg-server/06_use-intel-only-on-pre-gen4.diff @@ -0,0 +1,30 @@ +Description: Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting +Author: Timo Aaltonen <tjaalton@debian.org> + +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_devi + case 0x0bef: + /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ + break; +- default: ++ /* Default to intel only on pre-gen4 chips */ ++ case 0x3577: ++ case 0x2562: ++ case 0x3582: ++ case 0x358e: ++ case 0x2572: ++ case 0x2582: ++ case 0x258a: ++ case 0x2592: ++ case 0x2772: ++ case 0x27a2: ++ case 0x27ae: ++ case 0x29b2: ++ case 0x29c2: ++ case 0x29d2: ++ case 0xa001: ++ case 0xa011: + driverList[0] = "intel"; + break; + } diff --git a/extra/source/tigervnc/patches/xorg-server/fix-pci-segfault.diff b/extra/source/tigervnc/patches/xorg-server/fix-pci-segfault.diff new file mode 100644 index 000000000..400376287 --- /dev/null +++ b/extra/source/tigervnc/patches/xorg-server/fix-pci-segfault.diff @@ -0,0 +1,12 @@ +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index cef47da03d0e91e6a56a5e3cb14a51d931633eff..dadbac6c8f0ae6f3d636fdfe245e61bc0c98581d 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -289,7 +289,7 @@ xf86platformProbe(void) + for (i = 0; i < xf86_num_platform_devices; i++) { + char *busid = xf86_platform_odev_attributes(i)->busid; + +- if (pci && (strncmp(busid, "pci:", 4) == 0)) { ++ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { + platform_find_pci_info(&xf86_platform_devices[i], busid); + } |