summaryrefslogtreecommitdiff
path: root/package/DirectFB/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:52:51 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:52:51 +0100
commit58d31896056e604185acf3606b99257cea519dd1 (patch)
tree3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/DirectFB/Makefile
parent220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff)
parent845317b460ee99ad633534cad4de72404af7e30b (diff)
resolve merge conflicts
Diffstat (limited to 'package/DirectFB/Makefile')
-rw-r--r--package/DirectFB/Makefile62
1 files changed, 41 insertions, 21 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 8c0522ff2..45dc3e13f 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,24 +43,32 @@ ifeq (${ADK_TARGET_SYSTEM_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