adding xbitmaps adding missing dependency setting green background as default

SVN-Revision: 10234

diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile
index e8b8b4e68b4983f22a18eb29a5ed2a11dfa8c193..bc4f0e946c3dd23f1d686c85ad9043cab7c6f20a 100644 (file)
--- a/XOrg/app/xsetroot/Makefile
+++ b/XOrg/app/xsetroot/Makefile
@@ -27,7 +27,7 @@ define Package/xsetroot
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
+  DEPENDS:=${_DEPEND} +xbitmaps @DISPLAY_SUPPORT
   TITLE:=xsetroot
   URL:=http://xorg.freedesktop.org/
 endef

diff --git a/XOrg/data/xbitmaps/Makefile b/XOrg/data/xbitmaps/Makefile
new file mode 100644 (file)
index 0000000..fdcb95a
--- /dev/null
+++ b/XOrg/data/xbitmaps/Makefile
@@ -0,0 +1,62 @@
+# 
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_BASE_NAME:=xbitmaps
+PKG_NAME:=xbitmaps
+PKG_RELEASE:=1
+PKG_VERSION:=X11R7.0-1.0.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/data/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+
+#PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xbitmaps
+  SECTION:=xorg-data
+  CATEGORY:=Xorg
+  SUBMENU:=data
+  DEPENDS:=@DISPLAY_SUPPORT
+  TITLE:=xbitmaps
+  URL:=http://xorg.freedesktop.org/
+endef
+
+define Build/InstallDev
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+endef
+
+#ifeq (libXext,libX11)
+# CONFIGURE_ARGS_XTRA=--without-xcb
+#endif
+
+define Build/Compile
+       $(call $(PKG_NAME)/Compile)
+       make -C $(PKG_BUILD_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+endef
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
+       if [ -x $(CONFIGURE_CMD) ]; then \
+               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+               $(CONFIGURE_VARS) \
+               $(CONFIGURE_CMD) \
+               $(CONFIGURE_ARGS_XTRA) \
+               $(CONFIGURE_ARGS) ; \
+       fi \
+       )
+endef
+
+define Package/xbitmaps/install/Default
+       $(INSTALL_DIR) $(1)/usr/include/X11/bitmaps
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* $(1)/usr/include/X11/bitmaps
+endef
+
+$(eval $(call BuildPackage,xbitmaps))

diff --git a/XOrg/meta/xorg-server-essentials/files/xinitrc b/XOrg/meta/xorg-server-essentials/files/xinitrc
index 74b22ddccf27c68e23d193d4ba4abaabe5ff87c6..c736374a8d3a8cd8c7eed8223c9668150d4bdf1e 100644 (file)
--- a/XOrg/meta/xorg-server-essentials/files/xinitrc
+++ b/XOrg/meta/xorg-server-essentials/files/xinitrc
@@ -1,3 +1,8 @@
+#setting green backgroun, if xsetroot exists
+if [ -x `which xsetroot` ]; then
+       xsetroot -solid green
+fi
+
 BKGD_IMAGE_PATH=/usr/share/X11/bkgd-images/
 if [ -x `which Esetroot` ]; then
        Esetroot -scale ${BKGD_IMAGE_PATH}/default.png