include $(TOPDIR)/rules.mk
-PKG_NAME:=xorg-server-X11R7.2
+PKG_NAME:=xorg-server
PKG_RELEASE:=1
-PKG_VERSION:=1.2.0
+PKG_VERSION:=X11R7.2-1.2.0
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/xserver/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/server/xorg-server-X11R7.2-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/server/xorg-server-$(PKG_VERSION)/
include $(INCLUDE_DIR)/package.mk
CONFIGURE_ARGS+=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(CONFIGURE_ARGS_KDRIVE))
DEPENDS_SERVER:=+calibrateproto \
- +compositeproto-X11R7.1 \
- +damageproto-X11R7.0 \
- +fixesproto-X11R7.1 \
- +recordproto-X11R7.0 \
- +resourceproto-X11R7.0 \
- +scrnsaverproto-X11R7.1 \
- +videoproto-X11R7.0 \
- +xextproto-X11R7.0 \
- +xproto-X11R7.2 \
- +libXext-X11R7.2 \
- +libXdmcp-X11R7.2 \
- +libXfont-X11R7.2 \
- +libXrandr-X11R7.2 \
- +xtrans-X11R7.2 \
- +libX11-X11R7.2 \
- +glproto-X11R7.2 \
- +xf86driproto-X11R7.0 \
- +applewmproto-X11R7.0 \
- +dmxproto-X11R7.0 \
- +printproto-X11R7.0 \
- +windowswmproto-X11R7.0 \
- +xf86rushproto-X11R7.0 \
- +xproxymanagementprotocol-X11R7.0 \
+ +compositeproto \
+ +damageproto \
+ +fixesproto \
+ +recordproto \
+ +resourceproto \
+ +scrnsaverproto \
+ +videoproto \
+ +xextproto \
+ +xproto \
+ +libXext \
+ +libXdmcp \
+ +libXfont \
+ +libXrandr \
+ +xtrans \
+ +libX11 \
+ +glproto \
+ +xf86driproto \
+ +applewmproto \
+ +dmxproto \
+ +printproto \
+ +windowswmproto \
+ +xf86rushproto \
+ +xproxymanagementprotocol \
+libdrm \
- +xf86miscproto-X11R7.0 \
- +xf86vidmodeproto-X11R7.0 \
- +xf86dgaproto-X11R7.0 \
- +trapproto-X11R7.0 \
- +xineramaproto-X11R7.0 \
- +evieext-X11R7.0 \
- +libxkbfile-X11R7.2 \
- +libXt-X11R7.2 \
- +libSM-X11R7.2 \
- +libxkbui-X11R7.1 \
- +libXxf86misc-X11R7.1 \
- +libXxf86vm-X11R7.1 \
- +libXaw-X11R7.1 \
- +libXmu-X11R7.2 \
- +libXpm-X11R7.2 \
+ +xf86miscproto \
+ +xf86vidmodeproto \
+ +xf86dgaproto \
+ +trapproto \
+ +xineramaproto \
+ +evieext \
+ +libxkbfile \
+ +libXt \
+ +libSM \
+ +libxkbui \
+ +libXxf86misc \
+ +libXxf86vm \
+ +libXaw \
+ +libXmu \
+ +libXpm \
+libnotimpl \
+Mesa \
- @TARGET_x86
+ @DISPLAY_SUPPORT
DEPENDS_KDRIVE:=+calibrateproto \
- +compositeproto-X11R7.1 \
- +damageproto-X11R7.0 \
- +fixesproto-X11R7.1 \
- +recordproto-X11R7.0 \
- +resourceproto-X11R7.0 \
- +scrnsaverproto-X11R7.1 \
- +videoproto-X11R7.0 \
- +xextproto-X11R7.0 \
- +xproto-X11R7.2 \
- +libXext-X11R7.2 \
- +libXdmcp-X11R7.2 \
- +libXfont-X11R7.2 \
- +libXrandr-X11R7.2 \
- +xtrans-X11R7.2 \
- +libX11-X11R7.2 \
- @TARGET_x86
-
-define Package/xorg-server-X11R7.2/config
+ +compositeproto \
+ +damageproto \
+ +fixesproto \
+ +recordproto \
+ +resourceproto \
+ +scrnsaverproto \
+ +videoproto \
+ +xextproto \
+ +xproto \
+ +libXext \
+ +libXdmcp \
+ +libXfont \
+ +libXrandr \
+ +xtrans \
+ +libX11 \
+ @DISPLAY_SUPPORT
+
+
+ifneq ($(CONFIG_TARGET_olpc),)
+ XORG_CONFIG_FILE=xorg-olpc.conf
+else
+ XORG_CONFIG_FILE=xorg.conf
+endif
+
+define Package/xorg-server/config
config XORG_BUILD_KDRIVE
bool "Build kdrive instead of xserver"
- depends PACKAGE_xorg-server-X11R7.2
+ depends PACKAGE_xorg-server
endef
-define Package/xorg-server-X11R7.2/Default
+define Package/xorg-server/Default
SECTION:=xorg-server
CATEGORY:=Xorg
URL:=http://xorg.freedesktop.org/
endef
-define Package/xorg-server-X11R7.2
-$(call Package/xorg-server-X11R7.2/Default)
+define Package/xorg-server
+$(call Package/xorg-server/Default)
TITLE:=Xorg server
MENU:=1
DEPENDS:=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(DEPENDS_KDRIVE), $(DEPENDS_SERVER))
endef
-define Package/xorg-server-X11R7.2-config
-$(call Package/xorg-server-X11R7.2/Default)
+define Package/xorg-server-config
+$(call Package/xorg-server/Default)
TITLE:=Xorg server configuration tools
- DEPENDS:=xorg-server-X11R7.2
+ DEPENDS:=xorg-server
endef
define Build/Configure
endef
-define Package/xorg-server-X11R7.2/install
+define Package/xorg-server/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/
- cd $(1)/usr/bin; ln -s Xorg X
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/
+ cd $(1)/usr/bin; ln -sf Xorg X
$(INSTALL_DIR) $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
$(INSTALL_DIR) $(1)/usr/lib/xserver
rm -rf $(1)/usr/share/X11 $(1)/usr/lib/X11/xserver
$(INSTALL_DIR) $(1)/var/log/
$(INSTALL_DIR) $(1)/etc/X11/
- $(CP) files/xorg.conf $(1)/etc/X11/
+ $(CP) files/$(XORG_CONFIG_FILE) $(1)/etc/X11/xorg.conf
endef
-define Packages/xorg-server-X11R7.2-config/install
+define Packages/xorg-server-config/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
endef
define Build/InstallDev
- $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
- $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(1)/usr/lib/pkgconfig/
endef
-$(eval $(call BuildPackage,xorg-server-X11R7.2))
-$(eval $(call BuildPackage,xorg-server-X11R7.2-config))
+$(eval $(call BuildPackage,xorg-server))
+$(eval $(call BuildPackage,xorg-server-config))