diff options
Diffstat (limited to 'package/xorg-server/patches')
-rw-r--r-- | package/xorg-server/patches/patch-configure | 11 | ||||
-rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_common_compiler_h | 69 | ||||
-rw-r--r-- | package/xorg-server/patches/patch-include_misc_h | 13 |
3 files changed, 24 insertions, 69 deletions
diff --git a/package/xorg-server/patches/patch-configure b/package/xorg-server/patches/patch-configure new file mode 100644 index 000000000..378c27c1c --- /dev/null +++ b/package/xorg-server/patches/patch-configure @@ -0,0 +1,11 @@ +--- xorg-server-21.1.5.orig/configure 2022-12-14 03:25:26.000000000 +0100 ++++ xorg-server-21.1.5/configure 2022-12-31 10:38:30.017910171 +0100 +@@ -29281,7 +29281,7 @@ printf "%s\n" "#define BASE_FONT_PATH \" + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE + +-dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` ++dridriverdir=/usr/lib/dri + + prefix_NONE= + exec_prefix_NONE= diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h deleted file mode 100644 index 824744f53..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ /dev/null @@ -1,69 +0,0 @@ -from alpinelinux - ---- 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 - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) - { -- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outw(unsigned PORT_SIZE port, unsigned short val) - { -- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outl(unsigned PORT_SIZE port, unsigned int val) - { -- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - -@@ -552,21 +552,21 @@ static __inline__ unsigned int - inb(unsigned PORT_SIZE port) - { - return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inw(unsigned PORT_SIZE port) - { - return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inl(unsigned PORT_SIZE port) - { - return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - #if defined(__mips__) -@@ -758,7 +758,7 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/package/xorg-server/patches/patch-include_misc_h b/package/xorg-server/patches/patch-include_misc_h new file mode 100644 index 000000000..30cc9a44d --- /dev/null +++ b/package/xorg-server/patches/patch-include_misc_h @@ -0,0 +1,13 @@ +--- xorg-server-21.1.5.orig/include/misc.h 2022-12-14 03:25:18.000000000 +0100 ++++ xorg-server-21.1.5/include/misc.h 2023-01-01 08:13:51.736653806 +0100 +@@ -187,6 +187,10 @@ typedef struct _xReq *xReqPtr; + #endif + #endif + ++#undef bswap_16 ++#undef bswap_32 ++#undef bswap_64 ++ + /** + * Calculate the number of bytes needed to hold bits. + * @param bits The minimum number of bits needed. |