some more additions for gtk+ library porting

Makefile

@@ -132,14 +132,12 @@ allconfig: .prereq_done
 allmodconfig: .prereq_done
 	@${GMAKE_INV} _mconfig W=-o RCONFIG=Config.in
 
-allmoddefconfig: .prereq_done
-	@if [ -z "$(TARGET)" ];then echo "You need to specify a target"; exit 1;fi
-	cp $(TOPDIR)/target/$(TARGET)/default.config $(TOPDIR)/.defconfig
-	@${GMAKE_INV} _mconfig W="-m -o -D .defconfig" RCONFIG=Config.in
-
 package_index: .prereq_done
 	@${GMAKE_INV} package_index
 
+bulk: .prereq_done
+	@${GMAKE_INV} bulk
+
 world: .prereq_done
 	@${GMAKE_INV} world
 

package/Config.in

@@ -392,12 +392,15 @@ menu "Libraries"
 source "package/alsa-lib/Config.in"
 source "package/apr/Config.in"
 source "package/apr-util/Config.in"
+source "package/atk/Config.in"
 source "package/avahi/Config.in.lib"
 source "package/axtls/Config.in.lib"
+source "package/cairo/Config.in"
 source "package/cgilib/Config.in"
 source "package/cxxtools/Config.in"
 source "package/dbus/Config.in"
 source "package/e2fsprogs/Config.in.lib"
+source "package/fontconfig/Config.in"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
 source "package/gtk+/Config.in"
@@ -453,6 +456,7 @@ source "package/libowfat/Config.in"
 source "package/libp11/Config.in"
 source "package/libpcap/Config.in"
 source "package/libpri/Config.in"
+source "package/pango/Config.in"
 source "package/pcre/Config.in"  # libpcre
 source "package/libpng/Config.in"
 source "package/popt/Config.in"  # libpopt
@@ -505,6 +509,7 @@ source "package/libXau/Config.in"
 source "package/libXaw/Config.in"
 source "package/libXmu/Config.in"
 source "package/libXpm/Config.in"
+source "package/libXrender/Config.in"
 source "package/libXt/Config.in"
 source "package/libXxf86dga/Config.in"
 source "package/pixman/Config.in"

package/Depends.mk

@@ -12,9 +12,12 @@ bind-compile: openssl-compile
 bitlbee-compile: libiconv-compile openssl-compile glib-compile
 bluez-compile: libusb-compile dbus-compile glib-compile
 bogofilter-compile: libiconv-compile libdb-compile
+cairo-compile: libpng-compile pixman-compile freetype-compile fontconfig-compile libX11-compile
+
 ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
 cbtt-compile: uclibc++-compile
 endif
+
 cbtt-compile: mysql-compile zlib-compile
 collectd-compile: libpthread-compile
 cryptinit-compile: cryptsetup-compile
@@ -65,10 +68,14 @@ gkrellmd-compile: glib-compile
 glib-compile: gettext-compile libiconv-compile
 gmediaserver-compile: id3lib-compile libupnp-compile
 gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile ncurses-compile
+
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
 gpsd-compile: uclibc++-compile
 endif
 gpsd-compile: ncurses-compile
+
+gtk+-compile: cairo-compile atk-compile pango-compile libXext-compile renderproto-compile libXrender-compile
+
 ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
 heimdal-compile: libdb-compile
 endif
@@ -76,6 +83,7 @@ ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
 heimdal-compile: openldap-compile
 endif
 heimdal-compile: openssl-compile ncurses-compile e2fsprogs-compile
+
 httping-compile: openssl-compile
 icecast-compile: curl-compile libvorbis-compile libxml2-compile libxslt-compile
 ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y)

package/Makefile

@@ -27,6 +27,7 @@ package-$(ADK_PACKAGE_ARPD) += arpd
 package-$(ADK_PACKAGE_ARPWATCH) += arpwatch
 package-$(ADK_PACKAGE_ASTERISK) += asterisk
 package-$(ADK_COMPILE_ATFTP) += atftp
+package-$(ADK_PACKAGE_ATK) += atk
 package-$(ADK_PACKAGE_AUFS_UTIL) += aufs2-util
 package-$(ADK_PACKAGE_AUTOCONF) += autoconf
 package-$(ADK_PACKAGE_AUTOMAKE) += automake
@@ -38,6 +39,7 @@ package-$(ADK_COMPILE_BC) += bc
 package-$(ADK_PACKAGE_BISON) += bison
 package-$(ADK_PACKAGE_BZIP2) += bzip2
 package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates
