Date: Sun, 19 Jan 2014 17:33:35 GMT From: Hrady Schumacher <hardy.schumacher@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185885: [UPDATE] devel/directfb to v1.4.17 Message-ID: <201401191733.s0JHXZZp070784@oldred.freebsd.org> Resent-Message-ID: <201401191740.s0JHe074045465@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185885 >Category: ports >Synopsis: [UPDATE] devel/directfb to v1.4.17 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 19 17:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Hrady Schumacher >Release: FreeBSD-9.2 >Organization: >Environment: FreeBSD gamma.low.org 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255996: Thu Oct 3 20:40:04 CEST 2013 root@gamma.low.org:/usr/obj/usr/src/sys/LOW_GAMMA i386 >Description: Update for port devel/directfb to patchlevel 17 is available. It contains bugfixes. Some patches on the port ca be removed. Furthermore I added stage support and fixed some issues reported by portlint. >How-To-Repeat: n/a >Fix: Patch attached with submission follows: diff -ruN /usr/ports/devel/directfb/Makefile ./directfb/Makefile --- /usr/ports/devel/directfb/Makefile 2014-01-16 20:02:26.000000000 +0100 +++ ./directfb/Makefile 2014-01-19 13:03:44.000000000 +0100 @@ -2,8 +2,7 @@ # $FreeBSD: head/devel/directfb/Makefile 339876 2014-01-15 23:58:58Z bapt $ PORTNAME= directfb -PORTVERSION= 1.4.13 -PORTREVISION= 2 +PORTVERSION= 1.4.17 CATEGORIES= devel MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/ DISTNAME= DirectFB-${PORTVERSION} @@ -14,7 +13,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST @@ -47,7 +46,6 @@ --with-inputdrivers=all --with-smooth-scaling \ --with-dither-rgb16=advanced -NO_STAGE= yes BROKEN_alpha= Does not compile on alpha .include <bsd.port.options.mk> @@ -58,7 +56,7 @@ .endif .if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --enable-freetype PLIST_SUB+= FREETYPE2="" .else @@ -125,12 +123,12 @@ .if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR}/html + ${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .for f in docs/html/*.html docs/html/*.png - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html .endfor .endif diff -ruN /usr/ports/devel/directfb/distinfo ./directfb/distinfo --- /usr/ports/devel/directfb/distinfo 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/distinfo 2014-01-19 12:06:47.000000000 +0100 @@ -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 -ruN /usr/ports/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c ./directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c --- /usr/ports/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c ./directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c --- /usr/ports/devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ ---- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.orig 2011-05-05 20:00:29.000000000 +0200 -+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c 2012-05-01 09:15:37.000000000 +0200 -@@ -33,6 +33,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <png.h> -+#include <pngpriv.h> - #include <string.h> - #include <stdarg.h> - -@@ -207,7 +207,7 @@ - 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 @@ - 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) diff -ruN /usr/ports/devel/directfb/files/patch-lib-direct-conf.c ./directfb/files/patch-lib-direct-conf.c --- /usr/ports/devel/directfb/files/patch-lib-direct-conf.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-lib-direct-conf.c 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN /usr/ports/devel/directfb/files/patch-lib-direct-trace.c ./directfb/files/patch-lib-direct-trace.c --- /usr/ports/devel/directfb/files/patch-lib-direct-trace.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-lib-direct-trace.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-lib-fusion-call.c ./directfb/files/patch-lib-fusion-call.c --- /usr/ports/devel/directfb/files/patch-lib-fusion-call.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-lib-fusion-call.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-lib-fusion-lock.c ./directfb/files/patch-lib-fusion-lock.c --- /usr/ports/devel/directfb/files/patch-lib-fusion-lock.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-lib-fusion-lock.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-lib-fusion-shm-shm.c ./directfb/files/patch-lib-fusion-shm-shm.c --- /usr/ports/devel/directfb/files/patch-lib-fusion-shm-shm.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-lib-fusion-shm-shm.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-lib-fusion-shmalloc.c ./directfb/files/patch-lib-fusion-shmalloc.c --- /usr/ports/devel/directfb/files/patch-lib-fusion-shmalloc.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-lib-fusion-shmalloc.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-src-gfx-generic-generic.c ./directfb/files/patch-src-gfx-generic-generic.c --- /usr/ports/devel/directfb/files/patch-src-gfx-generic-generic.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-src-gfx-generic-generic.c 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN /usr/ports/devel/directfb/files/patch-tests-dfbtest_window.c ./directfb/files/patch-tests-dfbtest_window.c --- /usr/ports/devel/directfb/files/patch-tests-dfbtest_window.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tests-dfbtest_window.c 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN /usr/ports/devel/directfb/files/patch-tests__voodoo__voodoo_test.h ./directfb/files/patch-tests__voodoo__voodoo_test.h --- /usr/ports/devel/directfb/files/patch-tests__voodoo__voodoo_test.h 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tests__voodoo__voodoo_test.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- ./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 -@@ -0,0 +1,10 @@ -+#ifndef __VOODOO_TEST_H__ -+#define __VOODOO_TEST_H__ -+ -+typedef enum { -+ VOODOO_TEST_INCREASE, -+ VOODOO_TEST_QUERY -+} VoodooTestCall; -+ -+#endif -+ diff -ruN /usr/ports/devel/directfb/files/patch-tools-dfbdump.c ./directfb/files/patch-tools-dfbdump.c --- /usr/ports/devel/directfb/files/patch-tools-dfbdump.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tools-dfbdump.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -ruN /usr/ports/devel/directfb/files/patch-tools-dfbmaster.c ./directfb/files/patch-tools-dfbmaster.c --- /usr/ports/devel/directfb/files/patch-tools-dfbmaster.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tools-dfbmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN /usr/ports/devel/directfb/files/patch-tools-directfb-csource.c ./directfb/files/patch-tools-directfb-csource.c --- /usr/ports/devel/directfb/files/patch-tools-directfb-csource.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tools-directfb-csource.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ ---- tools/directfb-csource.c.orig 2011-05-05 20:00:29.000000000 +0200 -+++ tools/directfb-csource.c 2012-04-29 06:09:30.000000000 +0200 -@@ -41,6 +41,7 @@ - #include <sys/stat.h> - - #include <png.h> -+#include <pngpriv.h> - - #include <directfb.h> - -@@ -338,7 +339,7 @@ - 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 -ruN /usr/ports/devel/directfb/files/patch-tools-mkdfiff.c ./directfb/files/patch-tools-mkdfiff.c --- /usr/ports/devel/directfb/files/patch-tools-mkdfiff.c 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tools-mkdfiff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- tools/mkdfiff.c.orig 2010-10-31 09:49:49.000000000 +0100 -+++ tools/mkdfiff.c 2012-04-30 06:43:17.000000000 +0200 -@@ -97,7 +97,7 @@ - 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 -ruN /usr/ports/devel/directfb/files/patch-tools-mkdgifft.cpp ./directfb/files/patch-tools-mkdgifft.cpp --- /usr/ports/devel/directfb/files/patch-tools-mkdgifft.cpp 2012-12-26 19:25:47.000000000 +0100 +++ ./directfb/files/patch-tools-mkdgifft.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- tools/mkdgifft.cpp.orig 2011-05-05 20:00:29.000000000 +0200 -+++ tools/mkdgifft.cpp 2012-05-01 08:58:04.000000000 +0200 -@@ -595,7 +595,7 @@ - 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; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401191733.s0JHXZZp070784>