Attachment #171200 for bug #185885




# $FreeBSD: head/devel/directfb/Makefile 416324 2016-06-03 16:44:58Z antoine $

PORTNAME=	directfb
PORTVERSION=	1.4.17
PORTREVISION=	7
CATEGORIES=	devel
MASTER_SITES=	http://sources.buildroot.net/
DISTNAME=	DirectFB-${PORTVERSION}

MAINTAINER=	anatoly.borodin@gmail.com


LICENSE=	LGPL21

BROKEN=		Does not fetch
DEPRECATED=	Broken for more than 6 months
EXPIRATION_DATE=	2016-07-04
LIB_DEPENDS=	libpng.so:graphics/png

OPTIONS_DEFINE=	FREETYPE X11 SDL UNIQUE TEST DOCS

USE_LDCONFIG=	yes
USE_PERL5=	build
PORTDOCS=	*
EXTRA_PATCHES=	${FILESDIR}/extra-libpng15:-p1

DIRECTFB_SHLIB=	6.0.11	# LT_BINARY.LT_AGE.LT_REVISION
DIRECTFB_BIN=	${DIRECTFB_SHLIB:R:R}	# LT_BINARY
PLIST_SUB+=	DIRECTFB_VERSION="${PORTVERSION}" \
		DIRECTFB_RELEASE="${PORTVERSION:R}" \
		DIRECTFB_SHLIB="${DIRECTFB_SHLIB}" \

FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_ENABLE=	freetype
X11_USE=	XORG=x11,xext,xproto
X11_CONFIGURE_ENABLE=	x11
SDL_USE=	sdl
SDL_CONFIGURE_ENABLE=	sdl
UNIQUE_CONFIGURE_ENABLE=	unique

	@${GREP} -lr alloca\.h ${WRKSRC} | ${XARGS} \
		${REINPLACE_CMD} -e 's|<alloca\.h>|<stdlib.h>|g'

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
.for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)directfb/distinfo (-2 / +2 lines)
1	SHA256 (DirectFB-1.4.13.tar.gz) = ff85ed00ce76c9f6ca7833534c1cbf00358c9a5450dc1649ce3bc283056ab9b5	1	SHA256 (DirectFB-1.4.17.tar.gz) = 065a8e3a655b7e633eb1c2cdf55956496a29e0b8bd8ca700f0a5507909c864de
2	SIZE (DirectFB-1.4.13.tar.gz) = 3113159	2	SIZE (DirectFB-1.4.17.tar.gz) = 3346983




From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 20 Feb 2011 19:18:19 -0500
Subject: [PATCH] png: add support for libpng 1.5.x

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 .../idirectfbimageprovider_png.c                   |   56 ++++++++++++-------
 1 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
index 6d65ea3..7d82c5c 100644
--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
      if (!data->png_ptr)
           goto error;
 
-     if (setjmp( data->png_ptr->jmpbuf )) {
+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
           D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
           goto error;
      }
@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
           rect = dst_data->area.wanted;
      }
 
