diff options
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 11 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-include_misc_h | 59 |
3 files changed, 28 insertions, 53 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 2879cafea..9c6c12ffc 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 21.1.1 +PKG_VERSION:= 21.1.6 PKG_RELEASE:= 1 -PKG_HASH:= 782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755 +PKG_HASH:= 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile libxcvt @@ -14,12 +14,13 @@ PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm PKG_DEPENDS+= libxshmfence libfreetype libfontenc libpciaccess +PKG_DEPENDS+= libepoxy PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont2 pixman PKG_BUILDDEP+= libpciaccess xf86dgaproto recordproto dri3proto PKG_BUILDDEP+= xineramaproto presentproto xf86driproto glproto mesa -PKG_BUILDDEP+= xorgproto libxcvt libdrm +PKG_BUILDDEP+= xorgproto libxcvt libdrm libepoxy PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -78,7 +79,9 @@ CONFIGURE_ARGS+= --enable-dga \ --enable-dri2 \ --enable-dri3 \ --enable-glx \ + --enable-glamor \ --with-xkb-output=/tmp \ + --with-fontrootdir=/usr/share/fonts/X11/ \ --with-vendor-web="$(ADK_VENDOR_URL)" ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y) @@ -105,10 +108,8 @@ xorg-server-install: $(IDIR_XORG_SERVER)/usr/lib/xorg/modules ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/drivers -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions -endif ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) ${CP} ./files/xorg.conf.lemote-yeelong \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf 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-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. |