Attachment #240573 for bug #269954

View | Details | Raw Unified | Return to bug 269954
Collapse All | Expand All

Lines 1-5 Link Here

(-)devel/godot/Makefile (-27 / +13 lines)
1	PORTNAME= godot	1	PORTNAME= godot
2	DISTVERSION= 3.4.2	2	DISTVERSION= 4.0
3	DISTVERSIONSUFFIX= -stable	3	DISTVERSIONSUFFIX= -stable
4	PORTREVISION?= 0	4	PORTREVISION?= 0
5	CATEGORIES= devel games	5	CATEGORIES= devel games
Lines 15-20 Link Here
15		15
16	BUILD_DEPENDS= yasm:devel/yasm	16	BUILD_DEPENDS= yasm:devel/yasm
17	LIB_DEPENDS= libfreetype.so:print/freetype2 \	17	LIB_DEPENDS= libfreetype.so:print/freetype2 \
		18	libgraphite2.so:graphics/graphite2 \
		19	libharfbuzz.so:print/harfbuzz \
		20	libharfbuzz-icu.so:print/harfbuzz-icu \
18	libpcre2-8.so:devel/pcre2 \	21	libpcre2-8.so:devel/pcre2 \
19	libpng.so:graphics/png \	22	libpng.so:graphics/png \
20	libvpx.so:multimedia/libvpx	23	libvpx.so:multimedia/libvpx
Lines 22-28 Link Here
22	xdg-open:devel/xdg-utils \	25	xdg-open:devel/xdg-utils \
23	xmessage:x11/xmessage	26	xmessage:x11/xmessage
24		27
25	USES= compiler:c++14-lang cpe gl pkgconfig scons xorg	28	USES= compiler:c++17-lang cpe gl pkgconfig scons xorg
26	USE_XORG= x11 xcursor xext xi xinerama xrandr xrender	29	USE_XORG= x11 xcursor xext xi xinerama xrandr xrender
27	USE_GL= gl glew glu	30	USE_GL= gl glew glu
28		31
Lines 31-45 Link Here
31	USE_GITHUB= yes	34	USE_GITHUB= yes
32	GH_ACCOUNT= godotengine	35	GH_ACCOUNT= godotengine
33		36
34	MAKE_ARGS+= platform=x11 builtin_freetype=False \	37	MAKE_ARGS+= platform=linuxbsd builtin_freetype=False \
		38	builtin_graphite=False builtin_harfbuzz=False \
