diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:44:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:44:59 +0200 |
| commit | b803209ad0f1f198072695109b30a726e0411084 (patch) | |
| tree | 3d5db865a71f72457d05fbe37cb25e96d67484f8 /package/xorg-server/Makefile | |
| parent | faf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff) | |
fat commit to add support for firefox on ibm x40 via usb stick
- add support for IBM X40 notebook
- add USB boot support
- add firefox package
- update and add all dependencies for firefox
- add xorg intel driver
- add dri support for xorg
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index d3fd19175..e81d4b271 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -17,6 +17,10 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ scrnsaverproto resourceproto fontsproto videoproto \ compositeproto evieext libxkbfile libXfont pixman \ libpciaccess openssl xf86dgaproto +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) +PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib +PKG_DEPENDS+= xf86driproto glproto dri2proto mesalib +endif PKG_URL:= http://www.x.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ @@ -24,6 +28,9 @@ PKG_TARGET_DEPENDS:= !foxboard CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA +PKG_FLAVOURS:= WITH_DRI +PKGFD_WITH_DRI:= enable DRI/DRI2 support + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -38,8 +45,6 @@ CONFIGURE_ARGS+= \ --disable-aiglx \ --disable-config-hal \ --disable-dpms \ - --disable-dri \ - --disable-dri2 \ --disable-glx \ --disable-xace \ --disable-xephyr \ @@ -58,6 +63,12 @@ CONFIGURE_ARGS+= \ --with-os-vendor=OpenADK \ --with-vendor-web="http://openadk.org" +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) +CONFIGURE_ARGS+= --enable-dri --enable-dri2 +else +CONFIGURE_ARGS+= --disable-dri --disable-dri2 +endif + post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11 $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin @@ -78,5 +89,9 @@ post-install: $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia -$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \ $(IDIR_XORG_SERVER)/etc/X11 +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 include ${TOPDIR}/mk/pkg-bottom.mk |