+package-$(ADK_PACKAGE_CAIRO) += cairo
 package-$(ADK_PACKAGE_CFGFS) += cfgfs
 package-$(ADK_PACKAGE_CFINSTALL) += cfinstall
 package-$(ADK_PACKAGE_CPIO) += cpio
@@ -101,6 +103,7 @@ package-$(ADK_PACKAGE_FILE) += file
 package-$(ADK_PACKAGE_FIXESPROTO) += fixesproto
 package-$(ADK_COMPILE_FLAC) += flac
 package-$(ADK_PACKAGE_FLEX) += flex
+package-$(ADK_PACKAGE_FONTCONFIG) += fontconfig
 package-$(ADK_PACKAGE_FONTSPROTO) += fontsproto
 package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto
 package-$(ADK_PACKAGE_FPING) += fping
@@ -231,6 +234,7 @@ package-$(ADK_PACKAGE_LIBX11) += libX11
 package-$(ADK_PACKAGE_LIBXAU) += libXau
 package-$(ADK_PACKAGE_LIBXAW) += libXaw
 package-$(ADK_PACKAGE_LIBXPM) += libXpm
+package-$(ADK_PACKAGE_LIBXRENDER) += libXrender
 package-$(ADK_PACKAGE_LIBXV) += libXv
 package-$(ADK_PACKAGE_LIBXDMCP) += libXdmcp
 package-$(ADK_PACKAGE_LIBXEXT) += libXext
@@ -309,6 +313,7 @@ package-$(ADK_COMPILE_OSIRIS) += osiris
 package-$(ADK_PACKAGE_OWFS) += owfs
 package-$(ADK_PACKAGE_P910ND) += p910nd
 package-$(ADK_PACKAGE_PALANTIR) += palantir
+package-$(ADK_PACKAGE_PANGO) += pango
 package-$(ADK_PACKAGE_PARPROUTED) += parprouted
 package-$(ADK_PACKAGE_PARTED) += parted
 package-$(ADK_PACKAGE_PATCH) += patch

package/atk/Config.in

@@ -0,0 +1,5 @@
+config ADK_PACKAGE_ATK
+	prompt "atk............................... ATK library"
+	tristate
+	default n
+	help

package/atk/Makefile

@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		atk
+PKG_VERSION:=		1.29.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f587d9285b2d0ac35ea95acef673517c
+PKG_DESCR:=		atk library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.gnome.org
+PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/1.29/}
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,ATK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_ATK}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libatk.so* ${IDIR_ATK}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/cairo/Config.in

@@ -0,0 +1,10 @@
+config ADK_PACKAGE_CAIRO
+	prompt "cairo............................. Cairo library"
+	tristate
+	select ADK_PACKAGE_LIBPNG
+	select ADK_PACKAGE_LIBX11
+	select ADK_PACKAGE_PIXMAN
+	select ADK_PACKAGE_LIBFREETYPE
+	select ADK_PACKAGE_FONTCONFIG
+	default n
+	help

package/cairo/Makefile

@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		cairo
+PKG_VERSION:=		1.8.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d3e1a1035ae563812d4dd44a74fb0dd0
+PKG_DESCR:=		cairo graphics library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		fontconfig freetype libpng libX11 pixman
+PKG_URL:=		http://cairographics.org/
+PKG_SITES:=		http://cairographics.org/releases/
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,CAIRO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--enable-ft=yes \
+			--enable-xlib=yes
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/fontconfig/Config.in

@@ -0,0 +1,5 @@
+config ADK_PACKAGE_FONTCONFIG
+	prompt "fontconfig........................ fontconfig library"
+	tristate
+	default n
+	help

package/fontconfig/Makefile

@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		fontconfig
+PKG_VERSION:=		2.8.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		77e15a92006ddc2adbb06f840d591c0e
+PKG_DESCR:=		fontconfig
+PKG_SECTION:=		libs
+PKG_URL:=		http://fontconfig.org
+PKG_SITES:=		http://fontconfig.org/release/
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,FONTCONFIG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--with-arch=${ARCH} \
+			--disable-docs
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/fontconfig/patches/patch-fc-arch_Makefile_in

@@ -0,0 +1,24 @@
+--- fontconfig-2.8.0.orig/fc-arch/Makefile.in	2009-11-19 00:49:37.000000000 +0100
++++ fontconfig-2.8.0/fc-arch/Makefile.in	2009-12-04 20:07:55.995064329 +0100
+@@ -114,10 +114,10 @@ AWK = @AWK@
+ CC = @CC_FOR_BUILD@
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = 
+ CONFDIR = @CONFDIR@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS =
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = 
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@

package/fontconfig/patches/patch-fc-case_Makefile_in

@@ -0,0 +1,45 @@
+--- fontconfig-2.8.0.orig/fc-case/Makefile.in	2009-11-19 00:49:38.000000000 +0100
++++ fontconfig-2.8.0/fc-case/Makefile.in	2009-12-04 20:03:05.536919385 +0100
+@@ -87,17 +87,17 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_$(V))
+ am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+-am__v_CC_0 = @echo "  CC    " $@;
++am__v_CC_0 = echo "  CC    " $@;
+ AM_V_at = $(am__v_at_$(V))
+ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+ am__v_at_0 = @
+ CCLD = $(CC)
+ AM_V_CCLD = $(am__v_CCLD_$(V))
+ am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+-am__v_CCLD_0 = @echo "  CCLD  " $@;
++am__v_CCLD_0 = echo "  CCLD  " $@;
+ AM_V_GEN = $(am__v_GEN_$(V))
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+-am__v_GEN_0 = @echo "  GEN   " $@;
++am__v_GEN_0 = echo "  GEN   " $@;
+ SOURCES = fc-case.c
+ DIST_SOURCES = fc-case.c
+ HEADERS = $(noinst_HEADERS)
+@@ -117,10 +117,10 @@ AWK = @AWK@
+ CC = @CC_FOR_BUILD@
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = 
+ CONFDIR = @CONFDIR@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = 
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+@@ -252,7 +252,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
+ INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+ TMPL = fccase.tmpl.h
+ STMPL = ${top_srcdir}/fc-case/${TMPL}

package/fontconfig/patches/patch-fc-case_Makefile_in.orig

@@ -0,0 +1,24 @@
+--- fontconfig-2.8.0.orig/fc-case/Makefile.in	2009-11-19 00:49:38.000000000 +0100
++++ fontconfig-2.8.0/fc-case/Makefile.in	2009-12-04 19:59:20.431178533 +0100
+@@ -114,10 +114,10 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-CC = @CC_FOR_BUILD@
++CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = 
+ CONFDIR = @CONFDIR@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+@@ -252,7 +252,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
+ INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+ TMPL = fccase.tmpl.h
+ STMPL = ${top_srcdir}/fc-case/${TMPL}

package/fontconfig/patches/patch-fc-glyphname_Makefile_in

@@ -0,0 +1,24 @@
+--- fontconfig-2.8.0.orig/fc-glyphname/Makefile.in	2009-11-19 00:49:38.000000000 +0100
++++ fontconfig-2.8.0/fc-glyphname/Makefile.in	2009-12-04 20:06:40.117024551 +0100
+@@ -114,10 +114,10 @@ AWK = @AWK@
+ CC = @CC_FOR_BUILD@
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = 
+ CONFDIR = @CONFDIR@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS =
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = 
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@

package/fontconfig/patches/patch-fc-lang_Makefile_in

@@ -0,0 +1,32 @@
+--- fontconfig-2.8.0.orig/fc-lang/Makefile.in	2009-11-19 00:49:38.000000000 +0100
++++ fontconfig-2.8.0/fc-lang/Makefile.in	2009-12-04 20:04:44.333036155 +0100
+@@ -85,14 +85,14 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_$(V))
+ am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+-am__v_CC_0 = @echo "  CC    " $@;
++am__v_CC_0 = echo "  CC    " $@;
+ AM_V_at = $(am__v_at_$(V))
+ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+ am__v_at_0 = @
+ CCLD = $(CC)
+ AM_V_CCLD = $(am__v_CCLD_$(V))
+ am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+-am__v_CCLD_0 = @echo "  CCLD  " $@;
++am__v_CCLD_0 = echo "  CCLD  " $@;
+ AM_V_GEN = $(am__v_GEN_$(V))
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+ am__v_GEN_0 = @echo "  GEN   " $@;
+@@ -114,10 +114,10 @@ AWK = @AWK@
+ CC = @CC_FOR_BUILD@
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = 
+ CONFDIR = @CONFDIR@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = 
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@

package/freetype/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libfreetype
-PKG_VERSION:=		2.3.9
+PKG_VERSION:=		2.3.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d76233108aca9c9606cdbd341562ad9a
+PKG_MD5SUM:=		519c7cbf5cbd72ffa822c66844d3114c
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
@@ -16,13 +16,17 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
 DISTFILES:=		freetype-${PKG_VERSION}.tar.bz2
 WRKDIST=		${WRKDIR}/freetype-${PKG_VERSION}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFREETYPE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib

package/gtk+/Makefile

@@ -21,6 +21,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GTK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
+CONFIGURE_ENV+=		gio_can_sniff=no
+CONFIGURE_ARGS+=	--without-libtiff \
+			--without-libjpeg
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 

package/jpeg/Makefile

@@ -15,9 +15,13 @@ PKG_SITES:=		http://www.ijg.org/files/ \
 
 DISTFILES:=		${PKG_NAME}src.v${PKG_VERSION}.tar.gz
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto

package/libX11/Makefile

@@ -11,9 +11,13 @@ PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto
 CONFIGURE_STYLE:=	gnu

package/libXau/Makefile

@@ -11,9 +11,13 @@ PKG_DESCR:=		X11 authorisation library
 PKG_SECTION:=		x11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto

package/libXdmcp/Makefile

@@ -11,9 +11,13 @@ PKG_DESCR:=		X11 display manager control protocol library
 PKG_SECTION:=		x11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto

package/libXext/Makefile

@@ -11,9 +11,13 @@ PKG_DESCR:=		X client interface to extensions of the X protocol
 PKG_SECTION:=		x11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull

package/libXrender/Config.in

@@ -0,0 +1,6 @@
+config ADK_PACKAGE_LIBXAU
+	prompt "libXau............................... X11 authorisation library"
+	tristate
+	default n
+	help
+         http://www.x.org

package/libXrender/Makefile

@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXrender
+PKG_VERSION:=		0.9.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1791473c18a83a333a048b72d719fc55
+PKG_DESCR:=		X11 rendering library
+PKG_SECTION:=		x11
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--disable-malloc0returnsnull
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libXrender.so* ${IDIR_LIBXAU}/usr/lib/
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libpng/Makefile

@@ -13,13 +13,17 @@ PKG_DEPENDS:=		zlib
 PKG_URL:=		http://www.libpng.org/pub/png/libpng.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib

package/libtiff/Makefile

@@ -15,9 +15,13 @@ PKG_SITES:=		ftp://ftp.remotesensing.org/pub/libtiff/
 DISTFILES:=		tiff-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/tiff-${PKG_VERSION}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-cxx
@@ -26,6 +30,6 @@ INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libtiff.so.* ${IDIR_LIBTIFF}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/pango/Config.in

@@ -0,0 +1,5 @@
+config ADK_PACKAGE_PANGO
+	prompt "pango............................. Pango library"
+	tristate
+	default n
+	help

package/pango/Makefile

@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		pango
+PKG_VERSION:=		1.26.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		629f653adfdcfd6e4d89e95f74b8d370
+PKG_DESCR:=		pango library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.pango.org
+PKG_SITES:=		${MASTER_SITE_GNOME:=/pango/1.26/}
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,PANGO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_PANGO}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libpango.so* ${IDIR_PANGO}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/pixman/Makefile

@@ -11,9 +11,13 @@ PKG_DESCR:=		Pixel manipulation library
 PKG_SECTION:=		x11
 PKG_SITES:=		http://www.cairographics.org/releases/
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,PIXMAN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PIXMAN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto

package/zlib/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		zlib
 PKG_VERSION:=		1.2.3
 PKG_RELEASE:=		6
 PKG_MD5SUM:=		dee233bf288ee795ac96a98cc2e369b6
-PKG_DESCR:=		implementation of the deflate compression method (library)
+PKG_DESCR:=		implementation of the deflate compression method
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.zlib.net
 PKG_SITES:=		http://www.zlib.net/ \
@@ -15,29 +15,37 @@ PKG_SITES:=		http://www.zlib.net/ \
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	manual
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+CONFIGURE_STYLE:=	manual
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+ifeq ($(ADK_NATIVE),n)
+COPTS:=                 $(TARGET_CONFIGURE_OPTS)
+endif
 
-ifeq ($(ADK_NATIVE),n)                                                              
-COPTS:=                 $(TARGET_CONFIGURE_OPTS)    
+ifeq ($(ADK_STATIC),n)
+CONFIGURE_OPTS:=	--shared
 endif
 
 do-configure:
-		(cd $(WRKBUILD); $(COPTS) \
-			CFLAGS="$(TARGET_CFLAGS) -fPIC" \
-			CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-			LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-			./configure \
-			--prefix=$(STAGING_DIR)/usr \
-			--includedir=$(STAGING_DIR)/usr/include \
-			--shared \
-		);
+	(cd $(WRKBUILD); $(COPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		./configure \
+		--prefix=$(STAGING_DIR)/usr \
+		--includedir=$(STAGING_DIR)/usr/include \
+		$(CONFIGURE_OPTS) \
+	);
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib