- Update to 1.4.3

PR:		ports/146815
Submitted by:	Anatoly Borodin <anatoly.borodin@gmail.com> (maintainer)

21 files changed, 471 insertions, 125 deletions

diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index edfec8fe31ef..b81a304b777e 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	directfb
-PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTVERSION=	1.4.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.directfb.org/downloads/Core/ \
-		http://www.directfb.org/downloads/Old/
+MASTER_SITES=	http://www.directfb.org/downloads/Core/${DISTNAME:R}/
 DISTNAME=	DirectFB-${PORTVERSION}
 
 MAINTAINER=	anatoly.borodin@gmail.com
@@ -19,18 +17,44 @@ COMMENT=	Graphic development lightweight API
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+OPTIONS=	FREETYPE2	"Enable Freetype support" on \
+		X11		"Enable X11 backend" on \
+		SDL		"Enable SDL backend" on \
+		UNIQUE		"Enable Unique (WM Module)" off \
+		TESTS		"Install test apps" off
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 USE_AUTOTOOLS=	libtool:22
-USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
-PLIST_SUB+=	DIRECTFB_VERSION=${PORTVERSION} DIRECTFB_VER=1.1-0
+USE_PERL5_BUILD=yes
+
+DIRECTFB_SHLIB=	3 # LT_CURRENT
+DIRECTFB_BIN=	0 # LT_BINARY
+PLIST_SUB+=	DIRECTFB_VERSION="${PORTVERSION}" \
+		DIRECTFB_RELEASE="${PORTVERSION:R}" \
+		DIRECTFB_SHLIB="${DIRECTFB_SHLIB}" \
+		DIRECTFB_BIN="${DIRECTFB_BIN}"
+
+CONFIGURE_ARGS=	--disable-osx --disable-extra-warnings --disable-profiling \
+		--disable-debug --enable-debug-support --disable-trace \
+		--enable-text --enable-gettid --enable-network \
+		--disable-multi --enable-voodoo --enable-devmem \
+		--disable-fbdev --disable-vnc --disable-sysfs --enable-jpeg \
+		--enable-zlib --enable-png --enable-gif --disable-video4linux \
+		--disable-video4linux2 --with-gfxdrivers=all \
+		--with-inputdrivers=all --with-smooth-scaling \
+		--with-dither-rgb16=advanced
+
+.include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/libfreetype.so.9)
-WITH_FREETYPE2=	yes
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	man2html:${PORTSDIR}/textproc/man2html
+PORTDOCS=	*
+DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+		docs/README* docs/*.html docs/html/*.html docs/html/*.png
 .endif
 
 .if defined(WITH_FREETYPE2)
@@ -54,17 +78,26 @@ PLIST_SUB+=	X11="@comment "
 .if defined(WITH_SDL)
 USE_SDL+=	sdl
 CONFIGURE_ARGS+=	--enable-sdl
-PLIST_SUB+=	SDL="" GFXDRIVERS=""
+PLIST_SUB+=	SDL=""
 .else
 CONFIGURE_ARGS+=	--disable-sdl
-PLIST_SUB+=	SDL="@comment " GFXDRIVERS="@comment "
+PLIST_SUB+=	SDL="@comment "
+.endif
 
+.if defined(WITH_UNIQUE)
+CONFIGURE_ARGS+=	--enable-unique
+PLIST_SUB+=	UNIQUE=""
+.else
+CONFIGURE_ARGS+=	--disable-unique
+PLIST_SUB+=	UNIQUE="@comment "
 .endif
 
-.if defined(WITH_SDL) || defined(WITH_X11)
-PLIST_SUB+=	INPUTDRIVERS=""
+.if defined(WITH_TESTS)
+CONFIGURE_ARGS+=	--with-tests
+PLIST_SUB+=	TESTS=""
 .else
-PLIST_SUB+=	INPUTDRIVERS="@comment "
+CONFIGURE_ARGS+=	--without-tests
+PLIST_SUB+=	TESTS="@comment "
 .endif
 
 MAN1=		directfb-csource.1 dfbg.1
@@ -77,8 +110,25 @@ BROKEN=		Does not compile on alpha
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g ; \
-		s/-lpthread/${PTHREAD_LIBS}/g ; s|%%LTMAIN%%|${LTMAIN}|g' \
-			${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-lc_r|${PTHREAD_LIBS}|g ; s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|%%LTMAIN%%|${LTMAIN}|g ; s|/usr/local|${LOCALBASE}|g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+		${WRKSRC}/configure
+	@${GREP} -lr alloca\.h ${WRKSRC} | ${XARGS} \
+		${REINPLACE_CMD} -e 's|<alloca\.h>|<stdlib.h>|g'
+
+.if !defined(NOPORTDOCS)
+post-install:
+	${MKDIR} ${DOCSDIR}/html
+	cd ${WRKSRC} && \
+	for f in ${DOCS}; do \
+		if [ $${f##*/html/*} ]; then \
+			${INSTALL_DATA} $$f ${DOCSDIR}; \
+		else \
+			${INSTALL_DATA} $$f ${DOCSDIR}/html; \
+		fi; \
+	done
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/directfb/distinfo b/devel/directfb/distinfo
index 2aa1fda929e8..7fd4f3e6dd68 100644
--- a/devel/directfb/distinfo
+++ b/devel/directfb/distinfo
@@ -1,3 +1,3 @@
-MD5 (DirectFB-1.1.1.tar.gz) = c75255049ca8d5c69afe4db58f603028
-SHA256 (DirectFB-1.1.1.tar.gz) = f12ec5f0864d85268a8d67e4919cb7f3d7f0e06ed6cc278c952f6c342673d931
-SIZE (DirectFB-1.1.1.tar.gz) = 2614203
+MD5 (DirectFB-1.4.3.tar.gz) = 223e036da906ceb4bd44708026839ff1
+SHA256 (DirectFB-1.4.3.tar.gz) = 1435aae4f0eb70252dc25ee50e51aecfdc4527f2651db5f35b34eb833fa7e978
+SIZE (DirectFB-1.4.3.tar.gz) = 2898215
diff --git a/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c b/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c
new file mode 100644
index 000000000000..59ee963f87c3
--- /dev/null
+++ b/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c
@@ -0,0 +1,11 @@
+--- gfxdrivers/davinci/davinci_c64x.c
++++ gfxdrivers/davinci/davinci_c64x.c
+@@ -57,6 +57,8 @@
+ #define C64X_QLEN    direct_page_align( sizeof(c64xTaskControl) )
+ #define C64X_MLEN    direct_page_align( 0x2000000 )
+ 
++typedef unsigned long ulong;
++
+ __attribute__((noinline))
+ static void
+ davinci_c64x_queue_error( DavinciC64x *c64x, const char *msg )
diff --git a/devel/directfb/files/patch-lib-direct-conf.c b/devel/directfb/files/patch-lib-direct-conf.c
index d359cca4e69b..c0cdf6df54b2 100644
--- a/devel/directfb/files/patch-lib-direct-conf.c
+++ b/devel/directfb/files/patch-lib-direct-conf.c
@@ -1,11 +1,10 @@
---- lib/direct/conf.c.orig	2007-12-15 14:30:28.000000000 +0200
-+++ lib/direct/conf.c	2008-03-16 14:31:28.000000000 +0200
-@@ -31,6 +31,8 @@
+--- lib/direct/conf.c
++++ lib/direct/conf.c
+@@ -30,6 +30,7 @@
+ 
  #include <stdlib.h>
  #include <string.h>
- 
 +#include <signal.h>
-+
+ 
  #include <direct/conf.h>
  #include <direct/mem.h>
- #include <direct/util.h>
diff --git a/devel/directfb/files/patch-lib-direct-interface.c b/devel/directfb/files/patch-lib-direct-interface.c
new file mode 100644
index 000000000000..b4ae4081e22f
--- /dev/null
+++ b/devel/directfb/files/patch-lib-direct-interface.c
@@ -0,0 +1,14 @@
+--- lib/direct/interface.c
++++ lib/direct/interface.c
+@@ -71,7 +71,11 @@ typedef struct {
+      int                   references;
+ } DirectInterfaceImplementation;
+ 
++#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+ static pthread_mutex_t  implementations_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++#else
++static pthread_mutex_t  implementations_mutex = PTHREAD_MUTEX_INITIALIZER;
++#endif
+ static DirectLink      *implementations       = NULL;
+ 
+ /**************************************************************************************************/
diff --git a/devel/directfb/files/patch-lib-direct-log.c b/devel/directfb/files/patch-lib-direct-log.c
index 7f6b7d890a56..b010cfaa8779 100644
--- a/devel/directfb/files/patch-lib-direct-log.c
+++ b/devel/directfb/files/patch-lib-direct-log.c
@@ -1,17 +1,15 @@
---- lib/direct/log.c.orig	2007-03-03 22:29:45.000000000 +0200
-+++ lib/direct/log.c	2008-03-12 12:49:22.000000000 +0200
-@@ -49,6 +49,14 @@
- #include <direct/util.h>
- 
- 
-+#ifndef EAI_ADDRFAMILY
-+#define EAI_ADDRFAMILY   1
-+#endif
-+#ifndef EAI_NODATA
-+#define EAI_NODATA       7
-+#endif
-+
-+
- struct __D_DirectLog {
-      int            magic;
- 
+--- lib/direct/log.c
++++ lib/direct/log.c
+@@ -335,10 +335,12 @@ parse_host_addr( const char       *hostport,
+                     D_ERROR( "Direct/Log: Port %s is unreachable!\n", portstr );
+                     return DR_FAILURE;
+                
++/*
+                case EAI_ADDRFAMILY:
+                case EAI_NODATA:
+                     D_ERROR( "Direct/Log: Host found, but has no address!\n" );
+                     return DR_FAILURE;
++*/
+                     
+                case EAI_MEMORY:
+                     return D_OOM();
diff --git a/devel/directfb/files/patch-lib-direct-trace.c b/devel/directfb/files/patch-lib-direct-trace.c
new file mode 100644
index 000000000000..c4f9d6fbaf2f
--- /dev/null
+++ b/devel/directfb/files/patch-lib-direct-trace.c
@@ -0,0 +1,20 @@
+--- lib/direct/trace.c
++++ lib/direct/trace.c
+@@ -90,7 +90,7 @@ struct __D_DirectTraceBuffer {
+ 
+ static DirectTraceBuffer *buffers[MAX_BUFFERS];
+ static int                buffers_num  = 0;
+-#ifdef HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
++#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+ static pthread_mutex_t    buffers_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+ #else
+ static pthread_mutex_t    buffers_lock = PTHREAD_MUTEX_INITIALIZER;
+@@ -176,7 +176,7 @@ typedef struct {
+ } SymbolTable;
+ 
+ static DirectLink      *tables      = NULL;
+-#ifdef HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
++#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+ static pthread_mutex_t  tables_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+ #else
+ static pthread_mutex_t  tables_lock = PTHREAD_MUTEX_INITIALIZER;
diff --git a/devel/directfb/files/patch-lib-fusion-call.c b/devel/directfb/files/patch-lib-fusion-call.c
new file mode 100644
index 000000000000..920f515e6fc3
--- /dev/null
+++ b/devel/directfb/files/patch-lib-fusion-call.c
@@ -0,0 +1,10 @@
+--- lib/fusion/call.c
++++ lib/fusion/call.c
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/stat.h>
+ 
+ #include <fusion/build.h>
+ 
diff --git a/devel/directfb/files/patch-lib-fusion-lock.c b/devel/directfb/files/patch-lib-fusion-lock.c
new file mode 100644
index 000000000000..23c8ed983caf
--- /dev/null
+++ b/devel/directfb/files/patch-lib-fusion-lock.c
@@ -0,0 +1,11 @@
+--- lib/fusion/lock.c
++++ lib/fusion/lock.c
+@@ -485,7 +485,7 @@ fusion_skirmish_wait( FusionSkirmish *skirmish, unsigned int timeout )
+       
+      /* Install a (fake) signal handler for SIGRESTART. */
+      act.sa_handler = restart_handler;
+-     act.sa_flags   = SA_RESETHAND | SA_RESTART | SA_NOMASK;
++     act.sa_flags   = SA_RESETHAND | SA_RESTART | SA_NODEFER;
+      
+      sigaction( SIGRESTART, &act, &oldact );
+      
diff --git a/devel/directfb/files/patch-lib-fusion-shm-shm.c b/devel/directfb/files/patch-lib-fusion-shm-shm.c
new file mode 100644
index 000000000000..52946c6a93ae
--- /dev/null
+++ b/devel/directfb/files/patch-lib-fusion-shm-shm.c
@@ -0,0 +1,11 @@
+--- lib/fusion/shm/shm.c
++++ lib/fusion/shm/shm.c
+@@ -34,7 +34,7 @@
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/vfs.h>
++#include <sys/mount.h>
+ 
+ #include <direct/debug.h>
+ #include <direct/list.h>
diff --git a/devel/directfb/files/patch-lib-fusion-shmalloc.c b/devel/directfb/files/patch-lib-fusion-shmalloc.c
new file mode 100644
index 000000000000..50602884d6ba
--- /dev/null
+++ b/devel/directfb/files/patch-lib-fusion-shmalloc.c
@@ -0,0 +1,11 @@
+--- lib/fusion/shmalloc.c
++++ lib/fusion/shmalloc.c
+@@ -52,6 +52,8 @@
+ 
+ D_DEBUG_DOMAIN( Fusion_SHM, "Fusion/SHM", "Fusion Shared Memory" );
+ 
++typedef unsigned long ulong;
++
+ void
+ fusion_dbg_print_memleaks( FusionSHMPoolShared *pool )
+ {
diff --git a/devel/directfb/files/patch-lib-voodoo-client.c b/devel/directfb/files/patch-lib-voodoo-client.c
new file mode 100644
index 000000000000..f820d6ed7f4d
--- /dev/null
+++ b/devel/directfb/files/patch-lib-voodoo-client.c
@@ -0,0 +1,15 @@
+--- lib/voodoo/client.c
++++ lib/voodoo/client.c
+@@ -97,10 +97,12 @@ voodoo_client_create( const char     *hostname,
+                     D_ERROR( "Direct/Log: Port 2323 is unreachable!\n" );
+                     return DR_FAILURE;
+                
++/*
+                case EAI_ADDRFAMILY:
+                case EAI_NODATA:
+                     D_ERROR( "Direct/Log: Host found, but has no address!\n" );
+                     return DR_FAILURE;
++*/
+                     
+                case EAI_MEMORY:
+                     return D_OOM();
diff --git a/devel/directfb/files/patch-lib-voodoo-manager.c b/devel/directfb/files/patch-lib-voodoo-manager.c
index 66fa4d181d92..0b1a87c85b64 100644
--- a/devel/directfb/files/patch-lib-voodoo-manager.c
+++ b/devel/directfb/files/patch-lib-voodoo-manager.c
@@ -1,6 +1,14 @@
---- lib/voodoo/manager.c.orig	2007-12-15 14:30:28.000000000 +0200
-+++ lib/voodoo/manager.c	2008-03-16 14:51:33.000000000 +0200
-@@ -186,7 +186,7 @@
+--- lib/voodoo/manager.c.orig	2009-06-02 18:47:23.000000000 +0200
++++ lib/voodoo/manager.c	2010-06-03 09:21:51.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ 
++#include <netinet/in_systm.h> /* for n_long, required for build on 7.x */
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+@@ -186,10 +187,10 @@
  
       D_DEBUG( "Voodoo/Manager: Creating manager at %p.\n", manager );
  
@@ -8,4 +16,8 @@
 +     if (setsockopt( fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos) ) < 0)
            D_PERROR( "Voodoo/Manager: Could not set IP_TOS!\n" );
  
-      if (setsockopt( fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one) ) < 0)
+-     if (setsockopt( fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one) ) < 0)
++     if (setsockopt( fd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one) ) < 0)
+           D_PERROR( "Voodoo/Manager: Could not set TCP_NODELAY!\n" );
+ 
+      DUMP_SOCKET_OPTION( SO_SNDLOWAT );
diff --git a/devel/directfb/files/patch-src-display-idirectfbsurface.c b/devel/directfb/files/patch-src-display-idirectfbsurface.c
deleted file mode 100644
index 77baa3dc93fe..000000000000
--- a/devel/directfb/files/patch-src-display-idirectfbsurface.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/display/idirectfbsurface.c.orig	2007-03-03 22:19:36.000000000 +0200
-+++ src/display/idirectfbsurface.c	2008-03-12 12:56:41.000000000 +0200
-@@ -32,7 +32,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <alloca.h>
- 
- #include <math.h>
- 
diff --git a/devel/directfb/files/patch-src-gfx-generic-generic.c b/devel/directfb/files/patch-src-gfx-generic-generic.c
new file mode 100644
index 000000000000..26d46b7194a8
--- /dev/null
+++ b/devel/directfb/files/patch-src-gfx-generic-generic.c
@@ -0,0 +1,11 @@
+--- src/gfx/generic/generic.c
++++ src/gfx/generic/generic.c
+@@ -63,6 +63,8 @@
+ #include "duffs_device.h"
+ 
+ 
++typedef unsigned long ulong;
++
+ /* lookup tables for 2/3bit to 8bit color conversion */
+ static const u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff};
+ static const u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff};
diff --git a/devel/directfb/files/patch-src-misc-conf.h b/devel/directfb/files/patch-src-misc-conf.h
index e4c22be72356..8f6182059e4a 100644
--- a/devel/directfb/files/patch-src-misc-conf.h
+++ b/devel/directfb/files/patch-src-misc-conf.h
@@ -1,12 +1,11 @@
---- src/misc/conf.h.orig	2007-12-15 15:16:37.000000000 +0200
-+++ src/misc/conf.h	2008-03-16 16:43:14.000000000 +0200
-@@ -38,6 +38,9 @@
- #include <core/coredefs.h>
+--- src/misc/conf.c
++++ src/misc/conf.c
+@@ -56,6 +56,8 @@
  
