Attachment #160168 for bug #202544




# $FreeBSD$

PORTNAME=	eduke32
PORTVERSION=	20150818
PORTREVISION=	5
CATEGORIES=	games
MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \
		http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/
DISTNAME=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}

MAINTAINER=	pkubaj@riseup.net
COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/source/gpl-2.0.txt

USES=		execinfo gmake tar:xz
USE_GCC=	any
USE_CSTD=	gnu89
USE_GL=		gl
USE_GNOME=	gtk20
USE_SDL=	sdl2 mixer2
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
SVNREVISION=	5334

PLIST_FILES=	bin/eduke32 bin/mapster32
PORTDOCS=	*

TIMIDITY_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
TIMIDITYPLUS_DESC=	Use Timidity++ for music support
TIMIDITYPLUS_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity++
VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis

LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg
LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis

.include "${.CURDIR}/../duke3d-data/Makefile.include"

.include <bsd.port.pre.mk>

.endif

post-patch:
.if ! ${PORT_OPTIONS:MVORBIS}
	@${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile
.endif
.if ${ARCH} != "i386"
	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common
.endif
	@${REINPLACE_CMD} -e '/^CC=/s/gcc/${CC}/' -e '/^CXX=/s/g++/${CXX}/' \
		${WRKSRC}/Makefile.common
	@${REINPLACE_CMD} 's/ \$$(ARCH)//' ${WRKSRC}/Makefile \
		${WRKSRC}/build/Makefile
	@${REINPLACE_CMD} -Ee '/^ifeq/s/LINUX/BSD/' \
		-e 's/(\+= -lvorbisfile)/\1 -lexecinfo/' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' -e 's/ -ldl//' \
		${WRKSRC}/build/Makefile
	@${REINPLACE_CMD} -E 's|(SDLCONFIG[[:space:]]*=).*|\1${SDL_CONFIG}|' \
		${WRKSRC}/build/Makefile.shared
	@${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DN3DDIR}|' \
		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
	@${REINPLACE_CMD} -E 's|(-DHAVE_VORBIS)|-I${LOCALBASE}/include \1|' \
		${WRKSRC}/source/jaudiolib/Makefile

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin
.endfor
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR}
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.map ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.m32 ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (eduke32_src_20110627-1923.tar.bz2) = 6ad33f7acf9cdd26ca49f7813fbe23b888b95fd2f587851c971f860b59185e4a	1	SHA256 (eduke32_src_20150818-5334.tar.xz) = 4d22d5646960f954d2a82fa66941dedb64a6c78d3ced33f925ac161524406908
2	SIZE (eduke32_src_20110627-1923.tar.bz2) = 2817419	2	SIZE (eduke32_src_20150818-5334.tar.xz) = 14330976




--- Makefile.common.orig	2015-08-20 23:44:29.198477457 +0200
+++ Makefile.common	2015-08-20 23:44:51.721473726 +0200
@@ -258,7 +258,6 @@
     endif
 endif
 
-COMMONFLAGS=$(ARCH)
 COMPILERFLAGS=
 
 ifeq ($(PACKAGE_REPOSITORY),0)
@@ -278,8 +277,8 @@
     OPTIMIZATIONS += $(DEBUGFLAG)
 endif
 
-CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
-CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings
+CONLYFLAGS=-std=gnu99 -Wimplicit 
+CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings
 ASFORMAT=elf$(SYSBITS)
 ASFLAGS=-s -f $(ASFORMAT) #-g
 LINKERFLAGS=

Line 0 Link Here

(-)files/patch-build_src_baselayer.c (+11 lines)
	1	--- build/src/baselayer.c.orig 2015-08-20 21:08:44.135119413 +0200
	2	+++ build/src/baselayer.c 2015-08-20 21:08:10.771123534 +0200
	3	@@ -198,7 +198,7 @@
	4	{
	5	Baligned_free(ylookup);
	6
	7	- ylookup = (intptr_t )Xaligned_alloc(16, lastyidx sizeof(intptr_t));
	8	+ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t));
	9	#if !defined(NOASM) && !defined(GEKKO) && !defined(__ANDROID__)
	10	nx_unprotect((intptr_t)ylookup, (intptr_t)ylookup + (lastyidx * sizeof(intptr_t)));
	11	#endif




