From 1328e96fe58d7d0119bd9b2619cea0854a157da8 Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Thu, 22 Nov 2018 02:58:48 +0200 Subject: [PATCH] Fixing https://github.com/termux/x11-packages/pull/30#issuecomment-440859921 --- x11-packages/xorg-server/linux_noop.patch | 2 +- x11-packages/xorg-server/platform_noop.c | 25 ------------- .../xorg-server/platform_noop.c.patch | 36 +++++++++++++++++++ 3 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 x11-packages/xorg-server/platform_noop.c create mode 100644 x11-packages/xorg-server/platform_noop.c.patch diff --git a/x11-packages/xorg-server/linux_noop.patch b/x11-packages/xorg-server/linux_noop.patch index 89d33a461..c21e98fef 100644 --- a/x11-packages/xorg-server/linux_noop.patch +++ b/x11-packages/xorg-server/linux_noop.patch @@ -4,7 +4,7 @@ endif -liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \ -+liblinux_la_SOURCES = linux.h lnx_init.c $(srcdir)/../shared/ioperm_noop.c \ ++liblinux_la_SOURCES = linux.h lnx_init.c $(srcdir)/../shared/ioperm_noop.c $(srcdir)/../shared/platform_noop.c \ lnx_agp.c lnx_kmod.c lnx_bell.c lnx_platform.c \ $(srcdir)/../shared/VTsw_usl.c \ $(srcdir)/../shared/posix_tty.c \ diff --git a/x11-packages/xorg-server/platform_noop.c b/x11-packages/xorg-server/platform_noop.c deleted file mode 100644 index 850fc0d13..000000000 --- a/x11-packages/xorg-server/platform_noop.c +++ /dev/null @@ -1,25 +0,0 @@ -+++ ./hw/xfree86/os-support/shared/platform_noop.c 2018-09-14 18:56:45.000000000 +0300 -@@ -0,0 +1,23 @@ -+ -+#ifdef HAVE_XORG_CONFIG_H -+#include -+#endif -+ -+#ifdef XSERVER_PLATFORM_BUS -+/* noop platform device support */ -+#include "xf86_OSproc.h" -+ -+#include "xf86.h" -+#include "xf86platformBus.h" -+ -+Bool -+xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid) -+{ -+ return FALSE; -+} -+ -+void xf86PlatformDeviceProbe(struct OdevAttributes *attribs) -+{ -+ -+} -+#endif diff --git a/x11-packages/xorg-server/platform_noop.c.patch b/x11-packages/xorg-server/platform_noop.c.patch new file mode 100644 index 000000000..cf3d7e6d3 --- /dev/null +++ b/x11-packages/xorg-server/platform_noop.c.patch @@ -0,0 +1,36 @@ ++++ ./hw/xfree86/os-support/shared/platform_noop.c 2018-11-22 02:41:02.516704523 +0200 +@@ -0,0 +1,34 @@ ++ ++#ifdef HAVE_XORG_CONFIG_H ++#include ++#endif ++ ++/* noop platform device support */ ++#include "xf86_OSproc.h" ++#include "xf86OSpriv.h" ++ ++#include "xf86.h" ++ ++/***************************************************************************/ ++/* Video Memory Mapping section */ ++/***************************************************************************/ ++ ++void ++xf86OSInitVidMem(VidMemInfoPtr pVidMem) ++{ ++ pVidMem->initialised = TRUE; ++} ++ ++#ifdef XSERVER_PLATFORM_BUS ++#include "xf86platformBus.h" ++Bool ++xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid) ++{ ++ return FALSE; ++} ++ ++void xf86PlatformDeviceProbe(struct OdevAttributes *attribs) ++{ ++ ++} ++#endif