+ D_DEBUG_DOMAIN( DirectFB_Config, "DirectFB/Config", "Runtime configuration options for DirectFB" );
  
 +typedef unsigned long ulong;
 +
-+
- typedef struct {
-      bool                                init;
+ DFBConfig *dfb_config = NULL;
  
+ static const char *config_usage =
diff --git a/devel/directfb/files/patch-tests-dfbtest_window.c b/devel/directfb/files/patch-tests-dfbtest_window.c
new file mode 100644
index 000000000000..fd738c38d0ec
--- /dev/null
+++ b/devel/directfb/files/patch-tests-dfbtest_window.c
@@ -0,0 +1,10 @@
+--- tests/dfbtest_window.c
++++ tests/dfbtest_window.c
+@@ -41,6 +41,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <signal.h>
+ 
+ #include <direct/messages.h>
+ #include <direct/util.h>
diff --git a/devel/directfb/files/patch-tools-dfbdump.c b/devel/directfb/files/patch-tools-dfbdump.c
new file mode 100644
index 000000000000..39e16bad2c66
--- /dev/null
+++ b/devel/directfb/files/patch-tools-dfbdump.c
@@ -0,0 +1,11 @@
+--- tools/dfbdump.c
++++ tools/dfbdump.c
+@@ -66,6 +66,8 @@
+ #include <core/windows_internal.h>
+ #include <core/wm.h>
+ 
++typedef unsigned long ulong;
++
+ static DirectFBPixelFormatNames( format_names );
+ 
+ /**********************************************************************************************************************/
diff --git a/devel/directfb/files/patch-tools-dfbmaster.c b/devel/directfb/files/patch-tools-dfbmaster.c
new file mode 100644
index 000000000000..7649d583f55a
--- /dev/null
+++ b/devel/directfb/files/patch-tools-dfbmaster.c
@@ -0,0 +1,10 @@
+--- tools/dfbmaster.c
++++ tools/dfbmaster.c
+@@ -26,6 +26,7 @@
+ */
+ 
+ #include <config.h>
++#include <signal.h>
+ 
+ #include <direct/messages.h>
+ 
diff --git a/devel/directfb/files/patch-tools-fusion_bench.c b/devel/directfb/files/patch-tools-fusion_bench.c
new file mode 100644
index 000000000000..2970408e1a4b
--- /dev/null
+++ b/devel/directfb/files/patch-tools-fusion_bench.c
@@ -0,0 +1,26 @@
+--- tools/fusion_bench.c
++++ tools/fusion_bench.c
+@@ -336,7 +336,11 @@ static void
+ bench_mutex_threaded( void )
+ {
+      int             i;
++#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+      pthread_mutex_t lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++#else
++     pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
++#endif
+ 
+ 
+      /* mutex lock/unlock (2-5 threads) */
+@@ -367,7 +371,11 @@ static void
+ bench_mutex( void )
+ {
+      pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
++#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+      pthread_mutex_t rmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++#else
++     pthread_mutex_t rmutex = PTHREAD_MUTEX_INITIALIZER;
++#endif
+ 
+ 
+      /* pthread_mutex lock/unlock */
diff --git a/devel/directfb/pkg-plist b/devel/directfb/pkg-plist
index 75749f55640e..3c77a7f42bb6 100644
--- a/devel/directfb/pkg-plist
+++ b/devel/directfb/pkg-plist
@@ -1,15 +1,34 @@
+%%TESTS%%bin/coretest_blit2
 bin/dfbdump
 bin/dfbfx
 bin/dfbg
 bin/dfbinfo
 bin/dfbinput
+bin/dfbinspector
 bin/dfblayer
+bin/dfbmaster
 bin/dfbpenmount
+bin/dfbproxy
 bin/dfbscreen
+%%TESTS%%bin/dfbtest_blit
+%%TESTS%%bin/dfbtest_blit2
+%%TESTS%%bin/dfbtest_mirror
+%%TESTS%%bin/dfbtest_reinit
+%%TESTS%%bin/dfbtest_scale
+%%TESTS%%bin/dfbtest_sync
+%%TESTS%%bin/dfbtest_window
+%%TESTS%%bin/dfbtest_window_flip_once
+%%TESTS%%bin/direct_stream
+%%TESTS%%bin/direct_test
 bin/directfb-config
 bin/directfb-csource
+%%TESTS%%bin/fusion_fork
+%%TESTS%%bin/fusion_reactor
+%%TESTS%%bin/fusion_skirmish
+%%TESTS%%bin/fusion_stream
 bin/mkdfiff
 %%FREETYPE2%%bin/mkdgiff
+%%UNIQUE%%bin/uwmdump
 include/directfb-internal/core/clipboard.h
 include/directfb-internal/core/colorhash.h
 include/directfb-internal/core/core.h
@@ -35,6 +54,7 @@ include/directfb-internal/core/state.h
 include/directfb-internal/core/surface.h
 include/directfb-internal/core/surface_buffer.h
 include/directfb-internal/core/surface_pool.h
+include/directfb-internal/core/surface_pool_bridge.h
 include/directfb-internal/core/system.h
 include/directfb-internal/core/windows.h
 include/directfb-internal/core/windows_internal.h
@@ -117,81 +137,188 @@ include/directfb/fusion/shm/shm_internal.h
 include/directfb/fusion/shmalloc.h
 include/directfb/fusion/types.h
 include/directfb/fusion/vector.h
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/gfxdrivers/libdirectfb_sdlgraphics.a
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/gfxdrivers/libdirectfb_sdlgraphics.la
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/gfxdrivers/libdirectfb_sdlgraphics.so
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/inputdrivers/libdirectfb_sdlinput.a
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/inputdrivers/libdirectfb_sdlinput.la
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/inputdrivers/libdirectfb_sdlinput.so
-%%X11%%lib/directfb-%%DIRECTFB_VER%%/inputdrivers/libdirectfb_x11input.a
-%%X11%%lib/directfb-%%DIRECTFB_VER%%/inputdrivers/libdirectfb_x11input.la
-%%X11%%lib/directfb-%%DIRECTFB_VER%%/inputdrivers/libdirectfb_x11input.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont/libidirectfbfont_default.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont/libidirectfbfont_default.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont/libidirectfbfont_default.so
-%%FREETYPE2%%lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
-%%FREETYPE2%%lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-%%FREETYPE2%%lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_devmem.a
-lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_devmem.la
-lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_devmem.so
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_sdl.a
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_sdl.la
-%%SDL%%lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_sdl.so
-%%X11%%lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_x11.a
-%%X11%%lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_x11.la
-%%X11%%lib/directfb-%%DIRECTFB_VER%%/systems/libdirectfb_x11.so
-lib/directfb-%%DIRECTFB_VER%%/wm/libdirectfbwm_default.a
-lib/directfb-%%DIRECTFB_VER%%/wm/libdirectfbwm_default.la
-lib/directfb-%%DIRECTFB_VER%%/wm/libdirectfbwm_default.so
-lib/libdirect-1.1.so
-lib/libdirect-1.1.so.1
+%%UNIQUE%%include/directfb/unique/context.h
+%%UNIQUE%%include/directfb/unique/decoration.h
+%%UNIQUE%%include/directfb/unique/device.h
+%%UNIQUE%%include/directfb/unique/input_channel.h
+%%UNIQUE%%include/directfb/unique/input_events.h
+%%UNIQUE%%include/directfb/unique/input_switch.h
+%%UNIQUE%%include/directfb/unique/stret.h
+%%UNIQUE%%include/directfb/unique/stret_iteration.h
+%%UNIQUE%%include/directfb/unique/types.h
+%%UNIQUE%%include/directfb/unique/uniquewm.h
+%%UNIQUE%%include/directfb/unique/window.h
+include/directfb/voodoo/build.h
+include/directfb/voodoo/client.h
+include/directfb/voodoo/conf.h
+include/directfb/voodoo/interface.h
+include/directfb/voodoo/manager.h
+include/directfb/voodoo/message.h
+include/directfb/voodoo/server.h
+include/directfb/voodoo/types.h
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.a
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.la
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.so
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.a
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.la
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer/libidirectfbdisplaylayer_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer/libidirectfbdisplaylayer_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer/libidirectfbdisplaylayer_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer/libidirectfbdisplaylayer_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer/libidirectfbdisplaylayer_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer/libidirectfbdisplaylayer_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer/libidirectfbeventbuffer_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer/libidirectfbeventbuffer_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer/libidirectfbeventbuffer_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer/libidirectfbeventbuffer_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer/libidirectfbeventbuffer_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer/libidirectfbeventbuffer_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_default.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_default.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_default.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_dgiff.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_dispatcher.so
+%%FREETYPE2%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
+%%FREETYPE2%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
+%%FREETYPE2%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont/libidirectfbfont_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice/libidirectfbinputdevice_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice/libidirectfbinputdevice_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice/libidirectfbinputdevice_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice/libidirectfbinputdevice_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice/libidirectfbinputdevice_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice/libidirectfbinputdevice_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette/libidirectfbpalette_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette/libidirectfbpalette_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette/libidirectfbpalette_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette/libidirectfbpalette_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette/libidirectfbpalette_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette/libidirectfbpalette_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen/libidirectfbscreen_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen/libidirectfbscreen_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen/libidirectfbscreen_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen/libidirectfbscreen_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen/libidirectfbscreen_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen/libidirectfbscreen_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface/libidirectfbsurface_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface/libidirectfbsurface_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface/libidirectfbsurface_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface/libidirectfbsurface_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface/libidirectfbsurface_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface/libidirectfbsurface_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow/libidirectfbwindow_dispatcher.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow/libidirectfbwindow_dispatcher.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow/libidirectfbwindow_dispatcher.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow/libidirectfbwindow_requestor.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow/libidirectfbwindow_requestor.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow/libidirectfbwindow_requestor.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_devmem.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_devmem.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_devmem.so
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_sdl.a
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_sdl.la
+%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_sdl.so
+%%X11%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_x11.a
+%%X11%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_x11.la
+%%X11%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems/libdirectfb_x11.so
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm/libdirectfbwm_default.a
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm/libdirectfbwm_default.la
+lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm/libdirectfbwm_default.so
+%%UNIQUE%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm/libdirectfbwm_unique.a
+%%UNIQUE%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm/libdirectfbwm_unique.la
+%%UNIQUE%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm/libdirectfbwm_unique.so
+lib/libdirect-%%DIRECTFB_RELEASE%%.so
+lib/libdirect-%%DIRECTFB_RELEASE%%.so.%%DIRECTFB_SHLIB%%
 lib/libdirect.a
 lib/libdirect.la
 lib/libdirect.so
-lib/libdirectfb-1.1.so
-lib/libdirectfb-1.1.so.1
+lib/libdirectfb-%%DIRECTFB_RELEASE%%.so
+lib/libdirectfb-%%DIRECTFB_RELEASE%%.so.%%DIRECTFB_SHLIB%%
 lib/libdirectfb.a
 lib/libdirectfb.la
 lib/libdirectfb.so
-lib/libfusion-1.1.so
-lib/libfusion-1.1.so.1
+lib/libfusion-%%DIRECTFB_RELEASE%%.so
+lib/libfusion-%%DIRECTFB_RELEASE%%.so.%%DIRECTFB_SHLIB%%
 lib/libfusion.a
 lib/libfusion.la
 lib/libfusion.so
+%%UNIQUE%%lib/libuniquewm-%%DIRECTFB_RELEASE%%.so
+%%UNIQUE%%lib/libuniquewm-%%DIRECTFB_RELEASE%%.so.%%DIRECTFB_SHLIB%%
+%%UNIQUE%%lib/libuniquewm.a
+%%UNIQUE%%lib/libuniquewm.la
+%%UNIQUE%%lib/libuniquewm.so
+lib/libvoodoo-%%DIRECTFB_RELEASE%%.so
+lib/libvoodoo-%%DIRECTFB_RELEASE%%.so.%%DIRECTFB_SHLIB%%
+lib/libvoodoo.a
+lib/libvoodoo.la
+lib/libvoodoo.so
 libdata/pkgconfig/direct.pc
 libdata/pkgconfig/directfb-internal.pc
 libdata/pkgconfig/directfb.pc
 libdata/pkgconfig/fusion.pc
+libdata/pkgconfig/voodoo.pc
 %%DATADIR%%-%%DIRECTFB_VERSION%%/cursor.dat
 @dirrm %%DATADIR%%-%%DIRECTFB_VERSION%%
-@dirrm lib/directfb-%%DIRECTFB_VER%%/wm
-@dirrm lib/directfb-%%DIRECTFB_VER%%/systems
-@dirrm lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBVideoProvider
-@dirrm lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBImageProvider
-@dirrm lib/directfb-%%DIRECTFB_VER%%/interfaces/IDirectFBFont
-@dirrm lib/directfb-%%DIRECTFB_VER%%/interfaces
-%%INPUTDRIVERS%%@dirrm lib/directfb-%%DIRECTFB_VER%%/inputdrivers
-%%GFXDRIVERS%%@dirrm lib/directfb-%%DIRECTFB_VER%%/gfxdrivers
-@dirrm lib/directfb-%%DIRECTFB_VER%%
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/wm
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/systems
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBWindow
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBVideoProvider
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBSurface
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBScreen
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBPalette
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBInputDevice
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBImageProvider
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBFont
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBEventBuffer
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDisplayLayer
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces
+%%SDL%%@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers
+%%SDL%%@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers
+@dirrm lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%
+@dirrm include/directfb/voodoo
+%%UNIQUE%%@dirrm include/directfb/unique
 @dirrm include/directfb/fusion/shm
 @dirrm include/directfb/fusion
 @dirrm include/directfb/direct