From 0b8ade911d757a373faba48bd3454858dccc756b Mon Sep 17 00:00:00 2001
From: ryd <ryd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 24 Jan 2008 02:57:44 +0000
Subject: [PATCH] adding xbitmaps adding missing dependency setting green
 background as default

git-svn-id: svn://svn.openwrt.org/openwrt/packages@10234 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 XOrg/app/xsetroot/Makefile                     |  2 +-
 XOrg/data/xbitmaps/Makefile                    | 62 ++++++++++++++++++++++++++
 XOrg/meta/xorg-server-essentials/files/xinitrc |  5 +++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 XOrg/data/xbitmaps/Makefile

diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile
index e8b8b4e68..bc4f0e946 100644
--- 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
index 000000000..fdcb95a92
--- /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 74b22ddcc..c736374a8 100644
--- 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
-- 
2.11.0