View | Details | Raw Unified | Return to bug 215855 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-9 / +8 lines)
Lines 2-15 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	eduke32
4
PORTNAME=	eduke32
5
PORTVERSION=	20160704
5
PORTVERSION=	20170123
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/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}/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-45 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=	6052
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}
40
41
41
CFLAGS+=	-flax-vector-conversions
42
43
PLIST_FILES=	bin/eduke32 bin/mapster32
42
PLIST_FILES=	bin/eduke32 bin/mapster32
44
PORTDOCS=	*
43
PORTDOCS=	*
45
PORTEXAMPLES=	*
44
PORTEXAMPLES=	*
(-)distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1468168899
1
TIMESTAMP = 1485185228
2
SHA256 (eduke32_src_20160704-5811.tar.xz) = 28a351aff5c1fc8412dfb8aa9f17b1fcfded70e04c3b90a301d2e1e1ead78105
2
SHA256 (eduke32_src_20170123-6052.tar.xz) = c9519a6342709d167369e3f6cc978d854f7de0a492376d6fa01f98c5b3a63f74
3
SIZE (eduke32_src_20160704-5811.tar.xz) = 14125320
3
SIZE (eduke32_src_20170123-6052.tar.xz) = 14709468
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
(-)files/patch-Makefile.common (-19 lines)
Lines 1-19 Link Here
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=
(-)files/patch-build_src_baselayer.c (-11 lines)
Lines 1-11 Link Here
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
 
(-)files/patch-build_src_engine.c (-30 lines)
Lines 1-30 Link Here
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, xdim*ydim);
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;

Return to bug 215855