serious-engine-tfe-git: update patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: serious-engine-tfe-git: update patches
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Thu, 28 Jul 2022 20:41:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Jul 28 22:41:20 2022 +0200
Changeset:	92925ee8aa3dccc455e9b3a711490903ba857174

Modified Files:
	serious-engine-tfe-git/distinfo
	serious-engine-tfe-git/patches/patch-CMakeLists.txt
	serious-engine-tfe-git/patches/patch-Ecc_StdH.h

Log Message:
serious-engine-tfe-git: update patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=92925ee8aa3dccc455e9b3a711490903ba857174

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 serious-engine-tfe-git/distinfo                    |  4 +--
 .../patches/patch-CMakeLists.txt                   | 35 ++++++++--------------
 serious-engine-tfe-git/patches/patch-Ecc_StdH.h    | 17 +++++------
 3 files changed, 22 insertions(+), 34 deletions(-)

diffs:
diff --git a/serious-engine-tfe-git/distinfo b/serious-engine-tfe-git/distinfo
index f8546eb5aa..f2c5724aac 100644
--- a/serious-engine-tfe-git/distinfo
+++ b/serious-engine-tfe-git/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-CMakeLists.txt) = 8118cf60d01846bf0772e9e7a89a7f5e5b8035a5
-SHA1 (patch-Ecc_StdH.h) = e8c1bc298362db1781b5d15aeebcc10201ab8600
+SHA1 (patch-CMakeLists.txt) = f6b11c87050e7946f560ccad5bfc43fef5571f3c
+SHA1 (patch-Ecc_StdH.h) = 3acfb3c738d2bcc42a5c17d8df7c7f9f0c378859
 SHA1 (patch-Engine_Base_Unix_UnixDynamicLoader.cpp) = 51c406427eadf287df4a6be1990e427730bb2204
 SHA1 (patch-Engine_Engine.cpp) = 482b4af4d14aeade6c49703dc3578b730969280c
diff --git a/serious-engine-tfe-git/patches/patch-CMakeLists.txt b/serious-engine-tfe-git/patches/patch-CMakeLists.txt
index 7358fc5fdd..2a8d82eaff 100644
--- a/serious-engine-tfe-git/patches/patch-CMakeLists.txt
+++ b/serious-engine-tfe-git/patches/patch-CMakeLists.txt
@@ -5,9 +5,9 @@ $NetBSD$
 3) Name the executables according to "the first encounter" or "the second encounter"
 4) Install the files in more reasonable places.
 
---- CMakeLists.txt.orig	2020-09-04 12:08:26.000000000 +0000
+--- CMakeLists.txt.orig	2022-07-28 19:12:44.000000000 +0000
 +++ CMakeLists.txt
-@@ -60,6 +60,31 @@ if(USE_SYSTEM_ZLIB)
+@@ -61,6 +61,31 @@ if(USE_SYSTEM_ZLIB)
      endif()
  endif()
  
@@ -39,7 +39,7 @@ $NetBSD$
  # RAKE! Where to install the binaries.
  if(CMAKE_INSTALL_PREFIX STREQUAL "/usr/local" OR CMAKE_INSTALL_PREFIX STREQUAL "") # Only works for linux since I don't
                                                                                     # know what default is for windows/macos/freebsd.
-@@ -75,6 +100,12 @@ endif()
+@@ -76,6 +101,12 @@ endif()
  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
      SET(FREEBSD TRUE)
  endif()
@@ -52,7 +52,7 @@ $NetBSD$
  if(APPLE)
      SET(MACOSX TRUE)
  endif()
-@@ -180,7 +211,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_CO
+@@ -195,7 +226,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_CO
      		add_definitions(-D_FILE_OFFSET_BITS=64)
      		add_definitions(-D_LARGEFILE_SOURCE=1)
      		add_definitions(-DPRAGMA_ONCE=1)
@@ -61,7 +61,7 @@ $NetBSD$
      		set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
      		add_definitions(-DPLATFORM_UNIX=1)
      		add_definitions(-DPLATFORM_FREEBSD=1)
-@@ -190,7 +221,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_CO
+@@ -205,7 +236,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_CO
      		include_directories("/usr/local/include")
  	endif()
  	
@@ -70,7 +70,7 @@ $NetBSD$
  		add_compile_options(-pthread)
                  add_compile_options(-fsigned-char)
  	endif()
