Attachment 210943 Details for Bug 243498 – maintainer update to devel/godot2

[patch] maintainer update to devel/godot2

godot2.patch (text/plain), 2.91 KB, created by Shane on 2020-01-22 05:26:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2020-01-22 05:26:04 UTC

Size: 2.91 KB

patch

obsolete

>diff -Nru devel/godot2.orig/Makefile devel/godot2/Makefile
>--- devel/godot2.orig/Makefile	2020-01-22 14:25:08.653642000 +1030
>+++ devel/godot2/Makefile	2020-01-22 14:25:01.309765000 +1030
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-PORTVERSION=	2.1.5
>+PORTVERSION=	2.1.6
> DISTVERSIONSUFFIX=	-stable
>-PORTREVISION=	3
> CATEGORIES=	devel games
> PKGNAMESUFFIX?=	2
> 
>@@ -37,6 +36,10 @@
> CXXFLAGS+=		-DGLEW_NO_GLU -DRTAUDIO_ENABLED
> CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
> CXXFLAGS_i386_gcc=	-march=i586
>+CXXFLAGS_aarch64=	-DNO_THREADS
>+CXXFLAGS_sparc64=	-DNO_THREADS
>+CXXFLAGS_mips=		-DNO_THREADS
>+CXXFLAGS_mips64=	-DNO_THREADS
> LDFLAGS+=		-lspeex -lmpcdec
> 
> OPTIONS_DEFINE=		EXAMPLES TOOLS
>@@ -74,6 +77,15 @@
> .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} != amd64 && ${ARCH} != i386
>+# use system libvpx for non-x86 platforms
>+# the internal copy is patched for x86
>+LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
>+MAKE_ARGS+=	builtin_libvpx=False
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
> 		${WRKSRC}/methods.py
>@@ -97,4 +109,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -Nru devel/godot2.orig/distinfo devel/godot2/distinfo
>--- devel/godot2.orig/distinfo	2020-01-22 14:25:08.637107000 +1030
>+++ devel/godot2/distinfo	2020-01-22 13:49:09.047270000 +1030
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1536385697
>-SHA256 (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 74179c08bcc20cc89b4ac2785a31f201d81eb4aa875c80ffcb82d9fb80e8e187
>-SIZE (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 15026226
>+TIMESTAMP = 1579663149
>+SHA256 (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 5bfc57f2ee24dccfdcefe491a3be1a07b39299f2fcfa03202b8b4c6c2dd5122b
>+SIZE (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 15043275
> SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75
> SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045
>diff -Nru devel/godot2.orig/files/patch-SConstruct devel/godot2/files/patch-SConstruct
>--- devel/godot2.orig/files/patch-SConstruct	2020-01-22 14:25:08.751495000 +1030
>+++ devel/godot2/files/patch-SConstruct	2020-01-22 13:54:59.317254000 +1030
>@@ -21,17 +21,16 @@
> -    CFLAGS = env.get('CFLAGS', '')
> -    env['CFLAGS'] = ''
> -
>--    env.Append(CFLAGS=str(CFLAGS).split())
> +    env['CC'] = os.environ['CC']
> +    env['CXX'] = os.environ['CXX']
> +    
> +    CFLAGS = os.environ['CFLAGS']
> +    env['CFLAGS'] = []
>-+    env.Append(CFLAGS=string.split(str(CFLAGS)))
>+     env.Append(CFLAGS=str(CFLAGS).split())
> +    
> +    CCFLAGS = os.environ['CXXFLAGS']
> +    env['CCFLAGS'] = []
>-+    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
>++    env.Append(CCFLAGS=str(CCFLAGS).split())
>  
>      LINKFLAGS = env.get('LINKFLAGS', '')
>      env['LINKFLAGS'] = ''

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 243498: 210943 | 210945