From a228c0bef5a2f66239270c04012ba576b1fc0680 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 16 Dec 2010 14:27:36 +0100
Subject: update to latest upstream version, add header subpackage, disable x11
 support

---
 package/DirectFB/Makefile | 61 +++++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 21 deletions(-)

(limited to 'package/DirectFB')

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 056fbb350..0f7dba976 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -4,23 +4,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		DirectFB
-PKG_VERSION:=		1.4.3
+PKG_VERSION:=		1.4.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		223e036da906ceb4bd44708026839ff1
-PKG_DESCR:=		Thin library on top of the Linux framebuffer devices
+PKG_EXTRAVER:=		1.4-5
+PKG_MD5SUM:=		94735ccec21120794adcce93a61445d2
+PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libpng
-PKG_BUILDDEP:=		libpng libX11 libXext
+PKG_DEPENDS:=		libpng libjpeg
+PKG_BUILDDEP:=		libpng jpeg
 PKG_URL:=		http://www.directfb.org/
 PKG_SITES:=		http://directfb.org/downloads/Core/DirectFB-1.4/
 
+PKG_SUBPKGS:=		DIRECTFB DIRECTFB_DEV
+PKGSD_DIRECTFB_DEV:=	development files for DirectFB
+PKGSC_DIRECTFB_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV}))
 
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 			--with-gfxdrivers=none \
-			--disable-osx
+			--enable-fbdev \
+			--disable-sdl \
+			--disable-osx \
+			--disable-x11 \
+			--disable-gif \
+			--enable-png \
+			--enable-jpeg
 
 # This is to overcome libtool fuckup - when building without,
 # libtool calls (the correct) ld directly without parameters,
@@ -31,25 +43,32 @@ ifeq (${ADK_HARDWARE_LEMOTE_YEELONG},y)
 XAKE_FLAGS+=		LDEMULATION=elf64ltsmip
 endif
 
-post-install:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_DIRECTFB_DEV}+=	directfb-dev-install
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
 	${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/
-	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-1.4-0/{inputdrivers,systems,wm}
+	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}
 	${CP} $(WRKINST)/usr/lib/lib{direct,fusion}*.so* \
 		$(IDIR_DIRECTFB)/usr/lib/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_linux_input.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/inputdrivers/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/systems/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/systems/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/wm/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/wm/
-	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-1.4-0/interfaces/IDirectFB{Font,ImageProvider,VideoProvider}
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers/libdirectfb_linux_input.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/systems/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/systems/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/wm/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/wm/
+	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFB{Font,ImageProvider,VideoProvider}
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/
 
+directfb-dev-install:
+	${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include/
+	${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3