35	builtin_libpng=False builtin_libvpx=False \	39	builtin_libpng=False builtin_libvpx=False \
36	builtin_pcre2=False builtin_zlib=False verbose=True	40	builtin_pcre2=False builtin_zlib=False verbose=True
37	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}	41	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
38	MAKE_ARGS_clang= use_llvm=True use_lld=True	42	MAKE_ARGS_clang= use_llvm=True linker=lld
39	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}	43	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
40	CXXFLAGS_i386_gcc= -march=i586	44	CXXFLAGS_i386_gcc= -march=i586
41		45
42	# option MONO doesn't build (needs 5.12+) so for now leave it out as an option
43	OPTIONS_DEFINE= EXAMPLES TOOLS UDEV	46	OPTIONS_DEFINE= EXAMPLES TOOLS UDEV
44	OPTIONS_DEFAULT= ALSA UDEV	47	OPTIONS_DEFAULT= ALSA UDEV
45	# Moved to devel/godot-tools	48	# Moved to devel/godot-tools
Lines 51-72 Link Here
51	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	54	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
52	ALSA_MAKE_ARGS= alsa=True	55	ALSA_MAKE_ARGS= alsa=True
53	ALSA_MAKE_ARGS_OFF= alsa=False	56	ALSA_MAKE_ARGS_OFF= alsa=False
54	# tagged 6/11/21 for 3.4	57	# 4.0 head at 3/3
55	EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:585455e67ca3:DEMOS	58	EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:778baf07cc7d:DEMOS
56	EXAMPLES_PORTEXAMPLES= *	59	EXAMPLES_PORTEXAMPLES= *
57	# mono support doesn't build at present
58	MONO_BUILD_DEPENDS= msbuild:devel/msbuild
59	MONO_LIB_DEPENDS= libinotify.so:devel/libinotify
60	MONO_GH_TUPLE= mono:nuget-binary:ebedbf8:NUGT/nuget-binary
61	MONO_MAKE_ARGS= module_mono_enabled=yes mono_glue=True
62	MONO_USES= gettext-runtime mono:nuget
63	NUGET_DEPENDS= DotNet.Glob=2.1.1
64	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	60	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
65	PULSEAUDIO_MAKE_ARGS= pulseaudio=True	61	PULSEAUDIO_MAKE_ARGS= pulseaudio=True
66	PULSEAUDIO_MAKE_ARGS_OFF= pulseaudio=False	62	PULSEAUDIO_MAKE_ARGS_OFF= pulseaudio=False
67	TOOLS_DESC= Include development tools (IDE)	63	TOOLS_DESC= Include development tools (IDE)
68	TOOLS_MAKE_ARGS= target=release_debug tools=True	64	TOOLS_MAKE_ARGS= target=editor
69	TOOLS_MAKE_ARGS_OFF= target=release tools=False	65	TOOLS_MAKE_ARGS_OFF= target=template_release
70	TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \	66	TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \
71	"${GODOTFILE}" "Development;IDE;" ""	67	"${GODOTFILE}" "Development;IDE;" ""
72	TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \	68	TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \
Lines 96-118 Link Here
96	post-patch:	92	post-patch:
97	@${REINPLACE_CMD} -e 's\|custom_build\|${OPSYS}_Ports_build\|' \	93	@${REINPLACE_CMD} -e 's\|custom_build\|${OPSYS}_Ports_build\|' \
98	${WRKSRC}/methods.py	94	${WRKSRC}/methods.py
99	@${REINPLACE_CMD} -e 's\|/usr/bin\|${PREFIX}/bin\|' \
100	${WRKSRC}/platform/x11/os_x11.cpp
101		95
102	pre-build-MONO-on: makenuget
103	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
104	${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
105	target=release_debug tools=True platform=server mono_glue=False)
106	@(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \
107	--generate-mono-glue modules/mono/glue \; && \
108	${FIND} ${WRKSRC}/bin -name 'godot*' -delete)
109
110	# The official godot binary name reflects options used to compile	96	# The official godot binary name reflects options used to compile
111	# We just want a simple name matching the portname	97	# We just want a simple name matching the portname
112	# This gives us bin/godot for runtime and bin/godot-tools for the IDE	98	# This gives us bin/godot for runtime and bin/godot-tools for the IDE
113	do-install:	99	do-install:
114	@${RM} ${WRKSRC}/bin/*.debugsymbols	100	@${RM} ${WRKSRC}/bin/*.debugsymbols
115	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \	101	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.linuxbsd* \
116	${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}	102	${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
117		103
118	do-install-EXAMPLES-on:	104	do-install-EXAMPLES-on:

Lines 1-9 Link Here

(-)devel/godot/distinfo (-9 / +5 lines)
1	TIMESTAMP = 1640725622	1	TIMESTAMP = 1677902012
2	SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a	2	SHA256 (godotengine-godot-4.0-stable_GH0.tar.gz) = e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
3	SIZE (dotnet.glob.2.1.1.nupkg) = 73782	3	SIZE (godotengine-godot-4.0-stable_GH0.tar.gz) = 39355782
4	SHA256 (godotengine-godot-3.4.2-stable_GH0.tar.gz) = d9c1af3a7ae4e8b929f03628b31a711fcfe4673fdaf5aea089316a05528792ff	4	SHA256 (godotengine-godot-demo-projects-778baf07cc7d_GH0.tar.gz) = 42ad5425fd3685887140e404f7fd8abf15ba4a97f475291200e872a1241913fe
5	SIZE (godotengine-godot-3.4.2-stable_GH0.tar.gz) = 49648881	5	SIZE (godotengine-godot-demo-projects-778baf07cc7d_GH0.tar.gz) = 199997674
6	SHA256 (godotengine-godot-demo-projects-585455e67ca3_GH0.tar.gz) = 81c9d263a9d3976363f849d4e4cb9388179f8c206406a20e9f8bd81172fda442
7	SIZE (godotengine-godot-demo-projects-585455e67ca3_GH0.tar.gz) = 158716925
8	SHA256 (mono-nuget-binary-ebedbf8_GH0.tar.gz) = a0362e65a381c99f222ce141012f5a0663b4a4ae22f27f638198f7414464bf1a
9	SIZE (mono-nuget-binary-ebedbf8_GH0.tar.gz) = 2778322

Line 0 Link Here

(-)devel/godot/files/patch-modules_openxr_SCsub (+11 lines)
	1	--- modules/openxr/SCsub.orig 2023-03-02 09:55:48 UTC
	2	+++ modules/openxr/SCsub
	3	@@ -34,7 +34,7 @@ elif env["platform"] == "linuxbsd":
	4	env_openxr.AppendUnique(CPPDEFINES=["XR_USE_PLATFORM_XLIB"])
	5
	6	# FIXME: Review what needs to be set for Android and macOS.
	7	- env_openxr.AppendUnique(CPPDEFINES=["HAVE_SECURE_GETENV"])
	8	+ #env_openxr.AppendUnique(CPPDEFINES=["HAVE_SECURE_GETENV"])
	9	elif env["platform"] == "windows":
	10	env_openxr.AppendUnique(CPPDEFINES=["XR_OS_WINDOWS", "NOMINMAX", "XR_USE_PLATFORM_WIN32"])
	11




--- platform/x11/detect.py.orig	2021-12-21 22:27:28 UTC
+++ platform/x11/detect.py
@@ -338,7 +338,7 @@ def configure(env):
         else:
             print("Warning: PulseAudio development libraries not found. Disabling the PulseAudio audio driver.")
 
-    if platform.system() == "Linux":
+    if platform.system() in ["Linux","FreeBSD"]:
         env.Append(CPPDEFINES=["JOYDEV_ENABLED"])
         if env["udev"]:
             if os.system("pkg-config --exists libudev") == 0:  # 0 means found
@@ -365,7 +365,7 @@ def configure(env):
     if env["execinfo"]:
         env.Append(LIBS=["execinfo"])
 
-    if not env["tools"]:
+    if not env["tools"] and False: # not building templates, just runtime
         import subprocess
         import re
 

Lines 1-11 Link Here

(-)devel/godot/files/patch-platform_x11_libudev-so__wrap.c (-11 lines)
1	--- platform/x11/libudev-so_wrap.c.orig 2021-12-29 15:43:04 UTC
2	+++ platform/x11/libudev-so_wrap.c
3	@@ -279,7 +279,7 @@ int (*udev_util_encode_string_dylibloader_wrapper_libu
4	int initialize_libudev() {
5	void *handle;
6	char *error;
7	- handle = dlopen("libudev.so.1", RTLD_LAZY);
8	+ handle = dlopen("libudev.so.0", RTLD_LAZY);
9	if (!handle) {
10	fprintf(stderr, "%s\n", dlerror());
11	return(1);




--- thirdparty/libvpx/vpx/vpx_codec.h.orig  2019-03-23 14:24:15 UTC
+++ thirdparty/libvpx/vpx/vpx_codec.h
@@ -36,8 +36,8 @@
  * Once initialized, the instance is manged using other functions from
  * the vpx_codec_* family.
  */
