diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2022-12-31 15:01:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2022-12-31 15:01:25 +0100 |
| commit | ef49ccd5d9f1dddcb68539a9a1d3b4b37e64a6bf (patch) | |
| tree | e9124c672265b020d790f198171c792b19ab27d1 /package/xorg-server | |
| parent | a31858d4fc0a4268ec9334ba4ccb47aed953116b (diff) | |
xorg-server: update to 21.1.5
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 10 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-configure | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 2879cafea..66ef40b77 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.5 PKG_RELEASE:= 1 -PKG_HASH:= 782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755 +PKG_HASH:= 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 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,6 +79,7 @@ CONFIGURE_ARGS+= --enable-dga \ --enable-dri2 \ --enable-dri3 \ --enable-glx \ + --enable-glamor \ --with-xkb-output=/tmp \ --with-vendor-web="$(ADK_VENDOR_URL)" @@ -105,10 +107,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= |