From f5899f480b2df8f6608051b4e586a255151fe8c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:55:58 +0200 Subject: [PATCH] package/x11r7/xdriver_xf86-video-ati: fix build with newer versions of xserver Fixes: http://autobuild.buildroot.net/results/ccc/ccc36c8cd3530153316190f378847081cb5c1c58/ http://autobuild.buildroot.net/results/bef/bef85a6a09bdd1d1a5035ee7baac1f2d2e7e1a2e/ http://autobuild.buildroot.net/results/7d6/7d65c8085a1ae122da4acc296538f2277b3ec15e/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...dri-h-with-older-versions-of-xserver.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch diff --git a/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch new file mode 100644 index 0000000000..a969d61913 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch @@ -0,0 +1,32 @@ +From 5eba006e4129e8015b822f9e1d2f1e613e252cda Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= +Date: Tue, 2 Feb 2021 12:45:54 +0100 +Subject: [PATCH] Only include dri.h with older versions of xserver + +Not needed anymore with current versions. + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/5eba006e4129e8015b822f9e1d2f1e613e252cda + +Signed-off-by: Bernd Kuhls +--- + src/drmmode_display.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 3099a729..a58f24dd 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -45,7 +45,9 @@ + #include "radeon_glamor.h" + #include "radeon_reg.h" + ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0) + #include ++#endif + + #include "drmmode_display.h" + +-- +GitLab +