diff options
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 9c6c12ffc..a4b5ad899 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.6 +PKG_VERSION:= 21.1.18 PKG_RELEASE:= 1 -PKG_HASH:= 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 +PKG_HASH:= c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile libxcvt @@ -14,13 +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_DEPENDS+= libepoxy libdbus 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 libepoxy +PKG_BUILDDEP+= xorgproto libxcvt libdrm libepoxy font-util-host dbus PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -28,10 +28,10 @@ PKG_OPTS:= dev PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC -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 +44,13 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t +TARGET_LDFLAGS+= -latomic -lstdc++ + +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 @@ -60,10 +67,10 @@ CONFIGURE_ARGS+= --enable-dga \ --enable-vgahw \ --enable-dpms \ --enable-xinerama \ + --enable-config-udev \ + --disable-debug \ --disable-docs \ - --disable-glamor \ --disable-config-hal \ - --disable-config-udev \ --disable-xace \ --disable-xephyr \ --disable-xf86bigfont \ @@ -75,6 +82,8 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xvmc \ --disable-selective-werror \ --disable-strict-compilation \ + --disable-systemd-logind \ + --without-systemd-daemon \ --enable-dri \ --enable-dri2 \ --enable-dri3 \ @@ -84,12 +93,6 @@ CONFIGURE_ARGS+= --enable-dga \ --with-fontrootdir=/usr/share/fonts/X11/ \ --with-vendor-web="$(ADK_VENDOR_URL)" -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y) -CONFIGURE_ARGS+= --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev -else -CONFIGURE_ARGS+= --disable-kdrive -endif - ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif @@ -118,6 +121,10 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) ${CP} ./files/xorg.conf.sharp-zaurus \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif +ifeq (${ADK_TARGET_SYSTEM_RASPBERRY_PI5},y) + ${CP} ./files/xorg.conf.raspberry-pi5 \ + $(IDIR_XORG_SERVER)/etc/X11/xorg.conf +endif # add m4 file to host directory $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ |