diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-01-10 08:46:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-01-10 18:53:03 +0100 |
| commit | 8f334ab4d02f9568e1380d9e88bf1179cffcd115 (patch) | |
| tree | a71df5200ffa2e3976a3814d55cf35c95b533d31 /package/xorg-server | |
| parent | a1cf26c948c232d2f9653d2094c8009909d80e5b (diff) | |
libXScrnsaver: disable malloc0returnsnull
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_common_compiler_h | 10 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h index 07737fafe..824744f53 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h @@ -1,8 +1,8 @@ from alpinelinux ---- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h 2013-12-15 08:48:09.000000000 +0100 -+++ xorg-server-1.15.0/hw/xfree86/common/compiler.h 2014-03-21 12:53:48.834417415 +0100 -@@ -727,26 +727,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b +--- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h 2015-10-28 19:15:36.000000000 +0100 ++++ xorg-server-1.18.0/hw/xfree86/common/compiler.h 2016-01-08 01:41:49.582326445 +0100 +@@ -525,26 +525,26 @@ xf86WriteMmio32Le(__volatile__ void *bas #define PORT_SIZE short #endif @@ -33,7 +33,7 @@ from alpinelinux val; } -@@ -754,21 +754,21 @@ static __inline__ unsigned int +@@ -552,21 +552,21 @@ static __inline__ unsigned int inb(unsigned PORT_SIZE port) { return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + @@ -58,7 +58,7 @@ from alpinelinux } #if defined(__mips__) -@@ -995,7 +995,7 @@ inl(unsigned short port) +@@ -758,7 +758,7 @@ inl(unsigned short port) return xf86ReadMmio32Le((void *) ioBase, port); } diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index 843cc145b..a3929d9f9 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -1,6 +1,6 @@ ---- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_video.c 2013-12-27 18:38:52.000000000 +0100 -+++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_video.c 2014-03-21 13:14:06.821293270 +0100 -@@ -473,7 +473,7 @@ unmapVidMem(int ScreenNum, pointer Base, +--- xorg-server-1.18.0.orig/hw/xfree86/os-support/linux/lnx_video.c 2015-08-03 16:44:08.000000000 +0200 ++++ xorg-server-1.18.0/hw/xfree86/os-support/linux/lnx_video.c 2016-01-08 01:41:49.618324040 +0100 +@@ -79,7 +79,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) /* I/O Permissions section */ /***************************************************************************/ @@ -9,7 +9,7 @@ volatile unsigned char *ioBase = NULL; #ifndef __NR_pciconfig_iobase -@@ -484,7 +484,11 @@ static Bool +@@ -90,7 +90,11 @@ static Bool hwEnableIO(void) { int fd; |