diff options
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 2879cafea..4efbf78a9 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.16 PKG_RELEASE:= 1 -PKG_HASH:= 782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755 +PKG_HASH:= b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970 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 font-util-host PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -30,7 +31,10 @@ PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_G PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE PKGFD_WITH_KDRIVE:= build kdrive xfbdev server -PKG_CHOICES_XORG_SERVER:= WITH_LIBRESSL WITH_GCRYPT +PKG_CHOICES_XORG_SERVER:= WITH_OPENSSL WITH_LIBRESSL WITH_GCRYPT +PKGCD_WITH_OPENSSL:= use openssl crypto for sha1 +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl crypto for sha1 PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl @@ -44,6 +48,12 @@ $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE} TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t +AUTOTOOL_STYLE:= autoreconf + +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-sha1=libcrypto +endif + ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt endif @@ -78,7 +88,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 +117,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 |