Attachment #139604 for bug #185885




# $FreeBSD: head/devel/directfb/Makefile 339876 2014-01-15 23:58:58Z bapt $

PORTNAME=	directfb
PORTVERSION=	1.4.17
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	http://www.directfb.org/downloads/Core/${DISTNAME:R}/
DISTNAME=	DirectFB-${PORTVERSION}

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
		png15:${PORTSDIR}/graphics/png

OPTIONS_DEFINE=	FREETYPE X11 SDL UNIQUE TEST

		--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>

.endif

.if ${PORT_OPTIONS:MFREETYPE}
LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
CONFIGURE_ARGS+=	--enable-freetype
PLIST_SUB+=	FREETYPE2=""
.else


.if ${PORT_OPTIONS:MDOCS}
post-install:
	${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}
.endfor
.for f in docs/html/*.html docs/html/*.png
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
.endfor
.endif


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

Lines 1-11 Link Here

(-)./directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c (-11 lines)
1	--- gfxdrivers/davinci/davinci_c64x.c
2	+++ gfxdrivers/davinci/davinci_c64x.c
3	@@ -57,6 +57,8 @@
4	#define C64X_QLEN direct_page_align( sizeof(c64xTaskControl) )
5	#define C64X_MLEN direct_page_align( 0x2000000 )
6
7	+typedef unsigned long ulong;
8	+
9	__attribute__((noinline))
10	static void
11	davinci_c64x_queue_error( DavinciC64x c64x, const char msg )




--- 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)

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>




--- 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;

Lines 1-10 Link Here

(-)./directfb/files/patch-lib-fusion-call.c (-10 lines)
1	--- lib/fusion/call.c
2	+++ lib/fusion/call.c
3	@@ -31,6 +31,7 @@
4	#include <stdio.h>
5	#include <unistd.h>
6	#include <errno.h>
7	+#include <sys/stat.h>
8
9	#include <fusion/build.h>
10

Lines 1-11 Link Here

(-)./directfb/files/patch-lib-fusion-lock.c (-11 lines)
1	--- lib/fusion/lock.c
2	+++ lib/fusion/lock.c
3	@@ -485,7 +485,7 @@ fusion_skirmish_wait( FusionSkirmish *skirmish, unsigned int timeout )
4
5	/* Install a (fake) signal handler for SIGRESTART. */
6	act.sa_handler = restart_handler;
7	- act.sa_flags = SA_RESETHAND \| SA_RESTART \| SA_NOMASK;
8	+ act.sa_flags = SA_RESETHAND \| SA_RESTART \| SA_NODEFER;
9
10	sigaction( SIGRESTART, &act, &oldact );
11

Lines 1-11 Link Here

(-)./directfb/files/patch-lib-fusion-shm-shm.c (-11 lines)
1	--- lib/fusion/shm/shm.c
2	+++ lib/fusion/shm/shm.c
3	@@ -34,7 +34,7 @@
4	#include <sys/param.h>
5	#include <sys/types.h>
6	#include <sys/stat.h>
7	-#include <sys/vfs.h>
8	+#include <sys/mount.h>
9
10	#include <direct/debug.h>
11	#include <direct/list.h>

Lines 1-11 Link Here