-     if (setjmp( data->png_ptr->jmpbuf )) {
+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
           D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
 
           if (data->stage < STAGE_IMAGE)
@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
      }
      else {
           CoreSurfaceBufferLock lock;
+          png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
 
           ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
           if (ret)
@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
 
           switch (data->color_type) {
                case PNG_COLOR_TYPE_PALETTE:
-                    if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
+                    if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
                          /*
                           * Special indexed PNG to LUT8 loading.
                           */
@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
                     }
                     else {
                          if (data->color_type == PNG_COLOR_TYPE_GRAY) {
-                              int num = 1 << data->info_ptr->bit_depth;
+                              int num = 1 << bit_depth;
 
                               for (x=0; x<num; x++) {
                                    int value = x * 255 / (num - 1);
@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
                               }
                          }
 
-                         switch (data->info_ptr->bit_depth) {
+                         switch (bit_depth) {
                               case 8:
                                    for (y=0; y<data->height; y++) {
                                         u8  *S = data->image + data->pitch * y;
@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
 
                               default:
                                    D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
-                                            data->info_ptr->bit_depth );
+                                            bit_depth );
                          }
 
                          dfb_scale_linear_32( image_argb, data->width, data->height,
@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
                    NULL, NULL, NULL );
 
      if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
+          png_bytep     trans;
+          png_color_16p trans_color;
+          int           num_trans;
+
+          png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
+
           data->color_keyed = true;
 
           /* generate color key based on palette... */
           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
                u32        key;
-               png_colorp palette    = data->info_ptr->palette;
-               png_bytep  trans      = data->info_ptr->trans_alpha;
-               int        num_colors = MIN( MAXCOLORMAPSIZE,
-                                            data->info_ptr->num_palette );
-               u8         cmap[3][num_colors];
+               png_colorp palette;
+               int        num_colors;
+               u8        *cmap[3];
+
+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
+               cmap[0] = alloca (num_colors);
+               cmap[1] = alloca (num_colors);
+               cmap[2] = alloca (num_colors);
 
                for (i=0; i<num_colors; i++) {
                     cmap[0][i] = palette[i].red;
@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
 
                key = FindColorKey( num_colors, &cmap[0][0] );
 
-               for (i=0; i<data->info_ptr->num_trans; i++) {
+               for (i=0; i<num_trans; i++) {
                     if (!trans[i]) {
                          palette[i].red   = (key & 0xff0000) >> 16;
                          palette[i].green = (key & 0x00ff00) >>  8;
@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
           }
           else {
                /* ...or based on trans rgb value */
-               png_color_16p trans = &data->info_ptr->trans_color;
-
-               data->color_key = (((trans->red & 0xff00) << 8) |
-                                  ((trans->green & 0xff00)) |
-                                  ((trans->blue & 0xff00) >> 8));
+               data->color_key = (((trans_color->red & 0xff00) << 8) |
+                                  ((trans_color->green & 0xff00)) |
+                                  ((trans_color->blue & 0xff00) >> 8));
           }
      }
 
      switch (data->color_type) {
           case PNG_COLOR_TYPE_PALETTE: {
-               png_colorp palette    = data->info_ptr->palette;
-               png_bytep  trans      = data->info_ptr->trans_alpha;
-               int        num_trans  = data->info_ptr->num_trans;
-               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
+               png_colorp    palette;
+               png_bytep     trans;
+               png_color_16p trans_color;
+               int           num_trans;
+               int           num_colors;
+
+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
+               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
 
                for (i=0; i<num_colors; i++) {
                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
-- 
1.7.4.1

From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 20 Feb 2011 19:38:50 -0500
Subject: [PATCH] tools: add support for libpng 1.5.x

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 tools/directfb-csource.c |   20 +++++++++++++-------
 tools/mkdfiff.c          |    2 +-
 tools/mkdgifft.cpp       |    2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
index 8f2cbf0..487ea3c 100644
--- a/tools/directfb-csource.c
+++ b/tools/directfb-csource.c
@@ -338,7 +338,7 @@ static DFBResult load_image (const char            *filename,
      if (!png_ptr)
           goto cleanup;
 
-     if (setjmp (png_ptr->jmpbuf)) {
+     if (setjmp (png_jmpbuf (png_ptr))) {
           if (desc->preallocated[0].data) {
                free (desc->preallocated[0].data);
                desc->preallocated[0].data = NULL;
@@ -405,17 +405,22 @@ static DFBResult load_image (const char            *filename,
        }
 
      switch (src_format) {
-          case DSPF_LUT8:
-               if (info_ptr->num_palette) {
+          case DSPF_LUT8: {
+               png_colorp png_palette;
+               int        num_palette;
+
+               png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
+
+               if (num_palette) {
                     png_byte *alpha;
                     int       i, num;
 
-                    *palette_size = MIN (info_ptr->num_palette, 256);
+                    *palette_size = MIN (num_palette, 256);
                     for (i = 0; i < *palette_size; i++) {
                          palette[i].a = 0xFF;
-                         palette[i].r = info_ptr->palette[i].red;
-                         palette[i].g = info_ptr->palette[i].green;
-                         palette[i].b = info_ptr->palette[i].blue;
+                         palette[i].r = png_palette[i].red;
+                         palette[i].g = png_palette[i].green;
+                         palette[i].b = png_palette[i].blue;
                     }
                     if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
                          png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
@@ -424,6 +429,7 @@ static DFBResult load_image (const char            *filename,
                     }
                }
                break;
+          }
           case DSPF_RGB32:
                 png_set_filler (png_ptr, 0xFF,
 #ifdef WORDS_BIGENDIAN
diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
index 68a3b4f..edb58a7 100644
--- a/tools/mkdfiff.c
+++ b/tools/mkdfiff.c
@@ -97,7 +97,7 @@ load_image (const char            *filename,
      if (!png_ptr)
           goto cleanup;
 
-     if (setjmp (png_ptr->jmpbuf)) {
+     if (setjmp (png_jmpbuf (png_ptr))) {
           if (desc->preallocated[0].data) {
                free (desc->preallocated[0].data);
                desc->preallocated[0].data = NULL;
diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
index 96e4220..d4b6bf4 100644
--- a/tools/mkdgifft.cpp
+++ b/tools/mkdgifft.cpp
@@ -595,7 +595,7 @@ load_image (const char            *filename,
      if (!png_ptr)
           goto cleanup;
 
-     if (setjmp (png_ptr->jmpbuf)) {
+     if (setjmp (png_jmpbuf (png_ptr))) {
           if (desc->preallocated[0].data) {
                free (desc->preallocated[0].data);
                desc->preallocated[0].data = NULL;
-- 
1.7.4.1


Lines 1-6 Link Here

(-)directfb/files/patch-doc_Makefile.in (-3 / +3 lines)
1	--- docs/Makefile.in.orig 2008-06-02 14:05:50.000000000 +0200	1	--- docs/Makefile.in.orig 2012-05-23 13:45:15 UTC
2	+++ docs/Makefile.in 2008-06-02 14:05:58.000000000 +0200	2	+++ docs/Makefile.in
3	@@ -681,7 +681,7 @@	3	@@ -803,7 +803,7 @@ uninstall-man: uninstall-man1 uninstall-
4	@HAVE_MAN2HTML_TRUE@ rm -f $(HTMLMANS)	4	@HAVE_MAN2HTML_TRUE@ rm -f $(HTMLMANS)
5		5
6	@HAVE_MAN2HTML_TRUE@%.html: %	6	@HAVE_MAN2HTML_TRUE@%.html: %

Lines 1-4 Link Here

(-)directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c (-1 / +1 lines)
1	--- gfxdrivers/davinci/davinci_c64x.c	1	--- gfxdrivers/davinci/davinci_c64x.c.orig 2012-05-23 13:43:12 UTC
2	+++ gfxdrivers/davinci/davinci_c64x.c	2	+++ gfxdrivers/davinci/davinci_c64x.c
3	@@ -57,6 +57,8 @@	3	@@ -57,6 +57,8 @@
4	#define C64X_QLEN direct_page_align( sizeof(c64xTaskControl) )	4	#define C64X_QLEN direct_page_align( sizeof(c64xTaskControl) )

Lines 1-10 Link Here

(-)directfb/files/patch-lib-direct-conf.c (-10 lines)
1	--- lib/direct/conf.c
2	+++ lib/direct/conf.c
3	@@ -30,6 +30,7 @@
4
5	#include <stdlib.h>
6	#include <string.h>
7	+#include <signal.h>
8
9	#include <direct/conf.h>
10	#include <direct/mem.h>

Lines 1-4 Link Here

(-)directfb/files/patch-lib-direct-interface.c (-2 / +2 lines)
1	--- lib/direct/interface.c	1	--- lib/direct/interface.c.orig 2016-06-08 05:59:40 UTC
2	+++ lib/direct/interface.c	2	+++ lib/direct/interface.c
3	@@ -71,7 +71,11 @@ typedef struct {	3	@@ -71,7 +71,11 @@ typedef struct {
4	int references;	4	int references;
Lines 11-14 Link Here
11	+#endif	11	+#endif
12	static DirectLink *implementations = NULL;	12	static DirectLink *implementations = NULL;
13		13
14	/**************************************************************************************************/	14	static inline int

Lines 1-6 Link Here

(-)directfb/files/patch-lib-direct-log.c (-3 / +3 lines)
1	--- ./lib/direct/log.c.orig 2010-11-15 22:12:08.000000000 +0100	1	--- lib/direct/log.c.orig 2012-05-23 13:43:12 UTC
2	+++ ./lib/direct/log.c 2010-12-03 16:44:12.000000000 +0100	2	+++ lib/direct/log.c
3	@@ -335,12 +335,14 @@	3	@@ -335,12 +335,14 @@ parse_host_addr( const char *hostp
4	D_ERROR( "Direct/Log: Port %s is unreachable!\n", portstr );	4	D_ERROR( "Direct/Log: Port %s is unreachable!\n", portstr );
5	return DR_FAILURE;	5	return DR_FAILURE;
6		6

Lines 1-6 Link Here

(-)directfb/files/patch-lib-direct-stream.c (-3 / +3 lines)
1	--- lib/direct/stream.c.orig 2007-12-15 14:30:28.000000000 +0200	1	--- lib/direct/stream.c.orig 2012-05-23 13:43:12 UTC
2	+++ lib/direct/stream.c 2008-03-16 14:51:44.000000000 +0200	2	+++ lib/direct/stream.c
3	@@ -429,7 +429,7 @@	3	@@ -429,7 +429,7 @@ net_connect( struct addrinfo *addr, int
4	req.imr_multiaddr.s_addr = saddr->sin_addr.s_addr;	4	req.imr_multiaddr.s_addr = saddr->sin_addr.s_addr;
5	req.imr_interface.s_addr = 0;	5	req.imr_interface.s_addr = 0;
6		6

Lines 1-4 Link Here

(-)directfb/files/patch-lib-direct-trace.c (-1 / +1 lines)
1	--- lib/direct/trace.c	1	--- lib/direct/trace.c.orig 2012-05-23 13:43:12 UTC
2	+++ lib/direct/trace.c	2	+++ lib/direct/trace.c
3	@@ -90,7 +90,7 @@ struct __D_DirectTraceBuffer {	3	@@ -90,7 +90,7 @@ struct __D_DirectTraceBuffer {
4		4

Lines 1-4 Link Here

(-)directfb/files/patch-lib-fusion-call.c (-1 / +1 lines)
1	--- lib/fusion/call.c	1	--- lib/fusion/call.c.orig 2012-05-23 13:43:12 UTC
2	+++ lib/fusion/call.c	2	+++ lib/fusion/call.c
3	@@ -31,6 +31,7 @@	3	@@ -31,6 +31,7 @@
4	#include <stdio.h>	4	#include <stdio.h>

Lines 1-6 Link Here

(-)directfb/files/patch-lib-fusion-lock.c (-2 / +2 lines)
1	--- lib/fusion/lock.c	1	--- lib/fusion/lock.c.orig 2012-05-23 13:43:12 UTC
2	+++ lib/fusion/lock.c	2	+++ lib/fusion/lock.c
3	@@ -485,7 +485,7 @@ fusion_skirmish_wait( FusionSkirmish *skirmish, unsigned int timeout )	3	@@ -646,7 +646,7 @@ fusion_skirmish_wait( FusionSkirmish *sk
4		4
5	/* Install a (fake) signal handler for SIGRESTART. */	5	/* Install a (fake) signal handler for SIGRESTART. */
6	act.sa_handler = restart_handler;	6	act.sa_handler = restart_handler;

Lines 1-4 Link Here

(-)directfb/files/patch-lib-fusion-shm-shm.c (-1 / +1 lines)
1	--- lib/fusion/shm/shm.c	1	--- lib/fusion/shm/shm.c.orig 2012-05-23 13:43:12 UTC
2	+++ lib/fusion/shm/shm.c	2	+++ lib/fusion/shm/shm.c
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@
4	#include <sys/param.h>	4	#include <sys/param.h>

Lines 1-4 Link Here

(-)directfb/files/patch-lib-fusion-shmalloc.c (-1 / +1 lines)
1	--- lib/fusion/shmalloc.c	1	--- lib/fusion/shmalloc.c.orig 2012-05-23 13:43:12 UTC
2	+++ lib/fusion/shmalloc.c	2	+++ lib/fusion/shmalloc.c
3	@@ -52,6 +52,8 @@	3	@@ -52,6 +52,8 @@
4		4

Lines 1-6 Link Here

(-)directfb/files/patch-lib-voodoo-client.c (-3 / +3 lines)
1	--- ./lib/voodoo/client.c.orig 2010-11-15 22:13:05.000000000 +0100	1	--- lib/voodoo/client.c.orig 2012-05-23 13:43:12 UTC
2	+++ ./lib/voodoo/client.c 2010-12-03 16:44:12.000000000 +0100	2	+++ lib/voodoo/client.c
3	@@ -161,12 +161,14 @@	3	@@ -164,12 +164,14 @@ voodoo_client_create( const char *ho
4	D_ERROR( "Direct/Log: Service is unreachable!\n" );	4	D_ERROR( "Direct/Log: Service is unreachable!\n" );
5	return DR_FAILURE;	5	return DR_FAILURE;
6		6

Lines 1-5 Link Here

(-)directfb/files/patch-lib-voodoo-manager.c (-3 / +3 lines)
1	--- ./lib/voodoo/manager.c.orig 2010-11-02 00:11:20.000000000 +0100	1	--- lib/voodoo/manager.c.orig 2012-05-23 13:43:12 UTC
2	+++ ./lib/voodoo/manager.c 2010-12-03 16:44:12.000000000 +0100	2	+++ lib/voodoo/manager.c
3	@@ -41,6 +41,7 @@	3	@@ -41,6 +41,7 @@
4	#include <sys/socket.h>	4	#include <sys/socket.h>
5	#include <sys/time.h>	5	#include <sys/time.h>
Lines 8-14 Link Here
8	#include <netinet/in.h>	8	#include <netinet/in.h>
9	#if !VOODOO_BUILD_NO_SETSOCKOPT	9	#if !VOODOO_BUILD_NO_SETSOCKOPT
10	#include <netinet/ip.h>	10	#include <netinet/ip.h>
11	@@ -193,10 +194,10 @@	11	@@ -193,10 +194,10 @@ voodoo_manager_create( int f
12	D_DEBUG( "Voodoo/Manager: Creating manager at %p.\n", manager );	12	D_DEBUG( "Voodoo/Manager: Creating manager at %p.\n", manager );
13		13
14	#if !VOODOO_BUILD_NO_SETSOCKOPT	14	#if !VOODOO_BUILD_NO_SETSOCKOPT

Lines 1-11 Link Here

(-)directfb/files/patch-src-gfx-generic-generic.c (-11 lines)
1	--- src/gfx/generic/generic.c
2	+++ src/gfx/generic/generic.c
3	@@ -63,6 +63,8 @@
4	#include "duffs_device.h"
5
6
7	+typedef unsigned long ulong;
8	+
9	/* lookup tables for 2/3bit to 8bit color conversion */
10	static const u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff};
11	static const u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff};

Lines 1-5 Link Here

(-)directfb/files/patch-src__gfx__generic__generic_stretch_blit.c (-2 / +2 lines)
1	--- ./src/gfx/generic/generic_stretch_blit.c.orig 2011-06-18 23:08:07.000000000 +0200	1	--- src/gfx/generic/generic_stretch_blit.c.orig 2012-05-23 13:43:12 UTC
2	+++ ./src/gfx/generic/generic_stretch_blit.c 2011-06-18 23:08:13.000000000 +0200	2	+++ src/gfx/generic/generic_stretch_blit.c
3	@@ -72,6 +72,8 @@	3	@@ -72,6 +72,8 @@
4		4
5	#if DFB_SMOOTH_SCALING	5	#if DFB_SMOOTH_SCALING

Lines 1-10 Link Here

(-)directfb/files/patch-tests-dfbtest_window.c (-10 lines)
1	--- tests/dfbtest_window.c
2	+++ tests/dfbtest_window.c
3	@@ -41,6 +41,7 @@
4	#include <stdlib.h>
5	#include <string.h>
6	#include <unistd.h>
7	+#include <signal.h>
8
9	#include <direct/messages.h>
10	#include <direct/util.h>

Lines 1-5 Link Here

(-)directfb/files/patch-tests__voodoo__voodoo_test.h (-2 / +2 lines)
1	--- ./tests/voodoo/voodoo_test.h.orig 2010-12-03 16:44:12.000000000 +0100	1	--- tests/voodoo/voodoo_test.h.orig 2016-06-08 05:59:40 UTC
2	+++ ./tests/voodoo/voodoo_test.h 2010-12-03 16:44:12.000000000 +0100	2	+++ tests/voodoo/voodoo_test.h
3	@@ -0,0 +1,10 @@	3	@@ -0,0 +1,10 @@
4	+#ifndef __VOODOO_TEST_H__	4	+#ifndef __VOODOO_TEST_H__
5	+#define __VOODOO_TEST_H__	5	+#define __VOODOO_TEST_H__

Lines 1-6 Link Here

(-)directfb/files/patch-tools-dfbdump.c (-2 / +2 lines)
1	--- tools/dfbdump.c	1	--- tools/dfbdump.c.orig 2012-05-23 13:43:12 UTC
2	+++ tools/dfbdump.c	2	+++ tools/dfbdump.c
3	@@ -66,6 +66,8 @@	3	@@ -68,6 +68,8 @@
4	#include <core/windows_internal.h>	4	#include <core/windows_internal.h>
5	#include <core/wm.h>	5	#include <core/wm.h>
6		6

Lines 1-10 Link Here

(-)directfb/files/patch-tools-dfbmaster.c (-10 lines)
1	--- tools/dfbmaster.c
2	+++ tools/dfbmaster.c
3	@@ -26,6 +26,7 @@
4	*/
5
6	#include <config.h>
7	+#include <signal.h>
8
9	#include <direct/messages.h>
10




%%TEST%%bin/dfbtest_fillrect
%%TEST%%bin/dfbtest_font
%%TEST%%bin/dfbtest_mirror
%%TEST%%bin/dfbtest_prealloc
%%TEST%%bin/dfbtest_reinit
%%TEST%%bin/dfbtest_resize
%%TEST%%bin/dfbtest_scale
%%TEST%%bin/dfbtest_sync
%%TEST%%bin/dfbtest_window
%%TEST%%bin/dfbtest_window_cursor
%%TEST%%bin/dfbtest_window_flip_once
%%TEST%%bin/dfbtest_window_surface
%%TEST%%bin/direct_stream
%%TEST%%bin/direct_test
bin/directfb-config

bin/mkdgifft
%%UNIQUE%%bin/uwmdump
bin/voodooplay
include/directfb-internal/core/CoreDFB.h
include/directfb-internal/core/CoreDFB_CallMode.h
include/directfb-internal/core/CoreDFB_includes.h
include/directfb-internal/core/CoreGraphicsState.h
include/directfb-internal/core/CoreGraphicsStateClient.h
include/directfb-internal/core/CoreGraphicsState_includes.h
include/directfb-internal/core/CoreInputDevice.h
include/directfb-internal/core/CoreInputDevice_includes.h
include/directfb-internal/core/CoreLayer.h
include/directfb-internal/core/CoreLayerContext.h
include/directfb-internal/core/CoreLayerContext_includes.h
include/directfb-internal/core/CoreLayerRegion.h
include/directfb-internal/core/CoreLayerRegion_includes.h
include/directfb-internal/core/CoreLayer_includes.h
include/directfb-internal/core/CorePalette.h
include/directfb-internal/core/CorePalette_includes.h
include/directfb-internal/core/CoreScreen.h
include/directfb-internal/core/CoreScreen_includes.h
include/directfb-internal/core/CoreSlave.h
include/directfb-internal/core/CoreSlave_includes.h
include/directfb-internal/core/CoreSurface.h
include/directfb-internal/core/CoreSurface_includes.h
include/directfb-internal/core/CoreWindow.h
include/directfb-internal/core/CoreWindowStack.h
include/directfb-internal/core/CoreWindowStack_includes.h
include/directfb-internal/core/CoreWindow_includes.h
include/directfb-internal/core/Interface.h
include/directfb-internal/core/clipboard.h
include/directfb-internal/core/colorhash.h
include/directfb-internal/core/core.h

include/directfb-internal/core/fonts.h
include/directfb-internal/core/gfxcard.h
include/directfb-internal/core/graphics_driver.h
include/directfb-internal/core/graphics_state.h
include/directfb-internal/core/input.h
include/directfb-internal/core/input_driver.h
include/directfb-internal/core/layer_context.h

include/directfb-internal/core/screens_internal.h
include/directfb-internal/core/state.h
include/directfb-internal/core/surface.h
include/directfb-internal/core/surface_allocation.h
include/directfb-internal/core/surface_buffer.h
include/directfb-internal/core/surface_core.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/input/idirectfbinputbuffer.h
include/directfb-internal/input/idirectfbinputdevice.h
include/directfb-internal/media/idirectfbdatabuffer.h
include/directfb-internal/media/idirectfbdatabuffer_client.h
include/directfb-internal/media/idirectfbfont.h
include/directfb-internal/media/idirectfbimageprovider.h
include/directfb-internal/media/idirectfbimageprovider_client.h
include/directfb-internal/media/idirectfbvideoprovider.h
include/directfb-internal/misc/conf.h
include/directfb-internal/misc/gfx_util.h

include/directfb/direct/memcpy.h
include/directfb/direct/messages.h
include/directfb/direct/modules.h
include/directfb/direct/mutex.h
%%ARCH_POWERPC%%include/directfb/direct/ppc_asm.h
%%ARCH_POWERPC%%include/directfb/direct/ppcasm_memcpy.h
include/directfb/direct/serial.h

include/directfb/voodoo/types.h
%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.so
%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.so
lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.so
lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.so
lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.so

Return to bug 185885

Lines 2-11 Link Here

(-)directfb/Makefile (-11 / +6 lines)
2	# $FreeBSD: head/devel/directfb/Makefile 416324 2016-06-03 16:44:58Z antoine $	2	# $FreeBSD: head/devel/directfb/Makefile 416324 2016-06-03 16:44:58Z antoine $
3		3
4	PORTNAME= directfb	4	PORTNAME= directfb
5	PORTVERSION= 1.4.13	5	PORTVERSION= 1.4.17
6	PORTREVISION= 7
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/	7	MASTER_SITES= http://sources.buildroot.net/
9	DISTNAME= DirectFB-${PORTVERSION}	8	DISTNAME= DirectFB-${PORTVERSION}
10		9
11	MAINTAINER= anatoly.borodin@gmail.com	10	MAINTAINER= anatoly.borodin@gmail.com
Lines 13-21 Link Here
13		12
14	LICENSE= LGPL21	13	LICENSE= LGPL21
15		14
16	BROKEN= Does not fetch
17	DEPRECATED= Broken for more than 6 months
18	EXPIRATION_DATE= 2016-07-04
19	LIB_DEPENDS= libpng.so:graphics/png	15	LIB_DEPENDS= libpng.so:graphics/png
20		16
21	OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST DOCS	17	OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST DOCS
Lines 31-40 Link Here
31	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
32	USE_PERL5= build	28	USE_PERL5= build
33	PORTDOCS= *	29	PORTDOCS= *
34	EXTRA_PATCHES= ${FILESDIR}/extra-libpng15:-p1
35		30
36	DIRECTFB_SHLIB= 5.0.8 # LT_BINARY.LT_AGE.LT_REVISION	31	DIRECTFB_SHLIB= 6.0.11 # LT_BINARY.LT_AGE.LT_REVISION
37	DIRECTFB_BIN= 5 # LT_BINARY	32	DIRECTFB_BIN= ${DIRECTFB_SHLIB:R:R} # LT_BINARY
38	PLIST_SUB+= DIRECTFB_VERSION="${PORTVERSION}" \	33	PLIST_SUB+= DIRECTFB_VERSION="${PORTVERSION}" \
39	DIRECTFB_RELEASE="${PORTVERSION:R}" \	34	DIRECTFB_RELEASE="${PORTVERSION:R}" \
40	DIRECTFB_SHLIB="${DIRECTFB_SHLIB}" \	35	DIRECTFB_SHLIB="${DIRECTFB_SHLIB}" \
Lines 55-61 Link Here
55	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	50	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
56	FREETYPE_CONFIGURE_ENABLE= freetype	51	FREETYPE_CONFIGURE_ENABLE= freetype
57	X11_USE= XORG=x11,xext,xproto	52	X11_USE= XORG=x11,xext,xproto
58	X11_CONFIGURE_ENABLE= --x11	53	X11_CONFIGURE_ENABLE= x11
59	SDL_USE= sdl	54	SDL_USE= sdl
60	SDL_CONFIGURE_ENABLE= sdl	55	SDL_CONFIGURE_ENABLE= sdl
61	UNIQUE_CONFIGURE_ENABLE= unique	56	UNIQUE_CONFIGURE_ENABLE= unique
Lines 83-89 Link Here
83	@${GREP} -lr alloca\.h ${WRKSRC} \| ${XARGS} \	78	@${GREP} -lr alloca\.h ${WRKSRC} \| ${XARGS} \
84	${REINPLACE_CMD} -e 's\|<alloca\.h>\|<stdlib.h>\|g'	79	${REINPLACE_CMD} -e 's\|<alloca\.h>\|<stdlib.h>\|g'
85		80
86	post-install:	81	post-install-DOCS-on:
87	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html	82	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
88	.for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html	83	.for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html
89	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}	84	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}

Lines 1-244 Link Here

(-)directfb/files/extra-libpng15 (-244 lines)
1	From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
2	From: Mike Frysinger <vapier@gentoo.org>
3	Date: Sun, 20 Feb 2011 19:18:19 -0500
4	Subject: [PATCH] png: add support for libpng 1.5.x
5
6	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
7	---
8	.../idirectfbimageprovider_png.c \| 56 ++++++++++++-------
9	1 files changed, 35 insertions(+), 21 deletions(-)
10
11	diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
12	index 6d65ea3..7d82c5c 100644
13	--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
14	+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
15	@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
16	if (!data->png_ptr)
17	goto error;
18
19	- if (setjmp( data->png_ptr->jmpbuf )) {
20	+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
21	D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
22	goto error;
23	}
24	@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
25	rect = dst_data->area.wanted;
26	}
27
28	- if (setjmp( data->png_ptr->jmpbuf )) {
29	+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
30	D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
31
32	if (data->stage < STAGE_IMAGE)
33	@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
34	}
35	else {
36	CoreSurfaceBufferLock lock;
37	+ png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
38
39	ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
40	if (ret)
41	@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
42
43	switch (data->color_type) {
44	case PNG_COLOR_TYPE_PALETTE:
45	- if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
46	+ if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
47	/*
48	* Special indexed PNG to LUT8 loading.
49	*/
50	@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
51	}
52	else {
53	if (data->color_type == PNG_COLOR_TYPE_GRAY) {
54	- int num = 1 << data->info_ptr->bit_depth;
55	+ int num = 1 << bit_depth;
56
57	for (x=0; x<num; x++) {
58	int value = x * 255 / (num - 1);
59	@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
60	}
61	}
62
63	- switch (data->info_ptr->bit_depth) {
64	+ switch (bit_depth) {
65	case 8:
66	for (y=0; y<data->height; y++) {
67	u8 S = data->image + data->pitch y;
68	@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
69
70	default:
71	D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
72	- data->info_ptr->bit_depth );
73	+ bit_depth );
74	}
75
76	dfb_scale_linear_32( image_argb, data->width, data->height,
77	@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
78	NULL, NULL, NULL );
79
80	if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
81	+ png_bytep trans;
82	+ png_color_16p trans_color;
83	+ int num_trans;
84	+
85	+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
86	+
87	data->color_keyed = true;
88
89	/* generate color key based on palette... */
90	if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
91	u32 key;
92	- png_colorp palette = data->info_ptr->palette;
93	- png_bytep trans = data->info_ptr->trans_alpha;
94	- int num_colors = MIN( MAXCOLORMAPSIZE,
95	- data->info_ptr->num_palette );
96	- u8 cmap[3][num_colors];
97	+ png_colorp palette;
98	+ int num_colors;
99	+ u8 *cmap[3];
100	+
101	+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
102	+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
103	+ cmap[0] = alloca (num_colors);
104	+ cmap[1] = alloca (num_colors);
105	+ cmap[2] = alloca (num_colors);
106
107	for (i=0; i<num_colors; i++) {
108	cmap[0][i] = palette[i].red;
109	@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
110
111	key = FindColorKey( num_colors, &cmap[0][0] );
112
113	- for (i=0; i<data->info_ptr->num_trans; i++) {
114	+ for (i=0; i<num_trans; i++) {
115	if (!trans[i]) {
116	palette[i].red = (key & 0xff0000) >> 16;
117	palette[i].green = (key & 0x00ff00) >> 8;
118	@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
119	}
120	else {
121	/* ...or based on trans rgb value */
122	- png_color_16p trans = &data->info_ptr->trans_color;
123	-
124	- data->color_key = (((trans->red & 0xff00) << 8) \|
125	- ((trans->green & 0xff00)) \|
126	- ((trans->blue & 0xff00) >> 8));
127	+ data->color_key = (((trans_color->red & 0xff00) << 8) \|
128	+ ((trans_color->green & 0xff00)) \|
129	+ ((trans_color->blue & 0xff00) >> 8));
130	}
131	}
132
133	switch (data->color_type) {
134	case PNG_COLOR_TYPE_PALETTE: {
135	- png_colorp palette = data->info_ptr->palette;
136	- png_bytep trans = data->info_ptr->trans_alpha;
137	- int num_trans = data->info_ptr->num_trans;
138	- int num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
139	+ png_colorp palette;
140	+ png_bytep trans;
141	+ png_color_16p trans_color;
142	+ int num_trans;
143	+ int num_colors;
144	+
145	+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
146	+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
147	+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
148
149	for (i=0; i<num_colors; i++) {
150	data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
151	--
152	1.7.4.1
153
154	From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
155	From: Mike Frysinger <vapier@gentoo.org>
156	Date: Sun, 20 Feb 2011 19:38:50 -0500
157	Subject: [PATCH] tools: add support for libpng 1.5.x
158
159	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
160	---
161	tools/directfb-csource.c \| 20 +++++++++++++-------
162	tools/mkdfiff.c \| 2 +-
163	tools/mkdgifft.cpp \| 2 +-
164	3 files changed, 15 insertions(+), 9 deletions(-)
165
166	diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
167	index 8f2cbf0..487ea3c 100644
168	--- a/tools/directfb-csource.c
169	+++ b/tools/directfb-csource.c
170	@@ -338,7 +338,7 @@ static DFBResult load_image (const char *filename,
171	if (!png_ptr)
172	goto cleanup;
173
174	- if (setjmp (png_ptr->jmpbuf)) {
175	+ if (setjmp (png_jmpbuf (png_ptr))) {
176	if (desc->preallocated[0].data) {
177	free (desc->preallocated[0].data);
178	desc->preallocated[0].data = NULL;
179	@@ -405,17 +405,22 @@ static DFBResult load_image (const char *filename,
180	}
181
182	switch (src_format) {
183	- case DSPF_LUT8:
184	- if (info_ptr->num_palette) {
185	+ case DSPF_LUT8: {
186	+ png_colorp png_palette;
187	+ int num_palette;
188	+
189	+ png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
190	+
191	+ if (num_palette) {
192	png_byte *alpha;
193	int i, num;
194
195	- *palette_size = MIN (info_ptr->num_palette, 256);
196	+ *palette_size = MIN (num_palette, 256);
197	for (i = 0; i < *palette_size; i++) {
198	palette[i].a = 0xFF;
199	- palette[i].r = info_ptr->palette[i].red;
200	- palette[i].g = info_ptr->palette[i].green;
201	- palette[i].b = info_ptr->palette[i].blue;
202	+ palette[i].r = png_palette[i].red;
203	+ palette[i].g = png_palette[i].green;
204	+ palette[i].b = png_palette[i].blue;
205	}
206	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
207	png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
208	@@ -424,6 +429,7 @@ static DFBResult load_image (const char *filename,
209	}
210	}
211	break;
212	+ }
213	case DSPF_RGB32:
214	png_set_filler (png_ptr, 0xFF,
215	#ifdef WORDS_BIGENDIAN
216	diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
217	index 68a3b4f..edb58a7 100644
218	--- a/tools/mkdfiff.c
219	+++ b/tools/mkdfiff.c
220	@@ -97,7 +97,7 @@ load_image (const char *filename,
221	if (!png_ptr)
222	goto cleanup;
223
224	- if (setjmp (png_ptr->jmpbuf)) {
225	+ if (setjmp (png_jmpbuf (png_ptr))) {
226	if (desc->preallocated[0].data) {
227	free (desc->preallocated[0].data);
228	desc->preallocated[0].data = NULL;
229	diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
230	index 96e4220..d4b6bf4 100644
231	--- a/tools/mkdgifft.cpp
232	+++ b/tools/mkdgifft.cpp
233	@@ -595,7 +595,7 @@ load_image (const char *filename,
234	if (!png_ptr)
235	goto cleanup;
236
237	- if (setjmp (png_ptr->jmpbuf)) {
238	+ if (setjmp (png_jmpbuf (png_ptr))) {
239	if (desc->preallocated[0].data) {
240	free (desc->preallocated[0].data);
241	desc->preallocated[0].data = NULL;
242	--
243	1.7.4.1
244

Lines 15-25 Link Here

(-)directfb/pkg-plist (+38 lines)
15	%%TEST%%bin/dfbtest_fillrect	15	%%TEST%%bin/dfbtest_fillrect
16	%%TEST%%bin/dfbtest_font	16	%%TEST%%bin/dfbtest_font
17	%%TEST%%bin/dfbtest_mirror	17	%%TEST%%bin/dfbtest_mirror
		18	%%TEST%%bin/dfbtest_prealloc
18	%%TEST%%bin/dfbtest_reinit	19	%%TEST%%bin/dfbtest_reinit
		20	%%TEST%%bin/dfbtest_resize
19	%%TEST%%bin/dfbtest_scale	21	%%TEST%%bin/dfbtest_scale
20	%%TEST%%bin/dfbtest_sync	22	%%TEST%%bin/dfbtest_sync
21	%%TEST%%bin/dfbtest_window	23	%%TEST%%bin/dfbtest_window
		24	%%TEST%%bin/dfbtest_window_cursor
22	%%TEST%%bin/dfbtest_window_flip_once	25	%%TEST%%bin/dfbtest_window_flip_once
		26	%%TEST%%bin/dfbtest_window_surface
23	%%TEST%%bin/direct_stream	27	%%TEST%%bin/direct_stream
24	%%TEST%%bin/direct_test	28	%%TEST%%bin/direct_test
25	bin/directfb-config	29	bin/directfb-config
Lines 34-39 Link Here
34	bin/mkdgifft	38	bin/mkdgifft
35	%%UNIQUE%%bin/uwmdump	39	%%UNIQUE%%bin/uwmdump
36	bin/voodooplay	40	bin/voodooplay
		41	include/directfb-internal/core/CoreDFB.h
		42	include/directfb-internal/core/CoreDFB_CallMode.h
		43	include/directfb-internal/core/CoreDFB_includes.h
		44	include/directfb-internal/core/CoreGraphicsState.h
		45	include/directfb-internal/core/CoreGraphicsStateClient.h
		46	include/directfb-internal/core/CoreGraphicsState_includes.h
		47	include/directfb-internal/core/CoreInputDevice.h
		48	include/directfb-internal/core/CoreInputDevice_includes.h
		49	include/directfb-internal/core/CoreLayer.h
		50	include/directfb-internal/core/CoreLayerContext.h
		51	include/directfb-internal/core/CoreLayerContext_includes.h
		52	include/directfb-internal/core/CoreLayerRegion.h
		53	include/directfb-internal/core/CoreLayerRegion_includes.h
		54	include/directfb-internal/core/CoreLayer_includes.h
		55	include/directfb-internal/core/CorePalette.h
		56	include/directfb-internal/core/CorePalette_includes.h
		57	include/directfb-internal/core/CoreScreen.h
		58	include/directfb-internal/core/CoreScreen_includes.h
		59	include/directfb-internal/core/CoreSlave.h
		60	include/directfb-internal/core/CoreSlave_includes.h
		61	include/directfb-internal/core/CoreSurface.h
		62	include/directfb-internal/core/CoreSurface_includes.h
		63	include/directfb-internal/core/CoreWindow.h
		64	include/directfb-internal/core/CoreWindowStack.h
		65	include/directfb-internal/core/CoreWindowStack_includes.h
		66	include/directfb-internal/core/CoreWindow_includes.h
		67	include/directfb-internal/core/Interface.h
37	include/directfb-internal/core/clipboard.h	68	include/directfb-internal/core/clipboard.h
38	include/directfb-internal/core/colorhash.h	69	include/directfb-internal/core/colorhash.h
39	include/directfb-internal/core/core.h	70	include/directfb-internal/core/core.h
Lines 44-49 Link Here
44	include/directfb-internal/core/fonts.h	75	include/directfb-internal/core/fonts.h
45	include/directfb-internal/core/gfxcard.h	76	include/directfb-internal/core/gfxcard.h
46	include/directfb-internal/core/graphics_driver.h	77	include/directfb-internal/core/graphics_driver.h
		78	include/directfb-internal/core/graphics_state.h
47	include/directfb-internal/core/input.h	79	include/directfb-internal/core/input.h
48	include/directfb-internal/core/input_driver.h	80	include/directfb-internal/core/input_driver.h
49	include/directfb-internal/core/layer_context.h	81	include/directfb-internal/core/layer_context.h
Lines 57-63 Link Here
57	include/directfb-internal/core/screens_internal.h	89	include/directfb-internal/core/screens_internal.h
58	include/directfb-internal/core/state.h	90	include/directfb-internal/core/state.h
59	include/directfb-internal/core/surface.h	91	include/directfb-internal/core/surface.h
		92	include/directfb-internal/core/surface_allocation.h
60	include/directfb-internal/core/surface_buffer.h	93	include/directfb-internal/core/surface_buffer.h
		94	include/directfb-internal/core/surface_core.h
61	include/directfb-internal/core/surface_pool.h	95	include/directfb-internal/core/surface_pool.h
62	include/directfb-internal/core/surface_pool_bridge.h	96	include/directfb-internal/core/surface_pool_bridge.h
63	include/directfb-internal/core/system.h	97	include/directfb-internal/core/system.h
Lines 83-90 Link Here
83	include/directfb-internal/input/idirectfbinputbuffer.h	117	include/directfb-internal/input/idirectfbinputbuffer.h
84	include/directfb-internal/input/idirectfbinputdevice.h	118	include/directfb-internal/input/idirectfbinputdevice.h
85	include/directfb-internal/media/idirectfbdatabuffer.h	119	include/directfb-internal/media/idirectfbdatabuffer.h
		120	include/directfb-internal/media/idirectfbdatabuffer_client.h
86	include/directfb-internal/media/idirectfbfont.h	121	include/directfb-internal/media/idirectfbfont.h
87	include/directfb-internal/media/idirectfbimageprovider.h	122	include/directfb-internal/media/idirectfbimageprovider.h
		123	include/directfb-internal/media/idirectfbimageprovider_client.h
88	include/directfb-internal/media/idirectfbvideoprovider.h	124	include/directfb-internal/media/idirectfbvideoprovider.h
89	include/directfb-internal/misc/conf.h	125	include/directfb-internal/misc/conf.h
90	include/directfb-internal/misc/gfx_util.h	126	include/directfb-internal/misc/gfx_util.h
Lines 109-114 Link Here
109	include/directfb/direct/memcpy.h	145	include/directfb/direct/memcpy.h
110	include/directfb/direct/messages.h	146	include/directfb/direct/messages.h
111	include/directfb/direct/modules.h	147	include/directfb/direct/modules.h
		148	include/directfb/direct/mutex.h
112	%%ARCH_POWERPC%%include/directfb/direct/ppc_asm.h	149	%%ARCH_POWERPC%%include/directfb/direct/ppc_asm.h
113	%%ARCH_POWERPC%%include/directfb/direct/ppcasm_memcpy.h	150	%%ARCH_POWERPC%%include/directfb/direct/ppcasm_memcpy.h
114	include/directfb/direct/serial.h	151	include/directfb/direct/serial.h
Lines 170-175 Link Here
170	include/directfb/voodoo/types.h	207	include/directfb/voodoo/types.h
171	%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.so	208	%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.so
172	%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.so	209	%%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.so
		210	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
173	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.so	211	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.so
174	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.so	212	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.so
175	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.so	213	lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.so