summaryrefslogtreecommitdiffstats
path: root/source/x/x11/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-01-04 22:51:41 +0000
committer Eric Hameleers <alien@slackware.com>2022-01-05 08:59:56 +0100
commit8081d50c9c9ed481c230dc45bcb3483b2cbc2e39 (patch)
tree5d81467b1f5897af2e16d3515f2f2771db34e9f7 /source/x/x11/patch
parent776cc36f81c77479609546ff8ed87b56ec71a279 (diff)
downloadcurrent-8081d50c9c9ed481c230dc45bcb3483b2cbc2e39.tar.gz
current-8081d50c9c9ed481c230dc45bcb3483b2cbc2e39.tar.xz
Tue Jan 4 22:51:41 UTC 202220220104225141
a/bash-5.1.016-x86_64-1.txz: Upgraded. a/haveged-1.9.16-x86_64-1.txz: Upgraded. a/hwdata-0.355-noarch-1.txz: Upgraded. ap/gphoto2-2.5.28-x86_64-1.txz: Upgraded. kde/bluedevil-5.23.5-x86_64-1.txz: Upgraded. kde/breeze-5.23.5-x86_64-1.txz: Upgraded. kde/breeze-grub-5.23.5-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.23.5-x86_64-1.txz: Upgraded. kde/drkonqi-5.23.5-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.23.5-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.23.5-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.23.5-x86_64-1.txz: Upgraded. kde/kdecoration-5.23.5-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.23.5-x86_64-1.txz: Upgraded. kde/kgamma5-5.23.5-x86_64-1.txz: Upgraded. kde/khotkeys-5.23.5-x86_64-1.txz: Upgraded. kde/kinfocenter-5.23.5-x86_64-1.txz: Upgraded. kde/kmenuedit-5.23.5-x86_64-1.txz: Upgraded. kde/konsole-21.12.0-x86_64-2.txz: Rebuilt. Applied upstream patch: [PATCH] Use tighter matching when finding the default profile file name. Thanks to alienBOB. kde/kscreen-5.23.5-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.23.5-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.23.5-x86_64-1.txz: Upgraded. kde/ksystemstats-5.23.5-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.23.5-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.23.5-x86_64-1.txz: Upgraded. kde/kwayland-server-5.23.5-x86_64-1.txz: Upgraded. kde/kwin-5.23.5-x86_64-1.txz: Upgraded. kde/kwrited-5.23.5-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.23.5-x86_64-1.txz: Upgraded. kde/libkscreen-5.23.5-x86_64-1.txz: Upgraded. kde/libksysguard-5.23.5-x86_64-1.txz: Upgraded. kde/milou-5.23.5-x86_64-1.txz: Upgraded. kde/oxygen-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-disks-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-integration-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-nm-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-pa-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-vault-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.23.5-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.23.5-x86_64-1.txz: Upgraded. kde/powerdevil-5.23.5-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.23.5-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.23.5-x86_64-1.txz: Upgraded. kde/systemsettings-5.23.5-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.23.5-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_19-x86_64-2.txz: Rebuilt. It seems that even with --enable-opencl, ImageMagick has disabled OpenCL support by default unless the environment variable MAGICK_OCL_DEVICE=true is set, so there should be no harm enabling this feature again. Thanks to denydias. l/iso-codes-4.9.0-noarch-1.txz: Upgraded. l/libgphoto2-2.5.28-x86_64-1.txz: Upgraded. l/pipewire-0.3.42-x86_64-2.txz: Rebuilt. Added sample startup files in /etc/xdg/autostart. Thanks to stormtracknole. Added scripts (pipewire-enable.sh, pipewire-disable.sh) to setup pipewire as the default multimedia server, or to disable it and return to pulseaudio as the default. Thanks to stormtracknole and LuckyCyborg for many useful tips. l/pulseaudio-15.0-x86_64-4.txz: Rebuilt. Install pulseaudio.desktop as a .new file so that future package updates won't overwrite custom content. n/whois-5.5.11-x86_64-1.txz: Upgraded. n/yptools-4.2.3-x86_64-5.txz: Rebuilt. Fixed ypcat installation. Thanks to Stuart Winter. x/libdrm-2.4.109-x86_64-1.txz: Upgraded. x/xdg-desktop-portal-1.12.1-x86_64-1.txz: Upgraded. x/xf86-video-vmware-13.3.0-x86_64-6.txz: Rebuilt. Patched to build against libdrm-2.4.109. Thanks to gmgf.
Diffstat (limited to 'source/x/x11/patch')
-rw-r--r--source/x/x11/patch/xf86-video-vmware.patch2
-rw-r--r--source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch60
2 files changed, 62 insertions, 0 deletions
diff --git a/source/x/x11/patch/xf86-video-vmware.patch b/source/x/x11/patch/xf86-video-vmware.patch
new file mode 100644
index 000000000..b7be82d95
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-vmware.patch
@@ -0,0 +1,2 @@
+# Fix build with recent libdrm:
+zcat $CWD/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch b/source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch
new file mode 100644
index 000000000..35142b5bc
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch
@@ -0,0 +1,60 @@
+From 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 Mon Sep 17 00:00:00 2001
+From: Martin Krastev <krastevm@vmware.com>
+Date: Tue, 30 Nov 2021 11:47:39 -0800
+Subject: vmwgfx: Change header inclusion order to avoid xorg headers catching
+ stdbool.h
+
+libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added
+stdbool.h to the library headers which conflicts with xorg headers.
+
+Signed-off-by: Martin Krastev <krastevm@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.h | 6 +++---
+ vmwgfx/vmwgfx_saa.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
+index fa8e308..467fb21 100644
+--- a/vmwgfx/vmwgfx_driver.h
++++ b/vmwgfx/vmwgfx_driver.h
+@@ -36,15 +36,15 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <errno.h>
+-#include <drm.h>
+-#include <xf86drm.h>
+-#include <xf86drmMode.h>
+ #include <xorg-server.h>
+ #include <xf86.h>
+ #include <xf86Crtc.h>
+ #include <xf86xv.h>
+ #include <xa_tracker.h>
+ #include <xf86Module.h>
++#include <drm.h>
++#include <xf86drm.h>
++#include <xf86drmMode.h>
+
+ #include "../src/compat-api.h"
+ #ifdef DRI2
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 0881e2f..457f397 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -29,11 +29,11 @@
+ #include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+-#include <xf86drmMode.h>
+ #include <xa_context.h>
+ #include "vmwgfx_saa.h"
+ #include "vmwgfx_drmi.h"
+ #include "vmwgfx_saa_priv.h"
++#include <xf86drmMode.h>
+
+ /*
+ * Damage to be added as soon as we attach storage to the pixmap.
+--
+cgit v1.2.1
+