diff options
23 files changed, 76 insertions, 328 deletions
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index a41bfde609a2..ed4bb50f55d3 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= directfb -PORTVERSION= 1.4.13 -PORTREVISION= 7 +PORTVERSION= 1.4.17 CATEGORIES= devel -MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/ +MASTER_SITES= http://sources.buildroot.net/ DISTNAME= DirectFB-${PORTVERSION} MAINTAINER= anatoly.borodin@gmail.com @@ -13,9 +12,6 @@ COMMENT= Graphic development lightweight API 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 @@ -31,10 +27,9 @@ USES= cpe gmake jpeg libtool ncurses pathfix perl5 pkgconfig USE_LDCONFIG= yes USE_PERL5= build PORTDOCS= * -EXTRA_PATCHES= ${FILESDIR}/extra-libpng15:-p1 -DIRECTFB_SHLIB= 5.0.8 # LT_BINARY.LT_AGE.LT_REVISION -DIRECTFB_BIN= 5 # LT_BINARY +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}" \ @@ -55,7 +50,7 @@ DOCS_BUILD_DEPENDS= man2html:textproc/man2html FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype X11_USE= XORG=x11,xext,xproto -X11_CONFIGURE_ENABLE= --x11 +X11_CONFIGURE_ENABLE= x11 SDL_USE= sdl SDL_CONFIGURE_ENABLE= sdl UNIQUE_CONFIGURE_ENABLE= unique @@ -83,7 +78,7 @@ post-patch: @${GREP} -lr alloca\.h ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -e 's|<alloca\.h>|<stdlib.h>|g' -post-install: +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} diff --git a/devel/directfb/distinfo b/devel/directfb/distinfo index e9e7773a909f..5eabfcd3f2af 100644 --- a/devel/directfb/distinfo +++ b/devel/directfb/distinfo @@ -1,2 +1,2 @@ -SHA256 (DirectFB-1.4.13.tar.gz) = ff85ed00ce76c9f6ca7833534c1cbf00358c9a5450dc1649ce3bc283056ab9b5 -SIZE (DirectFB-1.4.13.tar.gz) = 3113159 +SHA256 (DirectFB-1.4.17.tar.gz) = 065a8e3a655b7e633eb1c2cdf55956496a29e0b8bd8ca700f0a5507909c864de +SIZE (DirectFB-1.4.17.tar.gz) = 3346983 diff --git a/devel/directfb/files/extra-libpng15 b/devel/directfb/files/extra-libpng15 deleted file mode 100644 index e428afbaf7c3..000000000000 --- a/devel/directfb/files/extra-libpng15 +++ /dev/null @@ -1,244 +0,0 @@ -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 - diff --git a/devel/directfb/files/patch-doc_Makefile.in b/devel/directfb/files/patch-doc_Makefile.in index 403a43ecd8b1..a649fb7e81da 100644 --- a/devel/directfb/files/patch-doc_Makefile.in +++ b/devel/directfb/files/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig 2008-06-02 14:05:50.000000000 +0200 -+++ docs/Makefile.in 2008-06-02 14:05:58.000000000 +0200 -@@ -681,7 +681,7 @@ +--- docs/Makefile.in.orig 2012-05-23 13:45:15 UTC ++++ docs/Makefile.in +@@ -803,7 +803,7 @@ uninstall-man: uninstall-man1 uninstall- @HAVE_MAN2HTML_TRUE@ rm -f $(HTMLMANS) @HAVE_MAN2HTML_TRUE@%.html: % diff --git a/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c b/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c index 59ee963f87c3..69d8e33bce87 100644 --- a/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c +++ b/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c @@ -1,4 +1,4 @@ ---- gfxdrivers/davinci/davinci_c64x.c +--- gfxdrivers/davinci/davinci_c64x.c.orig 2012-05-23 13:43:12 UTC +++ gfxdrivers/davinci/davinci_c64x.c @@ -57,6 +57,8 @@ #define C64X_QLEN direct_page_align( sizeof(c64xTaskControl) ) diff --git a/devel/directfb/files/patch-lib-direct-conf.c b/devel/directfb/files/patch-lib-direct-conf.c deleted file mode 100644 index c0cdf6df54b2..000000000000 --- a/devel/directfb/files/patch-lib-direct-conf.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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> diff --git a/devel/directfb/files/patch-lib-direct-interface.c b/devel/directfb/files/patch-lib-direct-interface.c index b4ae4081e22f..f2de2e59fb30 100644 --- a/devel/directfb/files/patch-lib-direct-interface.c +++ b/devel/directfb/files/patch-lib-direct-interface.c @@ -1,4 +1,4 @@ ---- lib/direct/interface.c +--- lib/direct/interface.c.orig 2016-06-08 05:59:40 UTC +++ lib/direct/interface.c @@ -71,7 +71,11 @@ typedef struct { int references; @@ -11,4 +11,4 @@ +#endif static DirectLink *implementations = NULL; - /**************************************************************************************************/ + static inline int diff --git a/devel/directfb/files/patch-lib-direct-log.c b/devel/directfb/files/patch-lib-direct-log.c index bd937965813a..17acb791f453 100644 --- a/devel/directfb/files/patch-lib-direct-log.c +++ b/devel/directfb/files/patch-lib-direct-log.c @@ -1,6 +1,6 @@ ---- ./lib/direct/log.c.orig 2010-11-15 22:12:08.000000000 +0100 -+++ ./lib/direct/log.c 2010-12-03 16:44:12.000000000 +0100 -@@ -335,12 +335,14 @@ +--- lib/direct/log.c.orig 2012-05-23 13:43:12 UTC ++++ lib/direct/log.c +@@ -335,12 +335,14 @@ parse_host_addr( const char *hostp D_ERROR( "Direct/Log: Port %s is unreachable!\n", portstr ); return DR_FAILURE; diff --git a/devel/directfb/files/patch-lib-direct-stream.c b/devel/directfb/files/patch-lib-direct-stream.c index 137dad49e812..5b8c70844087 100644 --- a/devel/directfb/files/patch-lib-direct-stream.c +++ b/devel/directfb/files/patch-lib-direct-stream.c @@ -1,6 +1,6 @@ ---- lib/direct/stream.c.orig 2007-12-15 14:30:28.000000000 +0200 -+++ lib/direct/stream.c 2008-03-16 14:51:44.000000000 +0200 -@@ -429,7 +429,7 @@ +--- lib/direct/stream.c.orig 2012-05-23 13:43:12 UTC ++++ lib/direct/stream.c +@@ -429,7 +429,7 @@ net_connect( struct addrinfo *addr, int req.imr_multiaddr.s_addr = saddr->sin_addr.s_addr; req.imr_interface.s_addr = 0; diff --git a/devel/directfb/files/patch-lib-direct-trace.c b/devel/directfb/files/patch-lib-direct-trace.c index c4f9d6fbaf2f..a72292a883c6 100644 --- a/devel/directfb/files/patch-lib-direct-trace.c +++ b/devel/directfb/files/patch-lib-direct-trace.c @@ -1,4 +1,4 @@ ---- lib/direct/trace.c +--- lib/direct/trace.c.orig 2012-05-23 13:43:12 UTC +++ lib/direct/trace.c @@ -90,7 +90,7 @@ struct __D_DirectTraceBuffer { diff --git a/devel/directfb/files/patch-lib-fusion-call.c b/devel/directfb/files/patch-lib-fusion-call.c index 920f515e6fc3..0ab4125851be 100644 --- a/devel/directfb/files/patch-lib-fusion-call.c +++ b/devel/directfb/files/patch-lib-fusion-call.c @@ -1,4 +1,4 @@ ---- lib/fusion/call.c +--- lib/fusion/call.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/call.c @@ -31,6 +31,7 @@ #include <stdio.h> diff --git a/devel/directfb/files/patch-lib-fusion-lock.c b/devel/directfb/files/patch-lib-fusion-lock.c index 23c8ed983caf..77f4fd36b3a6 100644 --- a/devel/directfb/files/patch-lib-fusion-lock.c +++ b/devel/directfb/files/patch-lib-fusion-lock.c @@ -1,6 +1,6 @@ ---- lib/fusion/lock.c +--- lib/fusion/lock.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/lock.c -@@ -485,7 +485,7 @@ fusion_skirmish_wait( FusionSkirmish *skirmish, unsigned int timeout ) +@@ -646,7 +646,7 @@ fusion_skirmish_wait( FusionSkirmish *sk /* Install a (fake) signal handler for SIGRESTART. */ act.sa_handler = restart_handler; diff --git a/devel/directfb/files/patch-lib-fusion-shm-shm.c b/devel/directfb/files/patch-lib-fusion-shm-shm.c index 52946c6a93ae..8cd69f27e358 100644 --- a/devel/directfb/files/patch-lib-fusion-shm-shm.c +++ b/devel/directfb/files/patch-lib-fusion-shm-shm.c @@ -1,4 +1,4 @@ ---- lib/fusion/shm/shm.c +--- lib/fusion/shm/shm.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/shm/shm.c @@ -34,7 +34,7 @@ #include <sys/param.h> diff --git a/devel/directfb/files/patch-lib-fusion-shmalloc.c b/devel/directfb/files/patch-lib-fusion-shmalloc.c index 50602884d6ba..542a92a7f286 100644 --- a/devel/directfb/files/patch-lib-fusion-shmalloc.c +++ b/devel/directfb/files/patch-lib-fusion-shmalloc.c @@ -1,4 +1,4 @@ ---- lib/fusion/shmalloc.c +--- lib/fusion/shmalloc.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/shmalloc.c @@ -52,6 +52,8 @@ diff --git a/devel/directfb/files/patch-lib-voodoo-client.c b/devel/directfb/files/patch-lib-voodoo-client.c index 0d129d711e92..e8da5af57147 100644 --- a/devel/directfb/files/patch-lib-voodoo-client.c +++ b/devel/directfb/files/patch-lib-voodoo-client.c @@ -1,6 +1,6 @@ ---- ./lib/voodoo/client.c.orig 2010-11-15 22:13:05.000000000 +0100 -+++ ./lib/voodoo/client.c 2010-12-03 16:44:12.000000000 +0100 -@@ -161,12 +161,14 @@ +--- lib/voodoo/client.c.orig 2012-05-23 13:43:12 UTC ++++ lib/voodoo/client.c +@@ -164,12 +164,14 @@ voodoo_client_create( const char *ho D_ERROR( "Direct/Log: Service is unreachable!\n" ); return DR_FAILURE; diff --git a/devel/directfb/files/patch-lib-voodoo-manager.c b/devel/directfb/files/patch-lib-voodoo-manager.c index f6090cb570d6..435756aea851 100644 --- a/devel/directfb/files/patch-lib-voodoo-manager.c +++ b/devel/directfb/files/patch-lib-voodoo-manager.c @@ -1,5 +1,5 @@ ---- ./lib/voodoo/manager.c.orig 2010-11-02 00:11:20.000000000 +0100 -+++ ./lib/voodoo/manager.c 2010-12-03 16:44:12.000000000 +0100 +--- lib/voodoo/manager.c.orig 2012-05-23 13:43:12 UTC ++++ lib/voodoo/manager.c @@ -41,6 +41,7 @@ #include <sys/socket.h> #include <sys/time.h> @@ -8,7 +8,7 @@ #include <netinet/in.h> #if !VOODOO_BUILD_NO_SETSOCKOPT #include <netinet/ip.h> -@@ -193,10 +194,10 @@ +@@ -193,10 +194,10 @@ voodoo_manager_create( int f D_DEBUG( "Voodoo/Manager: Creating manager at %p.\n", manager ); #if !VOODOO_BUILD_NO_SETSOCKOPT diff --git a/devel/directfb/files/patch-src-gfx-generic-generic.c b/devel/directfb/files/patch-src-gfx-generic-generic.c deleted file mode 100644 index 26d46b7194a8..000000000000 --- a/devel/directfb/files/patch-src-gfx-generic-generic.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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__gfx__generic__generic_stretch_blit.c b/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c index bddd047a7b3f..1d9b101522a7 100644 --- a/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c +++ b/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c @@ -1,5 +1,5 @@ ---- ./src/gfx/generic/generic_stretch_blit.c.orig 2011-06-18 23:08:07.000000000 +0200 -+++ ./src/gfx/generic/generic_stretch_blit.c 2011-06-18 23:08:13.000000000 +0200 +--- src/gfx/generic/generic_stretch_blit.c.orig 2012-05-23 13:43:12 UTC ++++ src/gfx/generic/generic_stretch_blit.c @@ -72,6 +72,8 @@ #if DFB_SMOOTH_SCALING diff --git a/devel/directfb/files/patch-tests-dfbtest_window.c b/devel/directfb/files/patch-tests-dfbtest_window.c deleted file mode 100644 index fd738c38d0ec..000000000000 --- a/devel/directfb/files/patch-tests-dfbtest_window.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-tests__voodoo__voodoo_test.h b/devel/directfb/files/patch-tests__voodoo__voodoo_test.h index 8b122a32843f..5dfe8c33b710 100644 --- a/devel/directfb/files/patch-tests__voodoo__voodoo_test.h +++ b/devel/directfb/files/patch-tests__voodoo__voodoo_test.h @@ -1,5 +1,5 @@ ---- ./tests/voodoo/voodoo_test.h.orig 2010-12-03 16:44:12.000000000 +0100 -+++ ./tests/voodoo/voodoo_test.h 2010-12-03 16:44:12.000000000 +0100 +--- tests/voodoo/voodoo_test.h.orig 2016-06-08 05:59:40 UTC ++++ tests/voodoo/voodoo_test.h @@ -0,0 +1,10 @@ +#ifndef __VOODOO_TEST_H__ +#define __VOODOO_TEST_H__ diff --git a/devel/directfb/files/patch-tools-dfbdump.c b/devel/directfb/files/patch-tools-dfbdump.c index 39e16bad2c66..38ece8f67dbf 100644 --- a/devel/directfb/files/patch-tools-dfbdump.c +++ b/devel/directfb/files/patch-tools-dfbdump.c @@ -1,6 +1,6 @@ ---- tools/dfbdump.c +--- tools/dfbdump.c.orig 2012-05-23 13:43:12 UTC +++ tools/dfbdump.c -@@ -66,6 +66,8 @@ +@@ -68,6 +68,8 @@ #include <core/windows_internal.h> #include <core/wm.h> diff --git a/devel/directfb/files/patch-tools-dfbmaster.c b/devel/directfb/files/patch-tools-dfbmaster.c deleted file mode 100644 index 7649d583f55a..000000000000 --- a/devel/directfb/files/patch-tools-dfbmaster.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/pkg-plist b/devel/directfb/pkg-plist index 47185fbdc12d..d6d8b2e93047 100644 --- a/devel/directfb/pkg-plist +++ b/devel/directfb/pkg-plist @@ -15,11 +15,15 @@ bin/dfbscreen %%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 @@ -34,6 +38,33 @@ bin/mkdfiff 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 @@ -44,6 +75,7 @@ include/directfb-internal/core/coretypes.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 @@ -57,7 +89,9 @@ include/directfb-internal/core/screens.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 @@ -83,8 +117,10 @@ include/directfb-internal/idirectfb.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 @@ -109,6 +145,7 @@ include/directfb/direct/mem.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 @@ -170,6 +207,7 @@ include/directfb/voodoo/server.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 |