Attachment #180341 for bug #215855




# $FreeBSD$

PORTNAME=	eduke32
PORTVERSION=	20170225
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32 \
		http://www.duke4.org/files/nightfright/hrp/:hrp \
		http://burnbit.com/download/447717/:hrp \
		https://anongoth.pl/:hrp \
		https://anongoth.pl/:xxx \
		http://www.duke4.org/files/nightfright/:xxx \
		ftp://ftp.3drealms.com/share/:shareware
DISTFILES=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32

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

LICENSE=	GPLv2 BUILDLIC
LICENSE_FILE_GPLv2=	${WRKSRC}/source/duke3d/gpl-2.0.txt
LICENSE_COMB=	multi
LICENSE_PERMS_BUILDLIC= dist-mirror pkg-mirror auto-accept
LICENSE_NAME_BUILDLIC= BUILD SOURCE CODE LICENSE
LICENSE_FILE_BUILDLIC=${WRKSRC}/source/build/buildlic.txt

LIB_DEPENDS=	libFLAC.so:audio/flac \
		libogg.so:audio/libogg \

USE_GNOME=	gtk20
USE_SDL=	sdl2 mixer2
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
SVNREVISION=	6079
DATADIR=	${LOCALBASE}/share/duke3d
SUB_FILES=	pkg-message
SUB_LIST=	DATADIR=${DATADIR}
MAKEFILE=	GNUmakefile

CFLAGS+=	-flax-vector-conversions

PLIST_FILES=	bin/eduke32 bin/mapster32
PORTDOCS=	*
PORTEXAMPLES=	*

BROKEN_sparc64=	does not compile on sparc64

OPTIONS_DEFINE=	EXAMPLES HRP OFFENSIVE SHAREWARE
OPTIONS_RADIO=	MIDI
OPTIONS_RADIO_MIDI=	TIMIDITY TIMIDITYPLUS
OPTIONS_DEFAULT=TIMIDITY


post-patch:
	@${REINPLACE_CMD} -e '/^CC=/s|gcc|${CC}|' -e '/^CXX=/s|g++|${CXX}|' \
		${WRKSRC}/GNUmakefile
	@${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DN3DDIR}|' \
		${WRKSRC}/source/duke3d/src/game.cpp ${WRKSRC}/source/duke3d/src/astub.cpp

post-patch-ASM-off:
	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/GNUmakefile

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR}

do-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/tiles.cfg ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/* ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}

do-install-HRP-on:
	@${MKDIR} ${STAGEDIR}${DATADIR}

Lines 1-6 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468168899	1	TIMESTAMP = 1488206145
2	SHA256 (eduke32_src_20160704-5811.tar.xz) = 28a351aff5c1fc8412dfb8aa9f17b1fcfded70e04c3b90a301d2e1e1ead78105	2	SHA256 (eduke32_src_20170225-6079.tar.xz) = 23cecc904df1e1e528c499e775a4dce7417cc70b8d97e7dcef068ff197e6a0a7
3	SIZE (eduke32_src_20160704-5811.tar.xz) = 14125320	3	SIZE (eduke32_src_20170225-6079.tar.xz) = 14759072
4	SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5	4	SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
5	SIZE (duke3d_hrp.zip) = 933440151	5	SIZE (duke3d_hrp.zip) = 933440151
6	SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534	6	SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534




--- Makefile.common.orig	2016-06-03 04:50:55 UTC
+++ Makefile.common
@@ -252,7 +252,6 @@ ifndef LTO
     endif
 endif
 
-COMMONFLAGS=$(ARCH)
 COMPILERFLAGS=
 
 ifeq ($(PACKAGE_REPOSITORY),0)
@@ -273,7 +272,7 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10)
 endif
 
 CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
-CXXONLYFLAGS= -fno-exceptions -fno-rtti
+CXXONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive
 ASFORMAT=elf$(BITS)
 ASFLAGS=-s -f $(ASFORMAT) #-g
 LINKERFLAGS=

Lines 1-11 Link Here

(-)files/patch-build_src_baselayer.c (-11 lines)
1	--- build/src/baselayer.c.orig 2016-05-29 21:11:27 UTC
2	+++ build/src/baselayer.c
3	@@ -227,7 +227,7 @@ void calc_ylookup(int32_t bpl, int32_t l
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	ylookupsiz = lastyidx;
10	}
11




--- build/src/engine.c.orig	2015-09-23 17:55:31 UTC
+++ build/src/engine.c
@@ -5349,7 +5349,8 @@ static void drawalls(int32_t bunch)
             static char fn[32], tmpbuf[80];
             char purple = getclosestcol(255, 0, 255);
             char yellow = getclosestcol(255, 255, 0);
-            char *bakframe = (char *)Xaligned_alloc(16, xdim*ydim);
+	     char *bakframe;
+            posix_memalign(&bakframe, 16, xdim*ydim);
 
             begindrawing();  //{{{
             Bmemcpy(bakframe, (char *)frameplace, xdim*ydim);
@@ -8142,7 +8143,7 @@ static void dosetaspect(void)
         if (xdimen != oxdimen && voxoff[0][0])
         {
             if (distrecip == NULL)
-                distrecip = (uint32_t *)Xaligned_alloc(16, DISTRECIPSIZ * sizeof(uint32_t));
+                posix_memalign(&distrecip, 16, DISTRECIPSIZ * sizeof(uint32_t));
 
             if (xdimen < 1 << 11)
             {
@@ -11757,7 +11758,7 @@ static void initsmost(void)
     {
         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 215855

Lines 2-15 Link Here

(-)Makefile (-22 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= eduke32	4	PORTNAME= eduke32
5	PORTVERSION= 20160704	5	PORTVERSION= 20170225
6	PORTREVISION= 2
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32 \	7	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32 \
9	http://www.duke4.org/files/nightfright/hrp/:hrp \	8	http://www.duke4.org/files/nightfright/hrp/:hrp \
10	http://burnbit.com/download/447717/:hrp \	9	http://burnbit.com/download/447717/:hrp \
11	https://anongoth.pl/:hrp \
12	https://anongoth.pl/:xxx \
13	http://www.duke4.org/files/nightfright/:xxx \	10	http://www.duke4.org/files/nightfright/:xxx \
14	ftp://ftp.3drealms.com/share/:shareware	11	ftp://ftp.3drealms.com/share/:shareware
15	DISTFILES= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32	12	DISTFILES= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32
Lines 18-25 Link Here
18	MAINTAINER= pkubaj@anongoth.pl	15	MAINTAINER= pkubaj@anongoth.pl
19	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke	16	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke
20		17
21	LICENSE= GPLv2	18	LICENSE= GPLv2 BUILDLIC
22	LICENSE_FILE= ${WRKSRC}/source/gpl-2.0.txt	19	LICENSE_FILE_GPLv2= ${WRKSRC}/source/duke3d/gpl-2.0.txt
		20	LICENSE_COMB= multi
		21	LICENSE_PERMS_BUILDLIC= dist-mirror pkg-mirror auto-accept
		22	LICENSE_NAME_BUILDLIC= BUILD SOURCE CODE LICENSE
		23	LICENSE_FILE_BUILDLIC=${WRKSRC}/source/build/buildlic.txt
23		24
24	LIB_DEPENDS= libFLAC.so:audio/flac \	25	LIB_DEPENDS= libFLAC.so:audio/flac \
25	libogg.so:audio/libogg \	26	libogg.so:audio/libogg \
Lines 33-52 Link Here
33	USE_GNOME= gtk20	34	USE_GNOME= gtk20
34	USE_SDL= sdl2 mixer2	35	USE_SDL= sdl2 mixer2
35	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}	36	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
36	SVNREVISION= 5811	37	SVNREVISION= 6079
37	DATADIR= ${LOCALBASE}/share/duke3d	38	DATADIR= ${LOCALBASE}/share/duke3d
38	SUB_FILES= pkg-message	39	SUB_FILES= pkg-message
39	SUB_LIST= DATADIR=${DATADIR}	40	SUB_LIST= DATADIR=${DATADIR}
		41	MAKEFILE= GNUmakefile
40		42
41	CFLAGS+= -flax-vector-conversions
42
43	PLIST_FILES= bin/eduke32 bin/mapster32	43	PLIST_FILES= bin/eduke32 bin/mapster32
44	PORTDOCS= *
45	PORTEXAMPLES= *	44	PORTEXAMPLES= *
46		45
47	BROKEN_sparc64= does not compile on sparc64	46	BROKEN_sparc64= does not compile on sparc64
48		47
49	OPTIONS_DEFINE= DOCS EXAMPLES HRP OFFENSIVE SHAREWARE	48	OPTIONS_DEFINE= EXAMPLES HRP OFFENSIVE SHAREWARE
50	OPTIONS_RADIO= MIDI	49	OPTIONS_RADIO= MIDI
51	OPTIONS_RADIO_MIDI= TIMIDITY TIMIDITYPLUS	50	OPTIONS_RADIO_MIDI= TIMIDITY TIMIDITYPLUS
52	OPTIONS_DEFAULT=TIMIDITY	51	OPTIONS_DEFAULT=TIMIDITY
Lines 76-102 Link Here
76		75
77	post-patch:	76	post-patch:
78	@${REINPLACE_CMD} -e '/^CC=/s\|gcc\|${CC}\|' -e '/^CXX=/s\|g++\|${CXX}\|' \	77	@${REINPLACE_CMD} -e '/^CC=/s\|gcc\|${CC}\|' -e '/^CXX=/s\|g++\|${CXX}\|' \
79	${WRKSRC}/Makefile.common	78	${WRKSRC}/GNUmakefile
80	@${REINPLACE_CMD} 's\|/usr/share/games/eduke32\|${DN3DDIR}\|' \	79	@${REINPLACE_CMD} 's\|/usr/share/games/eduke32\|${DN3DDIR}\|' \
81	${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c	80	${WRKSRC}/source/duke3d/src/game.cpp ${WRKSRC}/source/duke3d/src/astub.cpp
82		81
83	post-patch-ASM-off:	82	post-patch-ASM-off:
84	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common	83	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/GNUmakefile
85		84
86	do-install:	85	do-install:
87	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin	86	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
88	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin	87	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin
89		88
90	do-install-DOCS-on:
91	@${MKDIR} ${STAGEDIR}${DOCSDIR}
92	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR}
93
94	do-install-EXAMPLES-on:	89	do-install-EXAMPLES-on:
95	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	90	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
96	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.map ${STAGEDIR}${EXAMPLESDIR}	91	${INSTALL_DATA} ${WRKSRC}/package/sdk/tiles.cfg ${STAGEDIR}${EXAMPLESDIR}
97	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.m32 ${STAGEDIR}${EXAMPLESDIR}	92	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/* ${STAGEDIR}${EXAMPLESDIR}
98	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
99	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}
100		93
101	do-install-HRP-on:	94	do-install-HRP-on:
102	@${MKDIR} ${STAGEDIR}${DATADIR}	95	@${MKDIR} ${STAGEDIR}${DATADIR}

Lines 1-19 Link Here

(-)files/patch-Makefile.common (-19 lines)
1	--- Makefile.common.orig 2016-06-03 04:50:55 UTC
2	+++ Makefile.common
3	@@ -252,7 +252,6 @@ ifndef LTO
4	endif
5	endif
6
7	-COMMONFLAGS=$(ARCH)
8	COMPILERFLAGS=
9
10	ifeq ($(PACKAGE_REPOSITORY),0)
11	@@ -273,7 +272,7 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10)
12	endif
13
14	CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
15	-CXXONLYFLAGS= -fno-exceptions -fno-rtti
16	+CXXONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive
17	ASFORMAT=elf$(BITS)
18	ASFLAGS=-s -f $(ASFORMAT) #-g
19	LINKERFLAGS=

Lines 1-30 Link Here

(-)files/patch-build_src_engine.c (-30 lines)
1	--- build/src/engine.c.orig 2015-09-23 17:55:31 UTC
2	+++ build/src/engine.c
3	@@ -5349,7 +5349,8 @@ static void drawalls(int32_t bunch)
4	static char fn[32], tmpbuf[80];
5	char purple = getclosestcol(255, 0, 255);
6	char yellow = getclosestcol(255, 255, 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	@@ -8142,7 +8143,7 @@ static void dosetaspect(void)
14	if (xdimen != oxdimen && voxoff[0][0])
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	if (xdimen < 1 << 11)
21	{
22	@@ -11757,7 +11758,7 @@ static void initsmost(void)
23	{
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;