From b63d1a372cbcd24ad06058ee4cddab43ae2f9c85 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sun, 4 Mar 2018 10:38:28 +0100 Subject: [PATCH] eduke32: Bump (#2250) * Bump * Cleanup, license * Rename license --- ...35.recipe => eduke32-20180224_6694.recipe} | 19 +- games-fps/eduke32/licenses/Build_Engine | 71 +++++++ ...atchset => eduke32-20180224_6694.patchset} | 182 ++++++++---------- 3 files changed, 160 insertions(+), 112 deletions(-) rename games-fps/eduke32/{eduke32-20170518_6135.recipe => eduke32-20180224_6694.recipe} (88%) create mode 100644 games-fps/eduke32/licenses/Build_Engine rename games-fps/eduke32/patches/{eduke32-20170518_6135.patchset => eduke32-20180224_6694.patchset} (61%) diff --git a/games-fps/eduke32/eduke32-20170518_6135.recipe b/games-fps/eduke32/eduke32-20180224_6694.recipe similarity index 88% rename from games-fps/eduke32/eduke32-20170518_6135.recipe rename to games-fps/eduke32/eduke32-20180224_6694.recipe index 98404779f..9acec85df 100644 --- a/games-fps/eduke32/eduke32-20170518_6135.recipe +++ b/games-fps/eduke32/eduke32-20180224_6694.recipe @@ -31,13 +31,14 @@ years ago * EDuke32 makes sandwiches!" HOMEPAGE="http://www.eduke32.com/" COPYRIGHT="1993-1997 Ken Silverman - 2006-2017 eduke32 Team" -LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="http://dukeworld.duke4.net/eduke32/synthesis/20170518-6135/eduke32_src_20170518-6135.tar.xz" -CHECKSUM_SHA256="539f928f9cee88a3d1dbcbf1f99a2e44e2d078185f99cf4ab6ed05922d450d2d" -SOURCE_DIR="eduke32_20170518-6135" -PATCHES="eduke32-20170518_6135.patchset" + 2006-2018 eduke32 Team" +LICENSE="GNU GPL v2 + Build_Engine" +REVISION="1" +SOURCE_URI="http://dukeworld.com/eduke32/synthesis/${portVersion/_/-}/eduke32_src_${portVersion/_/-}.tar.xz" +CHECKSUM_SHA256="23bca589baa7937212ad058265811a70328b62353ee39c2028803279a7889070" +SOURCE_DIR="eduke32_${portVersion/_/-}" +PATCHES="eduke32-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -88,6 +89,10 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage eduke32$secondaryArchSuffix \ + $binDir/eduke32 \ + $binDir/mapster32 + BUILD() { make $jobArgs \ diff --git a/games-fps/eduke32/licenses/Build_Engine b/games-fps/eduke32/licenses/Build_Engine new file mode 100644 index 000000000..3a3985bb6 --- /dev/null +++ b/games-fps/eduke32/licenses/Build_Engine @@ -0,0 +1,71 @@ +BUILD SOURCE CODE LICENSE TERMS: 06/20/2000 + +[1] I give you permission to make modifications to my Build source and + distribute it, BUT: + +[2] Any derivative works based on my Build source may be distributed ONLY + through the INTERNET. + +[3] Distribution of any derivative works MUST be done completely FREE of + charge - no commercial exploitation whatsoever. + +[4] Anything you distribute which uses a part of my Build Engine source + code MUST include: + + [A] The following message somewhere in the archive: + + // "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman + // Ken Silverman's official web site: "http://www.advsys.net/ken" + // See the included license file "BUILDLIC.TXT" for license info. + + [B] This text file "BUILDLIC.TXT" along with it. + + [C] Any source files that you modify must include this message as well: + + // This file has been modified from Ken Silverman's original release + +[5] The use of the Build Engine for commercial purposes will require an + appropriate license arrangement with me. Contact information is + on my web site. + +[6] I take no responsibility for damage to your system. + +[7] Technical support: Before contacting me with questions, please read + and do ALL of the following! + + [A] Look through ALL of my text files. There are 7 of them (including this + one). I like to think that I wrote them for a reason. You will find + many of your answers in the history section of BUILD.TXT and + BUILD2.TXT (they're located inside SRC.ZIP). + + [B] If that doesn't satisfy you, then try going to: + + "http://www.advsys.net/ken/buildsrc" + + where I will maintain a Build Source Code FAQ (or perhaps I might + just provide a link to a good FAQ). + + [C] I am willing to respond to questions, but ONLY if they come at a rate + that I can handle. + + PLEASE TRY TO AVOID ASKING DUPLICATE QUESTIONS! + + As my line of defense, I will post my current policy about + answering Build source questions (right below the E-mail address + on my web site.) You can check there to see if I'm getting + overloaded with questions or not. + + If I'm too busy, it might say something like this: + + I'm too busy to answer Build source questions right now. + Sorry, but don't expect a reply from me any time soon. + + If I'm open for Build source questions, please state your question + clearly and don't include any unsolicited attachments unless + they're really small (like less than 50k). Assume that I have + a 28.8k modem. Also, don't leave out important details just + to make your question appear shorter - making me guess what + you're asking doesn't save me time! + +---------------------------------------------------------------------------- +-Ken S. (official web site: http://www.advsys.net/ken) diff --git a/games-fps/eduke32/patches/eduke32-20170518_6135.patchset b/games-fps/eduke32/patches/eduke32-20180224_6694.patchset similarity index 61% rename from games-fps/eduke32/patches/eduke32-20170518_6135.patchset rename to games-fps/eduke32/patches/eduke32-20180224_6694.patchset index b641d6c09..436d753de 100644 --- a/games-fps/eduke32/patches/eduke32-20170518_6135.patchset +++ b/games-fps/eduke32/patches/eduke32-20180224_6694.patchset @@ -1,32 +1,87 @@ -From a6cd111118bb90838cd5a4c02a0751717d610d45 Mon Sep 17 00:00:00 2001 +From 68865ee289078b991e257621597ef93b17887a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 3 Jun 2017 16:02:01 +0200 -Subject: Haiku: endiannes fix +Date: Sun, 25 Feb 2018 11:10:26 +0100 +Subject: [PATCH] Haiku supporting patches +--- + Common.mak | 20 ++++++++++++++------ + GNUmakefile | 4 ++++ + source/build/include/compat.h | 2 +- + source/build/src/kplib.cpp | 20 ++++++++++++-------- + source/duke3d/src/common.cpp | 2 ++ + 5 files changed, 33 insertions(+), 15 deletions(-) +diff --git a/Common.mak b/Common.mak +index f101b27..11fa9a6 100644 +--- a/Common.mak ++++ b/Common.mak +@@ -33,6 +33,8 @@ ifndef HOSTPLATFORM + HOSTPLATFORM := DARWIN + else ifeq ($(findstring BeOS,$(uname)),BeOS) + HOSTPLATFORM := BEOS ++ else ifeq ($(findstring Haiku,$(uname)),Haiku) ++ HOSTPLATFORM=HAIKU + else ifeq ($(findstring skyos,$(uname)),skyos) + HOSTPLATFORM := SKYOS + else ifeq ($(findstring QNX,$(uname)),QNX) +@@ -957,17 +959,23 @@ else ifeq ($(SUBPLATFORM),LINUX) + LIBS += -lrt + endif + +-ifeq (,$(filter $(PLATFORM),WINDOWS WII)) +- ifneq ($(PLATFORM),BSD) +- LIBS += -ldl +- endif +- ifneq ($(PLATFORM),DARWIN) +- LIBS += -pthread ++ifneq ($(PLATFORM),HAIKU) ++ ifeq (,$(filter $(PLATFORM),WINDOWS WII)) ++ ifneq ($(PLATFORM),BSD) ++ LIBS += -ldl ++ endif ++ ifneq ($(PLATFORM),DARWIN) ++ LIBS += -pthread ++ endif + endif + endif + + LIBS += -lm + ++ifeq ($(PLATFORM),HAIKU) ++ LIBS+= -lnetwork ++endif ++ + + ##### Detect version control revision, if applicable + +diff --git a/GNUmakefile b/GNUmakefile +index e250f9b..1de4006 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -612,6 +612,10 @@ ifeq ($(PLATFORM),BSD) + LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo + endif + ++ifeq ($(PLATFORM),HAIKU) ++ LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo -lnetwork ++endif ++ + ifeq ($(PLATFORM),DARWIN) + LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \ + -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \ diff --git a/source/build/include/compat.h b/source/build/include/compat.h -index 035fdc1..9a34a6b 100644 +index c0b8761..544fd64 100644 --- a/source/build/include/compat.h +++ b/source/build/include/compat.h -@@ -279,7 +279,7 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 || +@@ -331,7 +331,7 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 || # endif # include - + -#elif defined(__BEOS__) +#elif defined(__BEOS__) || defined(__HAIKU__) # include # if LITTLE_ENDIAN != 0 # define B_LITTLE_ENDIAN 1 --- -2.12.2 - - -From 71dc7c0d342f07766cb4ee4ce04b080bf1e32b61 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 3 Jun 2017 17:31:49 +0200 -Subject: Haiku: build fix - - diff --git a/source/build/src/kplib.cpp b/source/build/src/kplib.cpp index 601892d..c0c3e77 100644 --- a/source/build/src/kplib.cpp @@ -34,7 +89,7 @@ index 601892d..c0c3e77 100644 @@ -34,6 +34,10 @@ credits. #include "kplib.h" #include "pragmas.h" - + +#ifdef __HAIKU__ +#include +#endif @@ -65,95 +120,11 @@ index 601892d..c0c3e77 100644 #endif return 1; } --- -2.12.2 - -From 537ab2e7986ff33d27056ec0c1a3018b9fe28eaa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 4 Jun 2017 08:04:43 +0200 -Subject: [PATCH] Platform specific fixes - ---- - Common.mak | 22 +++++++++++++++------- - GNUmakefile | 4 ++++ - 2 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/Common.mak b/Common.mak -index eb6cb47..4fc96fe 100644 ---- a/Common.mak -+++ b/Common.mak -@@ -123,6 +123,8 @@ ifndef HOSTPLATFORM - HOSTPLATFORM=DARWIN - else ifeq ($(findstring BeOS,$(uname)),BeOS) - HOSTPLATFORM=BEOS -+ else ifeq ($(findstring Haiku,$(uname)),Haiku) -+ HOSTPLATFORM=HAIKU - else ifeq ($(findstring skyos,$(uname)),skyos) - HOSTPLATFORM=SKYOS - else ifeq ($(findstring QNX,$(uname)),QNX) -@@ -948,17 +950,23 @@ ifneq (0,$(POLYMER)) - endif - - --ifneq ($(PLATFORM),WINDOWS) -- ifneq ($(PLATFORM),WII) -- ifneq ($(PLATFORM),BSD) -- LIBS+= -ldl -- endif -- ifneq ($(PLATFORM),DARWIN) -- LIBS+= -pthread -+ifneq ($(PLATFORM),HAIKU) -+ ifneq ($(PLATFORM),WINDOWS) -+ ifneq ($(PLATFORM),WII) -+ ifneq ($(PLATFORM),BSD) -+ LIBS+= -ldl -+ endif -+ ifneq ($(PLATFORM),DARWIN) -+ LIBS+= -pthread -+ endif - endif - endif - endif - -+ifeq ($(PLATFORM),HAIKU) -+ LIBS+= -lpthread -lnetwork -+endif -+ - ifeq ($(PLATFORM),WINDOWS) - ifneq ($(USE_LIBPNG),0) - LIBS+= -lpng_mini -lz_mini -diff --git a/GNUmakefile b/GNUmakefile -index a966483..7027e1f 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -544,6 +544,10 @@ ifeq ($(PLATFORM),BSD) - LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo - endif - -+ifeq ($(PLATFORM),HAIKU) -+ LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo -lnetwork -+endif -+ - ifeq ($(PLATFORM),DARWIN) - ifneq (0,$(HAVE_XMP)) - LIBS += -lxmp-lite --- -2.12.2 - -From 1c963d963f506b53b10f431b96caf595037fe091 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 4 Jun 2017 08:30:18 +0200 -Subject: [PATCH] Data file search path fix - ---- - source/duke3d/src/common.cpp | 2 ++ - 1 file changed, 2 insertions(+) - diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp -index 0045364..ce62dc6 100644 +index 7ea47de..236d044 100644 --- a/source/duke3d/src/common.cpp +++ b/source/duke3d/src/common.cpp -@@ -318,6 +318,8 @@ void G_ExtInit(void) +@@ -320,6 +320,8 @@ void G_ExtInit(void) "EDuke32 Settings" #elif defined(GEKKO) "apps/eduke32" @@ -162,5 +133,6 @@ index 0045364..ce62dc6 100644 #else ".eduke32" #endif --- -2.12.2 +-- +2.16.2 +