(-)./directfb/files/patch-lib-fusion-shmalloc.c (-11 lines)
1	--- lib/fusion/shmalloc.c
2	+++ lib/fusion/shmalloc.c
3	@@ -52,6 +52,8 @@
4
5	D_DEBUG_DOMAIN( Fusion_SHM, "Fusion/SHM", "Fusion Shared Memory" );
6
7	+typedef unsigned long ulong;
8	+
9	void
10	fusion_dbg_print_memleaks( FusionSHMPoolShared *pool )
11	{

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-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>




--- ./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
+

Lines 1-11 Link Here

(-)./directfb/files/patch-tools-dfbdump.c (-11 lines)
1	--- tools/dfbdump.c
2	+++ tools/dfbdump.c
3	@@ -66,6 +66,8 @@
4	#include <core/windows_internal.h>
5	#include <core/wm.h>
6
7	+typedef unsigned long ulong;
8	+
9	static DirectFBPixelFormatNames( format_names );
10
11	/**********************************************************************************************************************/

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




--- 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;

Lines 1-11 Link Here

(-)./directfb/files/patch-tools-mkdfiff.c (-11 lines)
1	--- tools/mkdfiff.c.orig 2010-10-31 09:49:49.000000000 +0100
2	+++ tools/mkdfiff.c 2012-04-30 06:43:17.000000000 +0200
3	@@ -97,7 +97,7 @@
4	if (!png_ptr)
5	goto cleanup;
6
7	- if (setjmp (png_ptr->jmpbuf)) {
8	+ if (setjmp (png_jmpbuf(png_ptr))) {
9	if (desc->preallocated[0].data) {
10	free (desc->preallocated[0].data);
11	desc->preallocated[0].data = NULL;

Lines 1-11 Link Here

(-)./directfb/files/patch-tools-mkdgifft.cpp (-11 lines)
1	--- tools/mkdgifft.cpp.orig 2011-05-05 20:00:29.000000000 +0200
2	+++ tools/mkdgifft.cpp 2012-05-01 08:58:04.000000000 +0200
3	@@ -595,7 +595,7 @@
4	if (!png_ptr)
5	goto cleanup;
6
7	- if (setjmp (png_ptr->jmpbuf)) {
8	+ if (setjmp (png_jmpbuf(png_ptr))) {
9	if (desc->preallocated[0].data) {
10	free (desc->preallocated[0].data);
11	desc->preallocated[0].data = NULL;

Return to bug 185885

Lines 2-9 Link Here

(-)./directfb/Makefile (-8 / +6 lines)
2	# $FreeBSD: head/devel/directfb/Makefile 339876 2014-01-15 23:58:58Z bapt $	2	# $FreeBSD: head/devel/directfb/Makefile 339876 2014-01-15 23:58:58Z bapt $
3		3
4	PORTNAME= directfb	4	PORTNAME= directfb
5	PORTVERSION= 1.4.13	5	PORTVERSION= 1.4.17
6	PORTREVISION= 2
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/	7	MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/
9	DISTNAME= DirectFB-${PORTVERSION}	8	DISTNAME= DirectFB-${PORTVERSION}
Lines 14-20 Link Here
14	LICENSE= LGPL21	13	LICENSE= LGPL21
15	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
16		15
17	LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \	16	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
18	png15:${PORTSDIR}/graphics/png	17	png15:${PORTSDIR}/graphics/png
19		18
20	OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST	19	OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST
Lines 47-53 Link Here
47	--with-inputdrivers=all --with-smooth-scaling \	46	--with-inputdrivers=all --with-smooth-scaling \
48	--with-dither-rgb16=advanced	47	--with-dither-rgb16=advanced
49		48
50	NO_STAGE= yes
51	BROKEN_alpha= Does not compile on alpha	49	BROKEN_alpha= Does not compile on alpha
52		50
53	.include <bsd.port.options.mk>	51	.include <bsd.port.options.mk>
Lines 58-64 Link Here
58	.endif	56	.endif
59		57
60	.if ${PORT_OPTIONS:MFREETYPE}	58	.if ${PORT_OPTIONS:MFREETYPE}
61	LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2	59	LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2
62	CONFIGURE_ARGS+= --enable-freetype	60	CONFIGURE_ARGS+= --enable-freetype
63	PLIST_SUB+= FREETYPE2=""	61	PLIST_SUB+= FREETYPE2=""
64	.else	62	.else
Lines 125-136 Link Here
125		123
126	.if ${PORT_OPTIONS:MDOCS}	124	.if ${PORT_OPTIONS:MDOCS}
127	post-install:	125	post-install:
128	${MKDIR} ${DOCSDIR}/html	126	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
129	.for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html	127	.for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html
130	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}	128	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
131	.endfor	129	.endfor
132	.for f in docs/html/.html docs/html/.png	130	.for f in docs/html/.html docs/html/.png
133	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/html	131	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
134	.endfor	132	.endfor
135	.endif	133	.endif
136		134

Lines 1-28 Link Here

(-)./directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c (-28 lines)
1	--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.orig 2011-05-05 20:00:29.000000000 +0200
2	+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c 2012-05-01 09:15:37.000000000 +0200
3	@@ -33,6 +33,7 @@
4	#include <stdlib.h>
5	#include <unistd.h>
6	#include <png.h>
7	+#include <pngpriv.h>
8	#include <string.h>
9	#include <stdarg.h>
10
11	@@ -207,7 +207,7 @@
12	if (!data->png_ptr)
13	goto error;
14
15	- if (setjmp( data->png_ptr->jmpbuf )) {
16	+ if (setjmp( png_jmpbuf(data->png_ptr))) {
17	D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
18	goto error;
19	}
20	@@ -292,7 +292,7 @@
21	rect = dst_data->area.wanted;
22	}
23
24	- if (setjmp( data->png_ptr->jmpbuf )) {
25	+ if (setjmp( png_jmpbuf(data->png_ptr))) {
26	D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
27
28	if (data->stage < STAGE_IMAGE)

Lines 1-20 Link Here

(-)./directfb/files/patch-lib-direct-trace.c (-20 lines)
1	--- lib/direct/trace.c
2	+++ lib/direct/trace.c
3	@@ -90,7 +90,7 @@ struct __D_DirectTraceBuffer {
4
5	static DirectTraceBuffer *buffers[MAX_BUFFERS];
6	static int buffers_num = 0;
7	-#ifdef HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
8	+#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
9	static pthread_mutex_t buffers_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
10	#else
11	static pthread_mutex_t buffers_lock = PTHREAD_MUTEX_INITIALIZER;
12	@@ -176,7 +176,7 @@ typedef struct {
13	} SymbolTable;
14
15	static DirectLink *tables = NULL;
16	-#ifdef HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
17	+#if HAVE_DECL_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
18	static pthread_mutex_t tables_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
19	#else
20	static pthread_mutex_t tables_lock = PTHREAD_MUTEX_INITIALIZER;

Lines 1-13 Link Here

(-)./directfb/files/patch-tests__voodoo__voodoo_test.h (-13 lines)
1	--- ./tests/voodoo/voodoo_test.h.orig 2010-12-03 16:44:12.000000000 +0100
2	+++ ./tests/voodoo/voodoo_test.h 2010-12-03 16:44:12.000000000 +0100
3	@@ -0,0 +1,10 @@
4	+#ifndef __VOODOO_TEST_H__
5	+#define __VOODOO_TEST_H__
6	+
7	+typedef enum {
8	+ VOODOO_TEST_INCREASE,
9	+ VOODOO_TEST_QUERY
10	+} VoodooTestCall;
11	+
12	+#endif
13	+

Lines 1-19 Link Here

(-)./directfb/files/patch-tools-directfb-csource.c (-19 lines)
1	--- tools/directfb-csource.c.orig 2011-05-05 20:00:29.000000000 +0200
2	+++ tools/directfb-csource.c 2012-04-29 06:09:30.000000000 +0200
3	@@ -41,6 +41,7 @@
4	#include <sys/stat.h>
5
6	#include <png.h>
7	+#include <pngpriv.h>
8
9	#include <directfb.h>
10
11	@@ -338,7 +339,7 @@
12	if (!png_ptr)
13	goto cleanup;
14
15	- if (setjmp (png_ptr->jmpbuf)) {
16	+ if (setjmp (png_jmpbuf(png_ptr))) {
17	if (desc->preallocated[0].data) {
18	free (desc->preallocated[0].data);
19	desc->preallocated[0].data = NULL;