-#ifndef VPX_VPX_CODEC_H_
-#define VPX_VPX_CODEC_H_
+#ifndef VPX_VPX_VPX_CODEC_H_
+#define VPX_VPX_VPX_CODEC_H_

 #ifdef __cplusplus
 extern "C" {
@@ -475,5 +475,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif  // VPX_VPX_CODEC_H_
+#endif  // VPX_VPX_VPX_CODEC_H_





--- thirdparty/libvpx/vpx/vpx_decoder.h.orig    2019-03-23 14:46:15 UTC
+++ thirdparty/libvpx/vpx/vpx_decoder.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef VPX_VPX_DECODER_H_
-#define VPX_VPX_DECODER_H_
+#ifndef VPX_VPX_VPX_DECODER_H_
+#define VPX_VPX_VPX_DECODER_H_

 /*!\defgroup decoder Decoder Algorithm Interface
  * \ingroup codec
@@ -374,5 +374,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif  // VPX_VPX_DECODER_H_
+#endif  // VPX_VPX_VPX_DECODER_H_





--- thirdparty/libvpx/vpx/vpx_frame_buffer.h.orig   2019-03-23 14:31:21 UTC
+++ thirdparty/libvpx/vpx/vpx_frame_buffer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */

-#ifndef VPX_VPX_FRAME_BUFFER_H_
-#define VPX_VPX_FRAME_BUFFER_H_
+#ifndef VPX_VPX_VPX_FRAME_BUFFER_H_
+#define VPX_VPX_VPX_FRAME_BUFFER_H_

 /*!\file
  * \brief Describes the decoder external frame buffer interface.
@@ -80,4 +80,4 @@ typedef int (*vpx_release_frame_buffer_cb_fn_t)(
 }  // extern "C"
 #endif

-#endif  // VPX_VPX_FRAME_BUFFER_H_
+#endif  // VPX_VPX_VPX_FRAME_BUFFER_H_




--- thirdparty/libvpx/vpx/vpx_image.h.orig    2019-03-23 14:18:30 UTC
+++ thirdparty/libvpx/vpx/vpx_image.h
@@ -13,8 +13,8 @@
  * \brief Describes the vpx image descriptor and associated operations
  *
  */
-#ifndef VPX_VPX_IMAGE_H_
-#define VPX_VPX_IMAGE_H_
+#ifndef VPX_VPX_VPX_IMAGE_H_
+#define VPX_VPX_VPX_IMAGE_H_

 #ifdef __cplusplus
 extern "C" {
@@ -232,4 +232,4 @@ extern "C" {
 }  // extern "C"
 #endif

-#endif  // VPX_VPX_IMAGE_H_
+#endif  // VPX_VPX_VPX_IMAGE_H_

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_linuxbsd__headers_alsa_asoundlib.h (+11 lines)
	1	--- thirdparty/linuxbsd_headers/alsa/asoundlib.h.orig 2023-03-02 09:54:29 UTC
	2	+++ thirdparty/linuxbsd_headers/alsa/asoundlib.h
	3	@@ -38,7 +38,7 @@
	4	#include <poll.h>
	5	#include <errno.h>
	6	#include <stdarg.h>
	7	-#include <endian.h>
	8	+#include <sys/endian.h>
	9
	10	#ifndef __GNUC__
	11	#define __inline__ inline

Return to bug 269954

Lines 1-20 Link Here

(-)devel/godot/files/patch-platform_x11_detect.py (-20 lines)
1	--- platform/x11/detect.py.orig 2021-12-21 22:27:28 UTC
2	+++ platform/x11/detect.py
3	@@ -338,7 +338,7 @@ def configure(env):
4	else:
5	print("Warning: PulseAudio development libraries not found. Disabling the PulseAudio audio driver.")
6
7	- if platform.system() == "Linux":
8	+ if platform.system() in ["Linux","FreeBSD"]:
9	env.Append(CPPDEFINES=["JOYDEV_ENABLED"])
10	if env["udev"]:
11	if os.system("pkg-config --exists libudev") == 0: # 0 means found
12	@@ -365,7 +365,7 @@ def configure(env):
13	if env["execinfo"]:
14	env.Append(LIBS=["execinfo"])
15
16	- if not env["tools"]:
17	+ if not env["tools"] and False: # not building templates, just runtime
18	import subprocess
19	import re
20

Lines 1-20 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__codec.h (-20 lines)
1	--- thirdparty/libvpx/vpx/vpx_codec.h.orig 2019-03-23 14:24:15 UTC
2	+++ thirdparty/libvpx/vpx/vpx_codec.h
3	@@ -36,8 +36,8 @@
4	* Once initialized, the instance is manged using other functions from
5	* the vpx_codec_* family.
6	*/
7	-#ifndef VPX_VPX_CODEC_H_
8	-#define VPX_VPX_CODEC_H_
9	+#ifndef VPX_VPX_VPX_CODEC_H_
10	+#define VPX_VPX_VPX_CODEC_H_
11
12	#ifdef __cplusplus
13	extern "C" {
14	@@ -475,5 +475,5 @@ extern "C" {
15	#ifdef __cplusplus
16	}
17	#endif
18	-#endif // VPX_VPX_CODEC_H_
19	+#endif // VPX_VPX_VPX_CODEC_H_
20

Lines 1-20 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__decoder.h (-20 lines)
1	--- thirdparty/libvpx/vpx/vpx_decoder.h.orig 2019-03-23 14:46:15 UTC
2	+++ thirdparty/libvpx/vpx/vpx_decoder.h
3	@@ -7,8 +7,8 @@
4	* in the file PATENTS. All contributing project authors may
5	* be found in the AUTHORS file in the root of the source tree.
6	*/
7	-#ifndef VPX_VPX_DECODER_H_
8	-#define VPX_VPX_DECODER_H_
9	+#ifndef VPX_VPX_VPX_DECODER_H_
10	+#define VPX_VPX_VPX_DECODER_H_
11
12	/*!\defgroup decoder Decoder Algorithm Interface
13	* \ingroup codec
14	@@ -374,5 +374,5 @@ extern "C" {
15	#ifdef __cplusplus
16	}
17	#endif
18	-#endif // VPX_VPX_DECODER_H_
19	+#endif // VPX_VPX_VPX_DECODER_H_
20

Lines 1-19 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__frame__buffer.h (-19 lines)
1	--- thirdparty/libvpx/vpx/vpx_frame_buffer.h.orig 2019-03-23 14:31:21 UTC
2	+++ thirdparty/libvpx/vpx/vpx_frame_buffer.h
3	@@ -8,8 +8,8 @@
4	* be found in the AUTHORS file in the root of the source tree.
5	*/
6
7	-#ifndef VPX_VPX_FRAME_BUFFER_H_
8	-#define VPX_VPX_FRAME_BUFFER_H_
9	+#ifndef VPX_VPX_VPX_FRAME_BUFFER_H_
10	+#define VPX_VPX_VPX_FRAME_BUFFER_H_
11
12	/*!\file
13	* \brief Describes the decoder external frame buffer interface.
14	@@ -80,4 +80,4 @@ typedef int (*vpx_release_frame_buffer_cb_fn_t)(
15	} // extern "C"
16	#endif
17
18	-#endif // VPX_VPX_FRAME_BUFFER_H_
19	+#endif // VPX_VPX_VPX_FRAME_BUFFER_H_

Lines 1-19 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__image.h (-19 lines)
1	--- thirdparty/libvpx/vpx/vpx_image.h.orig 2019-03-23 14:18:30 UTC
2	+++ thirdparty/libvpx/vpx/vpx_image.h
3	@@ -13,8 +13,8 @@
4	* \brief Describes the vpx image descriptor and associated operations
5	*
6	*/
7	-#ifndef VPX_VPX_IMAGE_H_
8	-#define VPX_VPX_IMAGE_H_
9	+#ifndef VPX_VPX_VPX_IMAGE_H_
10	+#define VPX_VPX_VPX_IMAGE_H_
11
12	#ifdef __cplusplus
13	extern "C" {
14	@@ -232,4 +232,4 @@ extern "C" {
15	} // extern "C"
16	#endif
17
18	-#endif // VPX_VPX_IMAGE_H_
19	+#endif // VPX_VPX_VPX_IMAGE_H_