From a3a5a2fa617ea463fe7096ef4780123565c9e808 Mon Sep 17 00:00:00 2001 From: wawa Date: Sat, 15 Sep 2018 09:26:36 +0000 Subject: [PATCH] forwarding correcttions (NicJA): # fix the build of arx for the x86_64-pc-smp branch # rename the patch so it is consistent with what the buildsystem expects. # fix the create_patch target # add icon git-svn-id: https://svn.aros.org/svn/aros/trunk/ports@55439 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- ...tatis-1.1.2-r1-aros.diff => 1.1.2-r1-aros.diff} | 39 ++++++++++++++++------ game/arx/Arx.info.src | 2 ++ game/arx/mmakefile.src | 22 ++++++++---- 3 files changed, 47 insertions(+), 16 deletions(-) rename game/arx/{ArxLibertatis-1.1.2-r1-aros.diff => 1.1.2-r1-aros.diff} (58%) create mode 100644 game/arx/Arx.info.src diff --git a/game/arx/ArxLibertatis-1.1.2-r1-aros.diff b/game/arx/1.1.2-r1-aros.diff similarity index 58% rename from game/arx/ArxLibertatis-1.1.2-r1-aros.diff rename to game/arx/1.1.2-r1-aros.diff index 72d4e1d..53f59aa 100644 --- a/game/arx/ArxLibertatis-1.1.2-r1-aros.diff +++ b/game/arx/1.1.2-r1-aros.diff @@ -1,6 +1,6 @@ diff -ruN ArxLibertatis-1.1.2-r1/CMakeLists.txt ArxLibertatis-1.1.2-r1.aros/CMakeLists.txt ---- ArxLibertatis-1.1.2-r1/CMakeLists.txt 2016-03-24 22:50:29.000000000 +0100 -+++ ArxLibertatis-1.1.2-r1.aros/CMakeLists.txt 2018-08-22 15:35:48.622489341 +0200 +--- ArxLibertatis-1.1.2-r1/CMakeLists.txt 2016-03-24 21:50:29.000000000 +0000 ++++ ArxLibertatis-1.1.2-r1.aros/CMakeLists.txt 2018-09-15 00:35:05.691554067 +0100 @@ -127,7 +127,9 @@ ) @@ -21,8 +21,8 @@ diff -ruN ArxLibertatis-1.1.2-r1/CMakeLists.txt ArxLibertatis-1.1.2-r1.aros/CMak # Find required libraries diff -ruN ArxLibertatis-1.1.2-r1/src/core/ArxGame.cpp ArxLibertatis-1.1.2-r1.aros/src/core/ArxGame.cpp ---- ArxLibertatis-1.1.2-r1/src/core/ArxGame.cpp 2016-03-24 22:50:29.000000000 +0100 -+++ ArxLibertatis-1.1.2-r1.aros/src/core/ArxGame.cpp 2018-08-22 03:39:51.016571901 +0200 +--- ArxLibertatis-1.1.2-r1/src/core/ArxGame.cpp 2016-03-24 21:50:29.000000000 +0000 ++++ ArxLibertatis-1.1.2-r1.aros/src/core/ArxGame.cpp 2018-09-15 00:35:05.691554067 +0100 @@ -49,6 +49,11 @@ #include #include @@ -36,8 +36,8 @@ diff -ruN ArxLibertatis-1.1.2-r1/src/core/ArxGame.cpp ArxLibertatis-1.1.2-r1.aro #include "ai/PathFinderManager.h" diff -ruN ArxLibertatis-1.1.2-r1/src/gui/MenuWidgets.cpp ArxLibertatis-1.1.2-r1.aros/src/gui/MenuWidgets.cpp ---- ArxLibertatis-1.1.2-r1/src/gui/MenuWidgets.cpp 2016-03-24 22:50:29.000000000 +0100 -+++ ArxLibertatis-1.1.2-r1.aros/src/gui/MenuWidgets.cpp 2018-08-22 03:39:51.016571901 +0200 +--- ArxLibertatis-1.1.2-r1/src/gui/MenuWidgets.cpp 2016-03-24 21:50:29.000000000 +0000 ++++ ArxLibertatis-1.1.2-r1.aros/src/gui/MenuWidgets.cpp 2018-09-15 00:35:05.691554067 +0100 @@ -87,7 +87,7 @@ #include "window/RenderWindow.h" @@ -48,8 +48,8 @@ diff -ruN ArxLibertatis-1.1.2-r1/src/gui/MenuWidgets.cpp ArxLibertatis-1.1.2-r1. using std::max; using std::string; diff -ruN ArxLibertatis-1.1.2-r1/src/input/Input.cpp ArxLibertatis-1.1.2-r1.aros/src/input/Input.cpp ---- ArxLibertatis-1.1.2-r1/src/input/Input.cpp 2016-03-24 22:50:29.000000000 +0100 -+++ ArxLibertatis-1.1.2-r1.aros/src/input/Input.cpp 2018-08-22 03:39:51.016571901 +0200 +--- ArxLibertatis-1.1.2-r1/src/input/Input.cpp 2016-03-24 21:50:29.000000000 +0000 ++++ ArxLibertatis-1.1.2-r1.aros/src/input/Input.cpp 2018-09-15 00:35:05.691554067 +0100 @@ -46,6 +46,11 @@ #include "input/Input.h" @@ -63,8 +63,8 @@ diff -ruN ArxLibertatis-1.1.2-r1/src/input/Input.cpp ArxLibertatis-1.1.2-r1.aros #include diff -ruN ArxLibertatis-1.1.2-r1/src/io/fs/FilesystemPOSIX.cpp ArxLibertatis-1.1.2-r1.aros/src/io/fs/FilesystemPOSIX.cpp ---- ArxLibertatis-1.1.2-r1/src/io/fs/FilesystemPOSIX.cpp 2016-03-24 22:50:29.000000000 +0100 -+++ ArxLibertatis-1.1.2-r1.aros/src/io/fs/FilesystemPOSIX.cpp 2018-08-22 03:39:51.016571901 +0200 +--- ArxLibertatis-1.1.2-r1/src/io/fs/FilesystemPOSIX.cpp 2016-03-24 21:50:29.000000000 +0000 ++++ ArxLibertatis-1.1.2-r1.aros/src/io/fs/FilesystemPOSIX.cpp 2018-09-15 00:35:05.691554067 +0100 @@ -254,7 +254,12 @@ do { @@ -78,3 +78,22 @@ diff -ruN ArxLibertatis-1.1.2-r1/src/io/fs/FilesystemPOSIX.cpp ArxLibertatis-1.1 std::free(_buf), _buf = NULL; return; } +diff -ruN ArxLibertatis-1.1.2-r1/src/platform/Lock.cpp ArxLibertatis-1.1.2-r1.aros/src/platform/Lock.cpp +--- ArxLibertatis-1.1.2-r1/src/platform/Lock.cpp 2016-03-24 21:50:29.000000000 +0000 ++++ ArxLibertatis-1.1.2-r1.aros/src/platform/Lock.cpp 2018-09-15 01:20:15.455282714 +0100 +@@ -24,10 +24,15 @@ + #if defined(ARX_HAVE_PTHREADS) + + Lock::Lock() : locked(false) { ++#if !defined(__AROS__) + const pthread_mutex_t mutex_init = PTHREAD_MUTEX_INITIALIZER; + mutex = mutex_init; + const pthread_cond_t cond_init = PTHREAD_COND_INITIALIZER; + cond = cond_init; ++#else ++ pthread_mutex_init(&mutex, NULL); ++ pthread_cond_init(&cond, NULL); ++#endif + } + + Lock::~Lock() { diff --git a/game/arx/Arx.info.src b/game/arx/Arx.info.src new file mode 100644 index 0000000..42cd57b --- /dev/null +++ b/game/arx/Arx.info.src @@ -0,0 +1,2 @@ +TYPE = TOOL +STACK = 8192 diff --git a/game/arx/mmakefile.src b/game/arx/mmakefile.src index 5a10043..f562324 100644 --- a/game/arx/mmakefile.src +++ b/game/arx/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros-contrib.cfg -#MM- ports-game : ports-game-arx +##MM- ports-game : ports-game-arx #MM- ports-game-arx : \ #MM workbench-libs-freetype-linklibs \ @@ -10,7 +10,8 @@ include $(SRCDIR)/config/aros-contrib.cfg #MM contrib-openal \ #MM ports-libs-glew \ #MM ports-libs-boost \ -#MM ports-game-arx-fetch +#MM ports-game-arx-fetch \ +#MM ports-game-arx-icon PACKAGE := ArxLibertatis VERSION := 1.1.2-r1 @@ -53,18 +54,27 @@ ARX_OPTIONS := \ -DGLEW_LIBRARY=$(AROS_LIB)/libglew.a \ -DBOOST_INCLUDEDIR=$(AROS_INCLUDES) -%fetch mmake=ports-game-arx-fetch archive="1.1.2-r1" suffixes="tar.gz" \ +%fetch mmake=ports-game-arx-fetch archive="$(VERSION)" suffixes="tar.gz" \ location=$(PORTSSOURCEDIR) destination=$(PORTSDIR)/arx \ archive_origins=$(REPOSITORIES) \ - patches_specs=ArxLibertatis-1.1.2-r1-aros.diff::-p0 + patches_specs=$(VERSION)-aros.diff::-p0 %build_with_cmake mmake=ports-game-arx \ srcdir=$(PORTSDIR)/arx/$(PACKAGE)-$(VERSION) prefix=$(TARGETDIR) \ extraoptions="$(ARX_OPTIONS)" %create_patch mmake=ports-game-arx-create-patch \ - archive="$(VERSION)" srcdir="" \ - suffixes="tar.gz" destination="$(PORTSDIR)/arx/$(PACKAGE)-$(VERSION)" + archive="$(VERSION)" srcdir="$(PACKAGE)-$(VERSION)" \ + suffixes="tar.gz" destination="$(PORTSDIR)/arx" + +$(PORTSDIR)/arx/Arx.info.src : $(SRCDIR)/$(CURDIR)/Arx.info.src + @$(CP) $< $@ + +#MM +ports-game-arx-iconsrc : $(PORTSDIR)/arx/Arx.info.src + +%build_icons mmake=ports-game-arx-icon icons=Arx dir=$(TARGETDIR) srcdir=$(PORTSDIR)/arx image=$(PACKAGE)-$(VERSION)/data/icons/arx-libertatis.png +#MM ports-game-arx-icon : ports-game-arx-iconsrc #MM ports-game-arx-clean : -- 2.11.4.GIT