diff options
Diffstat (limited to 'package/xorg-server/patches')
3 files changed, 33 insertions, 48 deletions
diff --git a/package/xorg-server/patches/patch-configure b/package/xorg-server/patches/patch-configure new file mode 100644 index 000000000..f7b7beab0 --- /dev/null +++ b/package/xorg-server/patches/patch-configure @@ -0,0 +1,11 @@ +--- xorg-server-21.1.16.orig/configure 2025-02-25 18:56:12.000000000 +0000 ++++ xorg-server-21.1.16/configure 2025-04-19 02:08:40.369203750 +0000 +@@ -30272,7 +30272,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_drivers_modesetting_Makefile_am b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am new file mode 100644 index 000000000..c8cf55563 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am @@ -0,0 +1,11 @@ +--- xorg-server-21.1.16.orig/hw/xfree86/drivers/modesetting/Makefile.am 2025-02-25 18:56:05.000000000 +0000 ++++ xorg-server-21.1.16/hw/xfree86/drivers/modesetting/Makefile.am 2025-04-24 17:19:31.290883875 +0000 +@@ -41,7 +41,7 @@ AM_CPPFLAGS = \ + + modesetting_drv_la_LTLIBRARIES = modesetting_drv.la + modesetting_drv_la_LDFLAGS = -module -avoid-version +-modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) ++modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) $(GBM_LIBS) + modesetting_drv_ladir = @moduledir@/drivers + + modesetting_drv_la_SOURCES = \ diff --git a/package/xorg-server/patches/patch-include_misc_h b/package/xorg-server/patches/patch-include_misc_h index 820df214a..30cc9a44d 100644 --- a/package/xorg-server/patches/patch-include_misc_h +++ b/package/xorg-server/patches/patch-include_misc_h @@ -1,50 +1,13 @@ ---- xorg-server-21.1.0.orig/include/misc.h 2021-10-27 12:47:08.000000000 +0200 -+++ xorg-server-21.1.0/include/misc.h 2021-11-12 22:48:04.777225906 +0100 -@@ -298,33 +298,12 @@ __builtin_constant_p(int x) - } +--- 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 --static inline uint64_t --bswap_64(uint64_t x) --{ -- return (((x & 0xFF00000000000000ull) >> 56) | -- ((x & 0x00FF000000000000ull) >> 40) | -- ((x & 0x0000FF0000000000ull) >> 24) | -- ((x & 0x000000FF00000000ull) >> 8) | -- ((x & 0x00000000FF000000ull) << 8) | -- ((x & 0x0000000000FF0000ull) << 24) | -- ((x & 0x000000000000FF00ull) << 40) | -- ((x & 0x00000000000000FFull) << 56)); --} -- - #define swapll(x) do { \ - if (sizeof(*(x)) != 8) \ - wrong_size(); \ - *(x) = bswap_64(*(x)); \ - } while (0) - --static inline uint32_t --bswap_32(uint32_t x) --{ -- return (((x & 0xFF000000) >> 24) | -- ((x & 0x00FF0000) >> 8) | -- ((x & 0x0000FF00) << 8) | -- ((x & 0x000000FF) << 24)); --} - - static inline Bool - checked_int64_add(int64_t *out, int64_t a, int64_t b) -@@ -361,13 +340,6 @@ checked_int64_subtract(int64_t *out, int - *(x) = bswap_32(*(x)); \ - } while (0) - --static inline uint16_t --bswap_16(uint16_t x) --{ -- return (((x & 0xFF00) >> 8) | -- ((x & 0x00FF) << 8)); --} -- - #define swaps(x) do { \ - if (sizeof(*(x)) != 2) \ - wrong_size(); \ ++#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. |