Packages: add DirectFB, libpng, libjpeg, pkgconfig

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

3 files changed, 113 insertions, 8 deletions

diff --git a/mk/packages.mk b/mk/packages.mk
index 370b0da..83b0d47 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -22,8 +22,12 @@
 # \date         May 2009
 ################################################################################
 
-
+################################################################################
 #################### Common include for target and host ########################
+################################################################################
+
+include $(EMBTK_ROOT)/mk/zlib.mk
+include $(EMBTK_ROOT)/mk/lzo.mk
 
 #gdb
 ifeq ($(CONFIG_EMBTK_HAVE_GDB),y)
@@ -31,7 +35,9 @@ include $(EMBTK_ROOT)/mk/termcap.mk
 include $(EMBTK_ROOT)/mk/gdb.mk
 endif
 
+################################################################################
 ############################# Packages for TARGET ##############################
+################################################################################
 
 #Busybox
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_BB),y)
@@ -49,26 +55,65 @@ ifeq ($(CONFIG_EMBTK_HAVE_GDBSERVER_ON_TARGET),y)
 ROOTFS_COMPONENTS += gdbserver_target_install
 endif
 
+#strace
+ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_STRACE),y)
+include $(EMBTK_ROOT)/mk/strace.mk
+ROOTFS_COMPONENTS += strace_install
+endif
+
+######################## Flash manipulation tools ##############################
+
 #mtd-utils
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS),y)
 ROOTFS_COMPONENTS += mtd-utils_target_install
 ROOTFS_COMPONENTS_CLEAN += mtd-utils_target_clean
 endif
 
-#strace
-ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_STRACE),y)
-include $(EMBTK_ROOT)/mk/strace.mk
-ROOTFS_COMPONENTS += strace_install
+######################## Compression packages ##################################
+
+########################### Graphics packages ##################################
+
+#DirectFB
+ifeq ($(CONFIG_EMBTK_HAVE_DIRECTFB),y)
+include $(EMBTK_ROOT)/packages/graphics/directfb/directfb.mk
+ROOTFS_COMPONENTS += directfb_install
+endif
+
+#FreeType
+ifeq ($(CONFIG_EMBTK_HAVE_FREETYPE),y)
+include $(EMBTK_ROOT)/packages/graphics/freetype/freetype.mk
+ROOTFS_COMPONENTS += freetype_install
+endif
+
+#libjpeg
+ifeq ($(CONFIG_EMBTK_HAVE_LIBJPEG),y)
+include $(EMBTK_ROOT)/packages/graphics/libjpeg/libjpeg.mk
+ROOTFS_COMPONENTS += libjpeg_install
 endif
 
+#libpng
+ifeq ($(CONFIG_EMBTK_HAVE_LIBPNG),y)
+include $(EMBTK_ROOT)/packages/graphics/libpng/libpng.mk
+ROOTFS_COMPONENTS += libpng_install
+endif
+########################## Networking packages #################################
+
+############################ System packages ###################################
+
+########################## Miscellaneous packages ##############################
+
+################################################################################
 ########################## Packages for HOST MACHINE ###########################
+################################################################################
 
 #gdb
 ifeq ($(CONFIG_EMBTK_HAVE_GDB_ON_HOST),y)
 HOSTTOOLS_COMPONENTS += gdb_host_install
 endif
 
+################################################################################
 ########################### Targets for HOST MACHINE ###########################
+################################################################################
 host_packages_build:
 ifeq ($(HOSTTOOLS_COMPONENTS),)
 else
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
new file mode 100644
index 0000000..353647b
--- /dev/null
+++ b/mk/pkgconfig.mk
@@ -0,0 +1,61 @@
+################################################################################
+# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+#
+# This program is free software; you can distribute it and/or modify it
+# under the terms of the GNU General Public License
+# (Version 2 or later) published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+################################################################################
+#
+# \file         pkgconfig.mk
+# \brief	pkgconfig.mk of Embtoolkit
+# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \date         October 2009
+################################################################################
+
+PKGCONFIG_VERSION := 0.23
+PKGCONFIG_SITE := http://pkgconfig.freedesktop.org/releases
+PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz
+PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
+PKGCONFIG_DIR := $(HOSTTOOLS)/usr/local/pkg-config
+PKGCONFIG_BIN := $(PKGCONFIG_DIR)/bin/pkg-config
+
+export PKGCONFIG_BIN
+
+pkgconfig_install: $(PKGCONFIG_BUILD_DIR)/.installed
+
+$(PKGCONFIG_BUILD_DIR)/.installed: download_pkgconfig \
+	$(PKGCONFIG_BUILD_DIR)/.decompressed $(PKGCONFIG_BUILD_DIR)/.configured
+	@$(MAKE) -C $(PKGCONFIG_BUILD_DIR) $(J)
+	@$(MAKE) -C $(PKGCONFIG_BUILD_DIR) install
+	@touch $@
+
+download_pkgconfig:
+	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(PKGCONFIG_PACKAGE) if \
+	necessary...")
+	@test -e $(DOWNLOAD_DIR)/$(PKGCONFIG_PACKAGE) || \
+	wget -O $(DOWNLOAD_DIR)/$(PKGCONFIG_PACKAGE) \
+	$(PKGCONFIG_SITE)/$(PKGCONFIG_PACKAGE)
+
+$(PKGCONFIG_BUILD_DIR)/.decompressed:
+	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(PKGCONFIG_PACKAGE)...")
+	@tar -C $(TOOLS_BUILD) -xzf $(DOWNLOAD_DIR)/$(PKGCONFIG_PACKAGE)
+	@touch $@
+
+$(PKGCONFIG_BUILD_DIR)/.configured:
+	$(call EMBTK_GENERIC_MESSAGE,"Configuring \
+	pkg-config-$(PKGCONFIG_VERSION)...")
+	@cd $(PKGCONFIG_BUILD_DIR); \
+	./configure \
+	--prefix=$(PKGCONFIG_DIR) --build=$(HOST_BUILD) --host=$(HOST_ARCH)
+	@touch $@
+
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 214a24b..f070dba 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -30,7 +30,8 @@ include $(EMBTK_ROOT)/mk/fs.mk
 #host tools in order to build root filesystems: fakeroot and makedevs.
 include $(EMBTK_ROOT)/mk/fakeroot.mk
 include $(EMBTK_ROOT)/mk/makedevs.mk
-ROOTFS_HOSTTOOLS += makedevs_install fakeroot_install
+include $(EMBTK_ROOT)/mk/pkgconfig.mk
+ROOTFS_HOSTTOOLS += makedevs_install fakeroot_install pkgconfig_install
 
 #Does CPIO archive for initramfs selected?
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO),y)
@@ -39,9 +40,7 @@ endif
 
 #Does jffs2 filesystem selected?
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2),y)
-include $(EMBTK_ROOT)/mk/lzo.mk
 include $(EMBTK_ROOT)/mk/mtd-utils.mk
-include $(EMBTK_ROOT)/mk/zlib.mk
 ROOTFS_HOSTTOOLS += mtd-utils_host_install
 ROOTFS_HOSTTOOLS_CLEAN += mtd-utils_host_clean
 FILESYSTEMS += build_jffs2_rootfs