X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Fxorg%2Fxserver%2Fxorg-server%2FMakefile;h=41a9a808b6494b65ff7f617293f442ae7162a110;hp=ed0b5de0e8ba4ec51f2d44cdc21fa04c6c3c74db;hb=e784605f89f1552e4812bb010cf15f2a89a94f9d;hpb=49217f0097bcb5e713c0fee4762c18345d032eb9

diff --git a/Xorg/xorg/xserver/xorg-server/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile
index ed0b5de0e8..41a9a808b6 100644
--- a/Xorg/xorg/xserver/xorg-server/Makefile
+++ b/Xorg/xorg/xserver/xorg-server/Makefile
@@ -1,135 +1,56 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xorg-server
+PKG_VERSION:=1.7.1
 PKG_RELEASE:=1
-PKG_VERSION:=1.5.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/xorg-server-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
-                   xextproto xproto scrnsaverproto bigreqsproto resourceproto \
-                   fontsproto inputproto kbproto videoproto resourceproto \
-                   xf86dgaproto
-
-include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/include/X11/GL \
-	-I$(STAGING_DIR)/usr/include/X11/dri/ \
-	-I$(STAGING_DIR)/usr/include/X11/ \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS+= \
-	--disable-aiglx \
-	--disable-glx-tls \
-	--disable-dga \
-	--disable-xdmcp \
-	--disable-xdm-auth-1 \
-	--disable-config-hal \
-	--disable-xf86misc \
-	--disable-xf86vidmode \
-	--disable-xf86bigfont \
-	--disable-xorgcfg \
-	--disable-xkb \
-	--disable-xnest \
-	--disable-xquartz \
-	--disable-xwin \
-	--disable-x11app \
-	--disable-xsdl \
-	--disable-xfake \
-	--disable-install-setuid \
-	--disable-kbd_mode \
-	--disable-xvfb \
-	--disable-xevie \
-	--disable-xprint \
-	--disable-xtrap \
-	--disable-dmx \
-	--disable-glx \
-	--enable-builtin-fonts \
-	--with-default-font-path=built-ins \
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1
 
-CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
+				   xextproto xproto scrnsaverproto bigreqsproto resourceproto \
+				   fontsproto inputproto kbproto videoproto resourceproto \
+				   compositeproto xf86dgaproto xtrans xf86driproto dri2proto
 
-#FIXME: make full blowed xorg-xserver work
+PKG_INSTALL:=1
+PKG_FIXUP:=libtool
 
-#DEPENDS_SERVER:=+calibrateproto \
-#		+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 \
-#		+xf86vidmodeproto \
-#		+xf86dgaproto \
-#		+trapproto \
-#		+xineramaproto \
-#		+evieext \
-#		+libxkbfile \
-#		+libXt \
-#		+libSM \
-#		+libxkbui \
-#		+libXxf86misc \
-#		+libXxf86vm \
-#		+libXaw \
-#		+libXmu \
-#		+libXpm \
-#		+libnotimpl \
-#		+Mesa \
-#		+pixman \
-#		@DISPLAY_SUPPORT
+PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_xserver-xorg CONFIG_PACKAGE_xserver-common
 
-define Package/xserver-common/config
-	source "$(SOURCE)/Config.in"
-endef
+include $(INCLUDE_DIR)/package.mk
 
 X_CONFIG=generic
 ifeq ($(CONFIG_TARGET_olpc),y)
   X_CONFIG=olpc
 endif
-ifeq ($(CONFIG_TARGET_om_gta02),y)
+ifeq ($(CONFIG_TARGET_s3c24xx),y)
   X_CONFIG=om_gta02
 endif
 
 define Package/xorg/Default
-  PROVIDES:=xserver
   SECTION:=xorg-server
   CATEGORY:=Xorg
   SUBMENU:=server
+  DEPENDS:=@!avr32
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Package/xserver/Default
+define Package/xserver-xorg
 $(call Package/xorg/Default)
