diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:40:46 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:40:46 +0100 |
| commit | cf53aff5d6feebf06953794b03b1793cda3e2f77 (patch) | |
| tree | 7007ec3309cf29392ab978fb6f2519a86678c966 /package/xorg-server/Makefile | |
| parent | 093c542e059b733e0207ce072679c2267339b860 (diff) | |
| parent | bc561e500e22bc9d953fd9a80144f80295a4cbbd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
update Xorg / Mesa
Conflicts:
TODO
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index fef274746..e766b685d 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,19 +4,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.12.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= a95c896fbe8322c3c8d518a13eb74c7a +PKG_VERSION:= 1.15.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= faf04f1213f9a476997a774254b3abce PKG_DESCR:= Xorg server PKG_SECTION:= x11/server PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc librt +PKG_DEPENDS+= libxshmfence libfreetype libfontenc PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto +PKG_BUILDDEP+= xineramaproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 @@ -28,7 +30,7 @@ PKG_ARCH_DEPENDS:= !m68k PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support -PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib +PKGFB_WITH_DRI:= xf86driproto glproto MesaLib PKGFD_WITH_KDRIVE:= Build Kdrive Xfbdev server PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO @@ -57,9 +59,10 @@ CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= --enable-dga \ --enable-xorg \ --enable-xv \ - --enable-xaa \ --enable-vgahw \ --enable-dpms \ + --enable-xinerama \ + --disable-docs \ --disable-aiglx \ --disable-config-hal \ --disable-config-udev \ @@ -68,7 +71,6 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xf86bigfont \ --disable-xf86vidmode \ --disable-xfake \ - --disable-xinerama \ --disable-xnest \ --disable-xselinux \ --disable-xcsecurity \ @@ -85,9 +87,9 @@ CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev endif ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-glx +CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-dri3 --enable-glx else -CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-glx +CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-dri3 --disable-glx endif ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) @@ -117,10 +119,6 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) ${CP} ./files/xorg.conf.sharp-zaurus \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) - ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \ - $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions -endif # add m4 file to host directory $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ |