add support for imagemagick package

12 files changed, 165 insertions, 17 deletions

diff --git a/mk/package.mk b/mk/package.mk
index 21b84f810..4879f9cf2 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -68,10 +68,9 @@ MAKE_ENV+=		WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \
 			CPPFLAGS='$(strip ${TCPPFLAGS})' \
 			LDFLAGS='$(strip ${TLDFLAGS})'
-MAKE_ENV+=		PATH='${TARGET_PATH}'
+MAKE_ENV+=		PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig'
 ifeq ($(ADK_NATIVE),)
 MAKE_ENV+=		PATH='${TARGET_PATH}' \
-			PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig' \
 			${HOST_CONFIGURE_OPTS} \
 			CC='${TARGET_CC}' \
 			CXX='${TARGET_CXX}' \
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
new file mode 100644
index 000000000..648befeeb
--- /dev/null
+++ b/package/ImageMagick/Makefile
@@ -0,0 +1,68 @@
+# 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:=		ImageMagick
+PKG_VERSION:=		6.6.5
+PKG_EXTRAVER:=		10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a07a97cfb28b588cbcf83ffa9ec92e3f
+PKG_DESCR:=		image processing and converting utility
+PKG_SECTION:=		multimedia
+PKG_BUILDDEP:=		jpeg libtiff
+PKG_DEPENDS:=		libjpeg libtiff
+PKG_URL:=		http://www.imagemagick.org/
+PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
+
+PKG_SUBPKGS:=		CONVERT DISPLAY LIBIMAGEMAGICK
+PKGSD_LIBIMAGEMAGICK:=	imagemagick library
+PKGSC_LIBIMAGEMAGICK:=	libs
+PKGSD_CONVERT:=		image processing and converting utility
+PKGSC_CONVERT:=		multimedia
+PKGSS_CONVERT:=		libimagemagick
+PKGSD_DISPLAY:=		image display application
+PKGSC_DISPLAY:=		multimedia
+PKGSS_DISPLAY:=		libimagemagick
+PKGSB_DISPLAY:=		libX11
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK}))
+$(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
+$(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_CONVERT}+=	convert-install
+SUB_INSTALLS-${ADK_PACKAGE_DISPLAY}+=	display-install
+
+CONFIGURE_ARGS+=	--with-magick-plus-plus=no
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
+	$(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \
+		$(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
+	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config
+	$(INSTALL_DATA) $(WRKINST)/usr/share/${PKG_NAME}-${PKG_VERSION}/config/* \
+		$(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config
+	$(CP) $(WRKINST)/usr/lib/libMagickCore.so* \
+		$(IDIR_LIBIMAGEMAGICK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libMagickWand.so* \
+		$(IDIR_LIBIMAGEMAGICK)/usr/lib
+
+convert-install:
+	$(INSTALL_DIR) $(IDIR_CONVERT)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/convert \
+		$(IDIR_CONVERT)/usr/bin
+
+display-install:
+	$(INSTALL_DIR) $(IDIR_DISPLAY)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/display \
+		$(IDIR_DISPLAY)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
index 4b91d88b3..2ab0d4941 100644
--- a/package/jpeg/Makefile
+++ b/package/jpeg/Makefile
@@ -5,14 +5,16 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jpeg
 PKG_VERSION:=		7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		382ef33b339c299b56baf1296cda9785
 PKG_DESCR:=		The Independent JPEG Groups JPEG runtime library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.ijg.org/
 PKG_SITES:=		http://www.ijg.org/files/
 
-PKG_SUBPKGS:=		LIBJPEG
+PKG_SUBPKGS:=		LIBJPEG JPEG_DEV
+PKGSD_JPEG_DEV:=	development files for jpeg
+PKGSC_JPEG_DEV:=	devel
 
 DISTFILES:=		${PKG_NAME}src.v${PKG_VERSION}.tar.gz
 
@@ -23,9 +25,18 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV}))
 
-post-install:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_JPEG_DEV}+=	jpeg-dev-install
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
 
+jpeg-dev-install:
+	${INSTALL_DIR} ${IDIR_JPEG_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_JPEG_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 4d7e7794e..e219ed49e 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBX11 LIBX11_DEV
+PKGSD_LIBX11_DEV:=	X11 headers
+PKGSC_LIBX11_DEV:=	devel
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -21,7 +23,7 @@ endif
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
 
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index d87b396ff..271982407 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		72ca7f37e4a1794acbdd9ab047821e8b
 PKG_DESCR:=		X.Org XScrnSaver library
-PKG_SECTION:=		libs
+PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		scrnsaverproto
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index d81ed113f..8e795c2cf 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -8,9 +8,8 @@ PKG_VERSION:=		1.1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f8f19f747c8445213d5409ae8b8b2f0a
 PKG_DESCR:=		X Window System client interface to the DAMAGE extension to the X protocol
-PKG_SECTION:=		libs
+PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXfixes damageproto
-PKG_URL:=		add project url
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index f7011ddad..a1e1259e2 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -12,6 +12,10 @@ PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libX11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_SUBPKGS:=		LIBXEXT LIBXEXT_DEV
+PKGSD_LIBXEXT_DEV:=	X11 extension headers
+PKGSC_LIBXEXT_DEV:=	devel
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -19,11 +23,23 @@ endif
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBXEXT_DEV}+=libxext-dev-install
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
 
+libxext-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
+	${CP} ${WRKINST}/usr/include/X11/extensions/*.h \
+		${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
+	${CP} ${STAGING_DIR}/usr/include/X11/extensions/*.h \
+                ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index 27ad3da19..0bf1fe8d4 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		4.0.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		86eb4b916cd5948c0e20d279107b3331
 PKG_DESCR:=		X Fixes Library
-PKG_SECTION:=		libs
+PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		fixesproto xextproto xproto libX11
 PKG_URL:=		http://xorg.freedesktop.org
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
index 4e2f8ea0e..3d5d6edcb 100644
--- a/package/libXxf86vm/Makefile
+++ b/package/libXxf86vm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		libXxf86vm
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		52b49483eccbdd1566b8c560fe7f76e8
-PKG_DESCR:=		add short description
-PKG_SECTION:=		libs
+PKG_DESCR:=		an interface to the XFree86-VidModeExtension extension
+PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xf86vidmodeproto libXext
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
 
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index b06ba0058..ebd9988bf 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -5,13 +5,17 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtiff
 PKG_VERSION:=		3.9.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2006c1bdd12644dbf02956955175afd6
 PKG_DESCR:=		A library for reading/writing TIFF images
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.libtiff.org/
 PKG_SITES:=		ftp://ftp.remotesensing.org/pub/libtiff/
 
+PKG_SUBPKGS:=		LIBTIFF LIBTIFF_DEV
+PKGSD_LIBTIFF_DEV:=	development files for libtiff
+PKGSC_LIBTIFF_DEV:=	devel
+
 DISTFILES:=		tiff-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/tiff-${PKG_VERSION}
 
@@ -22,11 +26,20 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBTIFF_DEV}+=	libtiff-dev-install
 
 CONFIGURE_ARGS+=	--disable-cxx
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/
 
+libtiff-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBTIFF_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBTIFF_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index aff3f61f8..124355161 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -24,6 +24,14 @@ out=0
 . $topdir/.config
 
 if [[ -n $ADK_NATIVE ]];then
+	if [[ -n $ADK_PACKAGE_LIBIMAGEMAGICK ]];then
+		NEED_JPEGDEV="$NEED_JPEGDEV libimagemagick"
+		NEED_TIFFDEV="$NEED_TIFFDEV libimagemagick"
+	fi
+	if [[ -n $ADK_PACKAGE_DISPLAY ]];then
+		NEED_X11DEV="$NEED_X11DEV display"
+		NEED_XEXTDEV="$NEED_XEXTDEV display"
+	fi
 	if [[ -n $ADK_PACKAGE_GIT ]];then
 		NEED_CURLDEV="$NEED_CURLDEV git"
 	fi
@@ -134,6 +142,34 @@ if [[ -n $NEED_CURLDEV ]];then
 	fi
 fi
 
+if [[ -n $NEED_TIFFDEV ]];then
+	if ! test -f /usr/include/tiff.h >/dev/null; then
+		echo >&2 You need tiff headers to build $NEED_TIFFDEV
+		out=1
+	fi
+fi
+
+if [[ -n $NEED_JPEGDEV ]];then
+	if ! test -f /usr/include/jpeglib.h >/dev/null; then
+		echo >&2 You need jpeg headers to build $NEED_JPEGDEV
+		out=1
+	fi
+fi
+
+if [[ -n $NEED_X11DEV ]];then
+	if ! test -f /usr/include/X11/Xlib.h >/dev/null; then
+		echo >&2 You need X11 headers to build $NEED_X11DEV
+		out=1
+	fi
+fi
+
+if [[ -n $NEED_XEXTDEV ]];then
+	if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then
+		echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV
+		out=1
+	fi
+fi
+
 #if [[ -n $NEED_SSLDEV ]]; then
 #	if ! test -f /usr/lib/pkgconfig/openssl.pc >/dev/null; then
 #		if ! test -f /usr/include/openssl/ssl.h >/dev/null; then
diff --git a/target/x86/kernel.config b/target/x86/kernel.config
index 80b42f0f6..1a6c964da 100644
--- a/target/x86/kernel.config
+++ b/target/x86/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.36
-# Wed Nov 24 20:35:48 2010
+# Fri Nov 26 00:21:27 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -348,7 +348,11 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_SUSPEND is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_ACPI is not set
 # CONFIG_SFI is not set
 
 #