Attachment 179600 Details for Bug 215855 – patch

[patch] patch

eduke32.patch (text/plain), 6.58 KB, created by Piotr Kubaj on 2017-02-04 15:12:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2017-02-04 15:12:59 UTC

Size: 6.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433169)
>+++ Makefile	(working copy)
>@@ -2,14 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	eduke32
>-PORTVERSION=	20160704
>-PORTREVISION=	2
>+PORTVERSION=	20170203
> 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
>@@ -18,8 +15,12 @@
> MAINTAINER=	pkubaj@anongoth.pl
> COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
> 
>-LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/source/gpl-2.0.txt
>+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 \
>@@ -33,20 +34,18 @@
> USE_GNOME=	gtk20
> USE_SDL=	sdl2 mixer2
> WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
>-SVNREVISION=	5811
>+SVNREVISION=	6059
> 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=	DOCS EXAMPLES HRP OFFENSIVE SHAREWARE
>+OPTIONS_DEFINE=	EXAMPLES HRP OFFENSIVE SHAREWARE
> OPTIONS_RADIO=	MIDI
> OPTIONS_RADIO_MIDI=	TIMIDITY TIMIDITYPLUS
> OPTIONS_DEFAULT=TIMIDITY
>@@ -76,27 +75,21 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/^CC=/s|gcc|${CC}|' -e '/^CXX=/s|g++|${CXX}|' \
>-		${WRKSRC}/Makefile.common
>+		${WRKSRC}/GNUmakefile
> 	@${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DN3DDIR}|' \
>-		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
>+		${WRKSRC}/source/duke3d/src/game.cpp ${WRKSRC}/source/duke3d/src/astub.cpp
> 
> post-patch-ASM-off:
>-	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common
>+	@${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/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}
>+	${INSTALL_DATA} ${WRKSRC}/package/sdk/tiles.cfg ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/* ${STAGEDIR}${EXAMPLESDIR}
> 
> do-install-HRP-on:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 433169)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1468168899
>-SHA256 (eduke32_src_20160704-5811.tar.xz) = 28a351aff5c1fc8412dfb8aa9f17b1fcfded70e04c3b90a301d2e1e1ead78105
>-SIZE (eduke32_src_20160704-5811.tar.xz) = 14125320
>+TIMESTAMP = 1486213409
>+SHA256 (eduke32_src_20170203-6059.tar.xz) = f326c51e3e7bbe08cc2a6190d099bf1c1d81f010016cad1ef09e0d4247b5c1f0
>+SIZE (eduke32_src_20170203-6059.tar.xz) = 14762752
> SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
> SIZE (duke3d_hrp.zip) = 933440151
> SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534
>Index: files/patch-Makefile.common
>===================================================================
>--- files/patch-Makefile.common	(revision 433169)
>+++ files/patch-Makefile.common	(working copy)
>@@ -1,19 +0,0 @@
>---- 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=
>Index: files/patch-build_src_baselayer.c
>===================================================================
>--- files/patch-build_src_baselayer.c	(revision 433169)
>+++ files/patch-build_src_baselayer.c	(working copy)
>@@ -1,11 +0,0 @@
>---- build/src/baselayer.c.orig	2016-05-29 21:11:27 UTC
>-+++ build/src/baselayer.c
>-@@ -227,7 +227,7 @@ void calc_ylookup(int32_t bpl, int32_t l
>-     {
>-         Baligned_free(ylookup);
>- 
>--        ylookup = (intptr_t *)Xaligned_alloc(16, lastyidx * sizeof(intptr_t));
>-+	posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t));
>-         ylookupsiz = lastyidx;
>-     }
>- 
>Index: files/patch-build_src_engine.c
>===================================================================
>--- files/patch-build_src_engine.c	(revision 433169)
>+++ files/patch-build_src_engine.c	(working copy)
>@@ -1,30 +0,0 @@
>---- 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;

Actions: View | Diff

Attachments on bug 215855: 178603 | 179273 | 179600 | 180341