-@@ -272,8 +303,10 @@ option(TFE "Compile a The First Encounte
+@@ -287,8 +318,10 @@ option(TFE "Compile a The First Encounte
  if (TFE)
   add_definitions(-DFIRST_ENCOUNTER=1)
   set(MP "")
@@ -81,7 +81,7 @@ $NetBSD$
  endif()
  
  
-@@ -286,7 +319,7 @@ endif()
+@@ -301,7 +334,7 @@ endif()
  
  include_directories(
      .
@@ -90,18 +90,7 @@ $NetBSD$
  )
  if(USE_TREMOR)
  if(PANDORA)
-@@ -294,8 +327,8 @@ if(PANDORA)
- else()
-     # !!!Do something here!
- endif()
--else()
--    include_directories(External/libvorbis/include)
-+#else()
-+#    include_directories(External/libvorbis/include)
- endif()
- 
- # We build ECC, then use it to generate C++ code for the game entities...
-@@ -1001,6 +1034,9 @@ if(LINUX)
+@@ -992,6 +1025,9 @@ if(LINUX)
      target_link_libraries(ssam "m")
      target_link_libraries(ssam "dl")
      target_link_libraries(ssam "pthread")
@@ -111,7 +100,7 @@ $NetBSD$
      target_link_libraries(ssam ${SDL2_LIBRARY})
      target_link_libraries(ssam ${ZLIB_LIBRARIES})
      if(PANDORA)
-@@ -1016,10 +1052,13 @@ if(LINUX)
+@@ -1007,10 +1043,13 @@ if(LINUX)
      endif()
  endif()
  
@@ -126,7 +115,7 @@ $NetBSD$
      target_link_libraries(ssam ${SDL2_LIBRARY})
      target_link_libraries(ssam ${ZLIB_LIBRARIES})
      if(BUILD_DEDICATED_SERVER)
-@@ -1031,9 +1070,7 @@ if(FREEBSD)
+@@ -1022,9 +1061,7 @@ if(FREEBSD)
      endif()
  endif()
  
@@ -137,7 +126,7 @@ $NetBSD$
  
  # RAKE! Install Section.
  if(DEBUG) # RAKE! Will this work with TFE?
-@@ -1048,8 +1085,8 @@ if(DEBUG) # RAKE! Will this work with TF
+@@ -1039,8 +1076,8 @@ if(DEBUG) # RAKE! Will this work with TF
      endif()
  else()
      install(TARGETS ssam ${SHADERSLIB} ${GAMEMPLIB} ${ENTITIESMPLIB}
@@ -148,7 +137,7 @@ $NetBSD$
              PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
      if(BUILD_DEDICATED_SERVER)
          install(TARGETS SeriousSamDedicated
-@@ -1062,7 +1099,7 @@ endif()
+@@ -1053,7 +1090,7 @@ endif()
  # and SE1_10.gro needs to be installed to Games root dir.
  if(NOT LOCAL_INSTALL)
      install(FILES ${CMAKE_SOURCE_DIR}/../SE1_10.gro
diff --git a/serious-engine-tfe-git/patches/patch-Ecc_StdH.h b/serious-engine-tfe-git/patches/patch-Ecc_StdH.h
index 04973f0664..940220578e 100644
--- a/serious-engine-tfe-git/patches/patch-Ecc_StdH.h
+++ b/serious-engine-tfe-git/patches/patch-Ecc_StdH.h
@@ -2,18 +2,20 @@ $NetBSD$
 
 Use the appropriate C++ header files.
 
---- Ecc/StdH.h.orig	2020-08-26 21:54:20.806586674 +0000
+--- Ecc/StdH.h.orig	2022-07-28 19:12:44.000000000 +0000
 +++ Ecc/StdH.h
-@@ -14,19 +14,19 @@ with this program; if not, write to the 
+@@ -13,18 +13,18 @@ You should have received a copy of the G
+ with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
  
- #include <ctype.h>
+-#include <ctype.h>
 -#include <assert.h>
 -#include <stdio.h>
 -#include <stdlib.h>
 -#include <string.h>
 -#include <stdarg.h>
 -#include <math.h>
++#include <cctype>
 +#include <cassert>
 +#include <cstdio>
 +#include <cstdlib>
@@ -21,12 +23,9 @@ Use the appropriate C++ header files.
 +#include <cstdarg>
 +#include <cmath>
  
- #ifdef PLATFORM_WIN32
--#include <malloc.h>
-+#include <cmalloc>
- #endif
- 
- #ifdef PLATFORM_UNIX
+ #ifdef _WIN32
+ #include <malloc.h>
+ #else
 -#include <errno.h>
 +#include <cerrno>
  #include <sys/param.h>
Prev by Date: clock-signal: Update to 2022-07-23
Next by Date: frobtads: update to frobtads-2.0
Previous by Thread: clock-signal: Update to 2022-07-23
Next by Thread: frobtads: update to frobtads-2.0
Indexes:
Home | Main Index | Thread Index | Old Index