Hi,

The following diff updates Godot to 3.0.3.

Port changes:
- update maintainer email
- pulse-simple is no longer WANTLIB. Consolidate WANTLIB into fewer
  lines while at it.
- clang6-related patches have been upstreamed.
- Still no C# support in our port - sorry to keep everyone waiting ;-)

Upstream announcement touts many bug fixes in ~350 patches.
More info here:

https://godotengine.org/article/maintenance-release-godot-3-0-3

Builds and runs fine on my amd64, including sound playback.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    5 Jun 2018 07:32:39 -0000       1.3
+++ Makefile    16 Jun 2018 17:14:16 -0000
@@ -2,12 +2,12 @@
 
 COMMENT =      2D and 3D game engine
 
-V =            3.0.2
+V =            3.0.3
 DISTNAME =     godot-${V}-stable
 PKGNAME =      godot-${V}
 CATEGORIES =   games
 HOMEPAGE =     https://godotengine.org/
-MAINTAINER =   Thomas Frohwein <[email protected]>
+MAINTAINER =   Thomas Frohwein <[email protected]>
 
 # MIT
 PERMIT_PACKAGE_CDROM = Yes
@@ -15,9 +15,8 @@ PERMIT_PACKAGE_CDROM =        Yes
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender c crypto enet execinfo freetype intl m mpcdec
-WANTLIB += ogg opus opusfile png pulse pulse-simple ssl theora
-WANTLIB += theoradec vorbis vorbisfile webp xcb z
-WANTLIB += pcre2-32 vpx zstd
+WANTLIB += ogg opus opusfile png pulse ssl theora theoradec vorbis
+WANTLIB += vorbisfile webp xcb z pcre2-32 vpx zstd
 
 MASTER_SITES = https://downloads.tuxfamily.org/godotengine/${V}/
 EXTRACT_SUFX = .tar.xz
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/godot/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo    5 Jun 2018 07:32:39 -0000       1.2
+++ distinfo    16 Jun 2018 17:14:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (godot-3.0.2-stable.tar.xz) = 
7qkKO9kY80nR0Q/qp9QjaHK7mpm1r0mU5Fu5ThLyDy8=
-SIZE (godot-3.0.2-stable.tar.xz) = 12433456
+SHA256 (godot-3.0.3-stable.tar.xz) = 
/BseyF4mlWYir5GEjQrn3jAB8c+FYrVfYUrJ3YmP0M4=
+SIZE (godot-3.0.3-stable.tar.xz) = 12494768
Index: patches/patch-core_project_settings_cpp
===================================================================
RCS file: /cvs/ports/games/godot/patches/patch-core_project_settings_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-core_project_settings_cpp
--- patches/patch-core_project_settings_cpp     27 Apr 2018 07:32:53 -0000      
1.1.1.1
+++ patches/patch-core_project_settings_cpp     16 Jun 2018 17:14:16 -0000
@@ -9,7 +9,7 @@ based on github issue #17374
 Index: core/project_settings.cpp
 --- core/project_settings.cpp.orig
 +++ core/project_settings.cpp
-@@ -1038,14 +1038,11 @@ ProjectSettings::ProjectSettings() {
+@@ -1041,14 +1041,11 @@ ProjectSettings::ProjectSettings() {
        GLOBAL_DEF("debug/settings/profiler/max_functions", 16384);
  
        //assigning here, because using GLOBAL_GET on every block for 
compressing can be slow
Index: patches/patch-drivers_unix_os_unix_cpp
===================================================================
RCS file: /cvs/ports/games/godot/patches/patch-drivers_unix_os_unix_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-drivers_unix_os_unix_cpp
--- patches/patch-drivers_unix_os_unix_cpp      9 May 2018 20:26:08 -0000       
1.2
+++ patches/patch-drivers_unix_os_unix_cpp      16 Jun 2018 17:14:16 -0000
@@ -1,21 +1,11 @@
 $OpenBSD: patch-drivers_unix_os_unix_cpp,v 1.2 2018/05/09 20:26:08 sthen Exp $
 
-- fix with clang6 on ILP32 arches
 - hardcode executable path
 
 Index: drivers/unix/os_unix.cpp
 --- drivers/unix/os_unix.cpp.orig
 +++ drivers/unix/os_unix.cpp
-@@ -235,7 +235,7 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_info() const {
- 
- void OS_Unix::delay_usec(uint32_t p_usec) const {
- 
--      struct timespec rem = { p_usec / 1000000, (p_usec % 1000000) * 1000 };
-+      struct timespec rem = { p_usec / 1000000, static_cast<long>((p_usec % 
1000000) * 1000) };
-       while (nanosleep(&rem, &rem) == EINTR) {
-       }
- }
-@@ -456,7 +456,7 @@ String OS_Unix::get_executable_path() const {
+@@ -462,7 +462,7 @@ String OS_Unix::get_executable_path() const {
  #elif defined(__OpenBSD__)
        char resolved_path[MAXPATHLEN];
  
Index: patches/patch-scene_gui_rich_text_label_cpp
===================================================================
RCS file: patches/patch-scene_gui_rich_text_label_cpp
diff -N patches/patch-scene_gui_rich_text_label_cpp
--- patches/patch-scene_gui_rich_text_label_cpp 27 Apr 2018 07:32:53 -0000      
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-scene_gui_rich_text_label_cpp,v 1.1.1.1 2018/04/27 07:32:53 
bentley Exp $
-
-fix the invalid/undefined assignment to nullptr of int type (clang6?)
-
-Index: scene/gui/rich_text_label.cpp
---- scene/gui/rich_text_label.cpp.orig
-+++ scene/gui/rich_text_label.cpp
-@@ -829,9 +829,9 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event
-                                                       // Erase previous 
selection.
-                                                       if (selection.active) {
-                                                               selection.from 
= NULL;
--                                                              
selection.from_char = NULL;
-+                                                              
selection.from_char = '\0';
-                                                               selection.to = 
NULL;
--                                                              
selection.to_char = NULL;
-+                                                              
selection.to_char = '\0';
-                                                               
selection.active = false;
- 
-                                                               update();

Reply via email to