--- build/src/engine.c.orig	2015-08-20 21:04:23.844137433 +0200
+++ build/src/engine.c	2015-08-20 21:05:16.166132901 +0200
@@ -5183,7 +5183,8 @@
             static char fn[32], tmpbuf[80];
             char purple = getclosestcol(63, 0, 63);
             char yellow = getclosestcol(63, 63, 0);
-            char *bakframe = (char *)Xaligned_alloc(16, xdim*ydim);
+            char *bakframe;
+            posix_memalign(&bakframe, 16, xdim*ydim);
 
             begindrawing();  //{{{
             Bmemcpy(bakframe, (char *)frameplace, xdim*ydim);
@@ -7951,7 +7952,7 @@
             EDUKE32_STATIC_ASSERT((uint64_t) MAXXDIM*(DISTRECIPSIZ-1) <= INT32_MAX);
 
             if (distrecip == NULL)
-                distrecip = (uint32_t *)Xaligned_alloc(16, DISTRECIPSIZ * sizeof(uint32_t));
+                posix_memalign(&distrecip, 16, DISTRECIPSIZ * sizeof(uint32_t));
 
             i = 1;
 
@@ -11420,7 +11421,7 @@
         if (*dynarray[i].ptr)
             Baligned_free(*dynarray[i].ptr);
 
-        *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size);
+         posix_memalign(dynarray[i].ptr, 16, dynarray[i].size);
     }
 
     ysavecnt = YSAVES;

Return to bug 202544

Lines 2-28 Link Here

(-)Makefile (-29 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= eduke32	4	PORTNAME= eduke32
5	PORTVERSION= 20110627	5	PORTVERSION= 20150818
6	PORTREVISION= 5
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \	7	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \
9	http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/	8	http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/
10	DISTNAME= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}	9	DISTNAME= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}
11		10
12	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= pkubaj@riseup.net
13	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke	12	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16	LICENSE_FILE= ${WRKSRC}/GNU.TXT	15	LICENSE_FILE= ${WRKSRC}/source/gpl-2.0.txt
17		16
18	USES= execinfo gmake tar:bzip2	17	USES= execinfo gmake tar:xz
19	USE_GCC= any	18	USE_GCC= any
20	USE_CSTD= gnu89
21	USE_GL= gl	19	USE_GL= gl
22	USE_GNOME= gtk20	20	USE_GNOME= gtk20
23	USE_SDL= mixer sdl	21	USE_SDL= sdl2 mixer2
24	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}	22	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
25	SVNREVISION= 1923	23	SVNREVISION= 5334
26		24
27	PLIST_FILES= bin/eduke32 bin/mapster32	25	PLIST_FILES= bin/eduke32 bin/mapster32
28	PORTDOCS= *	26	PORTDOCS= *
Lines 40-47 Link Here
40	TIMIDITY_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity	38	TIMIDITY_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
41	TIMIDITYPLUS_DESC= Use Timidity++ for music support	39	TIMIDITYPLUS_DESC= Use Timidity++ for music support
42	TIMIDITYPLUS_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++	40	TIMIDITYPLUS_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++
43	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
44		41
		42	LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac
		43	LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg
		44	LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis
		45
45	.include "${.CURDIR}/../duke3d-data/Makefile.include"	46	.include "${.CURDIR}/../duke3d-data/Makefile.include"
46		47
47	.include <bsd.port.pre.mk>	48	.include <bsd.port.pre.mk>
Lines 51-86 Link Here
51	.endif	52	.endif
52		53
53	post-patch:	54	post-patch:
54	.if ! ${PORT_OPTIONS:MVORBIS}
55	@${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile
56	.endif
57	.if ${ARCH} != "i386"	55	.if ${ARCH} != "i386"
58	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common	56	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common
59	.endif	57	.endif
60	@${REINPLACE_CMD} -e '/^CC=/s/gcc/${CC}/' -e '/^CXX=/s/g++/${CXX}/' \	58	@${REINPLACE_CMD} -e '/^CC=/s/gcc/${CC}/' -e '/^CXX=/s/g++/${CXX}/' \
61	${WRKSRC}/Makefile.common	59	${WRKSRC}/Makefile.common
62	@${REINPLACE_CMD} 's/ \$$(ARCH)//' ${WRKSRC}/Makefile \
63	${WRKSRC}/build/Makefile
64	@${REINPLACE_CMD} -Ee '/^ifeq/s/LINUX/BSD/' \
65	-e 's/(\+= -lvorbisfile)/\1 -lexecinfo/' ${WRKSRC}/Makefile
66	@${REINPLACE_CMD} -e 's\|/usr/X11R6\|${LOCALBASE}\|' -e 's/ -ldl//' \
67	${WRKSRC}/build/Makefile
68	@${REINPLACE_CMD} -E 's\|(SDLCONFIG[[:space:]]=).\|\1${SDL_CONFIG}\|' \
69	${WRKSRC}/build/Makefile.shared
70	@${REINPLACE_CMD} 's\|/usr/share/games/eduke32\|${DN3DDIR}\|' \	60	@${REINPLACE_CMD} 's\|/usr/share/games/eduke32\|${DN3DDIR}\|' \
71	${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c	61	${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
72	@${REINPLACE_CMD} -E 's\|(-DHAVE_VORBIS)\|-I${LOCALBASE}/include \1\|' \
73	${WRKSRC}/source/jaudiolib/Makefile
74		62
75	do-install:	63	do-install:
76	.for f in eduke32 mapster32	64	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
77	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin	65	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin
78	.endfor
79	${MKDIR} ${STAGEDIR}${DOCSDIR}	66	${MKDIR} ${STAGEDIR}${DOCSDIR}
80	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/samples/*.sample ${STAGEDIR}${DOCSDIR}	67	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR}
81	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	68	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
82	. for f in cfg map m32 txt	69	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.map ${STAGEDIR}${EXAMPLESDIR}
83	${INSTALL_DATA} ${WRKSRC}/samples/*.${f} ${STAGEDIR}${EXAMPLESDIR}	70	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.m32 ${STAGEDIR}${EXAMPLESDIR}
84	. endfor	71	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
		72	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}
85		73
86	.include <bsd.port.post.mk>	74	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-Makefile.common (+21 lines)
	1	--- Makefile.common.orig 2015-08-20 23:44:29.198477457 +0200
	2	+++ Makefile.common 2015-08-20 23:44:51.721473726 +0200
	3	@@ -258,7 +258,6 @@
	4	endif
	5	endif
	6
	7	-COMMONFLAGS=$(ARCH)
	8	COMPILERFLAGS=
	9
	10	ifeq ($(PACKAGE_REPOSITORY),0)
	11	@@ -278,8 +277,8 @@
	12	OPTIMIZATIONS += $(DEBUGFLAG)
	13	endif
	14
	15	-CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
	16	-CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings
	17	+CONLYFLAGS=-std=gnu99 -Wimplicit
	18	+CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings
	19	ASFORMAT=elf$(SYSBITS)
	20	ASFLAGS=-s -f $(ASFORMAT) #-g
	21	LINKERFLAGS=

Line 0 Link Here

(-)files/patch-build_src_engine.c (+30 lines)
	1	--- build/src/engine.c.orig 2015-08-20 21:04:23.844137433 +0200
	2	+++ build/src/engine.c 2015-08-20 21:05:16.166132901 +0200
	3	@@ -5183,7 +5183,8 @@
	4	static char fn[32], tmpbuf[80];
	5	char purple = getclosestcol(63, 0, 63);
	6	char yellow = getclosestcol(63, 63, 0);
	7	- char bakframe = (char )Xaligned_alloc(16, xdim*ydim);
	8	+ char *bakframe;
	9	+ posix_memalign(&bakframe, 16, xdim*ydim);
	10
	11	begindrawing(); //{{{
	12	Bmemcpy(bakframe, (char )frameplace, xdimydim);
	13	@@ -7951,7 +7952,7 @@
	14	EDUKE32_STATIC_ASSERT((uint64_t) MAXXDIM*(DISTRECIPSIZ-1) <= INT32_MAX);
	15
	16	if (distrecip == NULL)
	17	- distrecip = (uint32_t )Xaligned_alloc(16, DISTRECIPSIZ sizeof(uint32_t));
	18	+ posix_memalign(&distrecip, 16, DISTRECIPSIZ * sizeof(uint32_t));
	19
	20	i = 1;
	21
	22	@@ -11420,7 +11421,7 @@
	23	if (*dynarray[i].ptr)
	24	Baligned_free(*dynarray[i].ptr);
	25
	26	- *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size);
	27	+ posix_memalign(dynarray[i].ptr, 16, dynarray[i].size);
	28	}
	29
	30	ysavecnt = YSAVES;