+  PROVIDES:=xserver
+  TITLE:=Xorg xserver
   DEPENDS:=+xserver-common \
   +libpthread \
-  +xtrans \
+  +xkbcomp \
   +libxkbfile \
   +libXfont \
   +libXau \
@@ -138,49 +59,9 @@ $(call Package/xorg/Default)
   +pixman \
   +libopenssl \
   +libpciaccess \
-  @DISPLAY_SUPPORT
-endef
-
-define Package/xserver-xorg
-$(call Package/xserver/Default)
-  PROVIDES:=xserver
-  TITLE:=Xorg xserver
-  DEPENDS+=+libdrm \
-  +xf86driproto \
+  +libdrm \
   +libgl-mesa \
-  +xineramaproto
-endef
-
-define Package/xserver-kdrive/Default
-$(call Package/xserver/Default)
-  DEPENDS+=+X_TSLIB:tslib \
-  +X_DRI:xf86driproto \
-  +X_DRI:libdrm \
-  +X_XCALIBRATE:calibrateproto \
-  +X_COMPOSITE:compositeproto \
-  +X_XINERAMA:xineramaproto
-endef
-
-define Package/xserver-kdrive-xvesa
-$(call Package/xserver-kdrive/Default)
-  TITLE:=Kdrive vesa xserver
-  DEPENDS+=@TARGET_x86
-endef
-
-define Package/xserver-kdrive-xfbdev
-$(call Package/xserver-kdrive/Default)
-  TITLE:=Kdrive framebuffer xserver
-endef
-
-define Package/xserver-kdrive-xephyr
-$(call Package/xserver-kdrive/Default)
-  TITLE:=Kdrive ephyr xserver
-endef
-
-define Package/xserver-xorg-config
-$(call Package/xorg/Default)
-  TITLE:=Xorg server configuration tools
-  DEPENDS:=xserver-xorg
+  @DISPLAY_SUPPORT
 endef
 
 define Package/xserver-common
@@ -190,63 +71,74 @@ endef
 
 define Build/Configure
 	$(call Build/Configure/Default, \
-		$(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --enable-dri,--disable-xorg --disable-dri) \
-		$(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \
-			--enable-kdrive-vesa, \
-			--disable-kdrive-vesa) \
-		$(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \
-			--enable-xfbdev, \
-			--disable-xfbdev) \
-		$(if $(CONFIG_PACKAGE_xserver-kdrive-xephyr), \
-			--enable-xephyr, \
-			--disable-xephyr) \
-		$(if $(CONFIG_X_TSLIB),--enable-tslib,--disable-tslib) \
-		$(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \
-		$(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \
-		$(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \
+		--disable-dependency-tracking \
+		--disable-debug \
+		--disable-unit-tests \
+		--disable-builddocs \
+		--disable-glx-tls \
+		--disable-composite \
+		--disable-shm \
+		--disable-xres \
+		--disable-record \
+		--enable-xv \
+		--enable-xvmc \
+		--disable-dga \
+		--disable-screensaver \
+		--disable-xdmcp \
+		--disable-xdm-auth-1 \
+		--disable-glx \
+		--enable-dri \
+		--enable-dri2 \
+		--disable-xinerama \
+		--disable-xf86vidmode \
+		--disable-xace \
+		--disable-xselinux \
+		--disable-xsecurity \
+		--disable-xcalibrate \
+		--disable-tslib \
+		--disable-multibuffer \
+		--disable-dbe \
+		--disable-xf86bigfont \
+		--enable-dpms \
+		--disable-config-dbus \
+		--disable-config-hal \
+		--disable-xfree86-utils \
+		--disable-xaa \
+		--enable-vgahw \
+		--disable-vbe \
+		--enable-int10-module \
+		--enable-xorg \
+		--disable-dmx \
+		--disable-xvfb \
+		--disable-xnest \
+		--disable-xquartz \
+		--disable-standalone-xpbproxy \
+		--disable-xwin \
+		--disable-kdrive \
+		--disable-xfake \
+		--disable-xfbdev \
+		--disable-installsetuid \
+		--disable-secure-rpc \
+		--enable-silent-rules \
+		--disable-shave \
 	)
 endef
 
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install
-endef
-
 define Package/xserver-common/install
-	$(INSTALL_DIR) $(1)/etc/{init.d,config}
+	$(INSTALL_DIR) $(1)/etc/{init.d,config,X11}
 	$(INSTALL_BIN) \
 		./files/x.init \
 		$(1)/etc/init.d/x11
-	$(if $(X_CONFIG), \
+	$(INSTALL_DATA) ./files/tmp/x11.uci \
+		$(1)/etc/config/x11
+	test -f ./files/config.xorg/$(X_CONFIG) && \
 		$(INSTALL_DATA) \
-			./files/config/$(X_CONFIG) \
-			$(1)/etc/config/x11 \
-	)
-
-	$(INSTALL_DIR) $(1)/usr/lib/xorg
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/xorg/protocol.txt \
-		$(1)/usr/lib/xorg/
-endef
-
-define Package/xserver-kdrive-xfbdev/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/Xfbdev \
-		$(1)/usr/bin/
-endef
-
-define Package/xserver-kdrive-xvesa/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/Xvesa \
-		$(1)/usr/bin/
-endef
-
-define Package/xserver-kdrive-xephyr/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/Xephyr \
-		$(1)/usr/bin/
+			./files/config.xorg/$(X_CONFIG) \
+			$(1)/etc/X11/xorg.conf
+#	test -f ./files/config.uci/$(X_CONFIG) && \
+#		$(INSTALL_DATA) \
+#			./files/config.uci/$(X_CONFIG) \
+#			$(1)/etc/config/x11
 endef
 
 define Package/xserver-xorg/install
@@ -255,28 +147,18 @@ define Package/xserver-xorg/install
 		$(PKG_INSTALL_DIR)/usr/bin/Xorg \
 		$(1)/usr/bin/
 
-	$(INSTALL_DIR) $(1)/usr/lib/X11
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/X11/* \
-		$(1)/usr/lib/X11/
-
 	$(INSTALL_DIR) $(1)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia}
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/lib/xorg/modules/*.so \
 		$(1)/usr/lib/xorg/modules/
 
-	$(for dir,extensions fonts linux multimedia, \
+	$(foreach d,extensions fonts linux multimedia, \
 		$(INSTALL_DATA) \
 			$(PKG_INSTALL_DIR)/usr/lib/xorg/modules/$(d)/*.so \
-			$(1)/usr/lib/xorg/modules/$(d) \
+			$(1)/usr/lib/xorg/modules/$(d)/; \
 	)
 endef
 
-define Packages/xorg-server-config/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/share/aclocal/
 	$(INSTALL_DATA) \
@@ -287,17 +169,19 @@ define Build/InstallDev
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
 		$(1)/usr/lib/pkgconfig/
+
 	$(if $(CONFIG_PACKAGE_xserver-xorg), \
 		$(INSTALL_DIR) $(1)/usr/include/xorg; \
 		$(INSTALL_DATA) \
 			$(PKG_INSTALL_DIR)/usr/include/xorg/*.h \
 			$(1)/usr/include/xorg/; \
 	)
+	$(INSTALL_DIR) $(1)/mk
+	$(INSTALL_DATA) \
+		./files/xorg-driver.mk \
+		$(1)/mk/
+	$(SED) 's,@VERSION@,$(PKG_VERSION),' $(1)/mk/xorg-driver.mk
 endef
 
 $(eval $(call BuildPackage,xserver-common))
 $(eval $(call BuildPackage,xserver-xorg))
-$(eval $(call BuildPackage,xserver-kdrive-xvesa))
-$(eval $(call BuildPackage,xserver-kdrive-xfbdev))
-$(eval $(call BuildPackage,xserver-kdrive-xephyr))
-$(eval $(call BuildPackage,xserver-xorg-config))