Re: Added a new game Julius, opensource re-implementation of Caesar 3 Fixed a broken eduke32 port

To: astr0b4by <astr0b4by%gmail.com@localhost>
Subject: Re: Added a new game Julius, opensource re-implementation of Caesar 3 Fixed a broken eduke32 port
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Thu, 21 May 2020 08:01:47 +0200
Hi,

Thanks for fixing eduke32!

Would you consider committing changes to different packages separately in future?

On 2020-05-20, astr0b4by wrote:
> Module Name:	pkgsrc-wip
> Committed By:	astr0b4by <astr0b4by%gmail.com@localhost>
> Pushed By:	astr0b4by
> Date:		Wed May 20 23:20:31 2020 +0000
> Changeset:	ed2611c8e3bf52889f45cb02ba1269fd11951c70
> 
> Modified Files:
> 	eduke32/Makefile
> 	eduke32/PLIST
> 	eduke32/distinfo
> Added Files:
> 	eduke32/MESSAGE
> 	eduke32/patches/patch-gnumakefile
> 	eduke32/patches/patch-mmulti.cpp
> 	julius/DESCR
> 	julius/Makefile
> 	julius/PLIST
> 	julius/distinfo
> Removed Files:
> 	eduke32/patches/patch-build_include_compat.h
> 	eduke32/patches/patch-build_src_glbuild.c
> 	eduke32/patches/patch-source_m32exec.c
> 
> Log Message:
> Added a new game Julius, opensource re-implementation of Caesar 3
> Fixed a broken eduke32 port
> 
> To see a diff of this commit:
> https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed2611c8e3bf52889f45cb02ba1269fd11951c70
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> diffstat:
>  eduke32/MESSAGE                              |  8 ++++++++
>  eduke32/Makefile                             | 15 +++++++++------
>  eduke32/PLIST                                |  2 +-
>  eduke32/distinfo                             | 15 +++++++--------
>  eduke32/patches/patch-build_include_compat.h | 25 -------------------------
>  eduke32/patches/patch-build_src_glbuild.c    | 24 ------------------------
>  eduke32/patches/patch-gnumakefile            | 16 ++++++++++++++++
>  eduke32/patches/patch-mmulti.cpp             | 24 ++++++++++++++++++++++++
>  eduke32/patches/patch-source_m32exec.c       | 21 ---------------------
>  julius/DESCR                                 | 11 +++++++++++
>  julius/Makefile                              | 25 +++++++++++++++++++++++++
>  julius/PLIST                                 |  7 +++++++
>  julius/distinfo                              |  6 ++++++
>  13 files changed, 114 insertions(+), 85 deletions(-)
> 
> diffs:
> diff --git a/eduke32/MESSAGE b/eduke32/MESSAGE
> new file mode 100644
> index 0000000000..f609750fcc
> --- /dev/null
> +++ b/eduke32/MESSAGE
> @@ -0,0 +1,8 @@
> +===========================================================================
> +$NetBSD$
> +The data seg size is too low and needs to be raised above 2GB !
> +Please run the following command (under the user that executed eduke32)
> +for eduke32 to work on NetBSD
> +
> +$ ulimit -d 2097152
> +===========================================================================
> diff --git a/eduke32/Makefile b/eduke32/Makefile
> index 9968982470..c4db0effac 100644
> --- a/eduke32/Makefile
> +++ b/eduke32/Makefile
> @@ -1,8 +1,8 @@
> -# $NetBSD: Makefile,v 1.1 2015/08/19 20:36:32 yhardy Exp $
> -#
> +# $NetBSD$
>  
> -EDUKE_SVN=	5974
> -EDUKE_DATE=	20161225
> +SUBDIR+=	eduke32
> +EDUKE_SVN=	8798
> +EDUKE_DATE=	20200404
>  DISTNAME=	eduke32_src_${EDUKE_DATE}-${EDUKE_SVN}
>  PKGNAME=	eduke32-${EDUKE_SVN}
>  CATEGORIES=	games
> @@ -18,11 +18,14 @@ WRKSRC=		${WRKDIR}/eduke32_${EDUKE_DATE}-${EDUKE_SVN}
>  USE_LANGUAGES=	c c++
>  
>  USE_TOOLS+=	gmake pkg-config
> +NO_CONFIGURE=	yes
> +MAKE_ENV+=	prefix=${PREFIX}
> +MAKE_FILE=	GNUmakefile
> +
>  
>  BUILD_DEPENDS=	nasm-[0-9]*:../../devel/nasm
>  
> -BUILD_MAKE_FLAGS+=	"BASELDFLAGS=${BUILDLINK_LDFLAGS.libexecinfo}"
> -BUILD_MAKE_FLAGS+=	LTO=0 RELEASE=1 SUBPLATFORM=LINUX USE_LIBVPX=0
> +BUILD_MAKE_FLAGS+=	LTO=0 RELEASE=1 USE_LIBVPX=0
>  
>  INSTALLATION_DIRS+=	bin
>  
> diff --git a/eduke32/PLIST b/eduke32/PLIST
> index 6e25ad08a1..ef7ca0de73 100644
> --- a/eduke32/PLIST
> +++ b/eduke32/PLIST
> @@ -1,3 +1,3 @@
> -@comment $NetBSD: PLIST,v 1.1 2015/08/19 20:36:32 yhardy Exp $
> +@comment $NetBSD$
>  bin/eduke32
>  bin/mapster32
> diff --git a/eduke32/distinfo b/eduke32/distinfo
> index 803eafea64..429f9845c2 100644
> --- a/eduke32/distinfo
> +++ b/eduke32/distinfo
> @@ -1,9 +1,8 @@
> -$NetBSD: distinfo,v 1.1 2015/08/19 20:36:32 yhardy Exp $
> +$NetBSD$
>  
> -SHA1 (eduke32_src_20161225-5974.tar.xz) = 266e7faefc632fafe2071a5603a206782a33f52d
> -RMD160 (eduke32_src_20161225-5974.tar.xz) = a41cf9b3575778088844c621ae6352c6f25fc168
> -SHA512 (eduke32_src_20161225-5974.tar.xz) = a0af8f76b46aa9be494d45cb2ecd30e6249940f305b43e6bcb5d6bd27abdf8e291c7f005391a7628d60d0248001750bd9989357ff8f02528e1b942424cf579fa
> -Size (eduke32_src_20161225-5974.tar.xz) = 14567240 bytes
> -SHA1 (patch-build_include_compat.h) = 2a3f4f3e5f8e0fa92249cb6136a8734bbc6a09c1
> -SHA1 (patch-build_src_glbuild.c) = 26eb91f06cbcfeaf6a53ad39055d7c78f6e006d1
> -SHA1 (patch-source_m32exec.c) = 1e755affe64bc54fb9d237a1b815fd353a41ecf9
> +SHA1 (eduke32_src_20200404-8798.tar.xz) = bb196a077fe0c2354c37740175f9c81d30fed3cb
> +RMD160 (eduke32_src_20200404-8798.tar.xz) = 05230e12e08d01744d746a801617791fefc5cf67
> +SHA512 (eduke32_src_20200404-8798.tar.xz) = c0cb8713fdda11d25926fce37d7e2a44a17149a11c5365819aa5ed3eb46684760077ed904fd98033589bd5ad90e67f46195d00c6bde1b8c431e2ecf908a97ee3
> +Size (eduke32_src_20200404-8798.tar.xz) = 16565732 bytes
> +SHA1 (patch-gnumakefile) = 57d03359a84a4881026a4745bfe13f7f2001b663
> +SHA1 (patch-mmulti.cpp) = faa77608cb3a60f5bada13351a34ae9f6b06fc9e
> diff --git a/eduke32/patches/patch-build_include_compat.h b/eduke32/patches/patch-build_include_compat.h
> deleted file mode 100644
> index dfb4d4bd12..0000000000
> --- a/eduke32/patches/patch-build_include_compat.h
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -$NetBSD: patch-build_include_compat.h,v 1.1 2015/08/19 20:36:32 yhardy Exp $
> -
> -Use the correct bswap functions on NetBSD.
> -
> ---- build/include/compat.h.orig	2016-05-22 21:01:12.000000000 +0000
> -+++ build/include/compat.h
> -@@ -287,9 +287,15 @@
> - #  define B_LITTLE_ENDIAN 0
> - #  define B_BIG_ENDIAN    1
> - # endif
> --# define B_SWAP64(x) __bswap64(x)
> --# define B_SWAP32(x) __bswap32(x)
> --# define B_SWAP16(x) __bswap16(x)
> -+# ifdef __NetBSD__
> -+#  define B_SWAP64(x) bswap64(x)
> -+#  define B_SWAP32(x) bswap32(x)
> -+#  define B_SWAP16(x) bswap16(x)
> -+# else
> -+#  define B_SWAP64(x) __bswap64(x)
> -+#  define B_SWAP32(x) __bswap32(x)
> -+#  define B_SWAP16(x) __bswap16(x)
> -+# endif
> - 
> - #elif defined(__APPLE__)
> - # if !defined __x86_64__ && defined __GNUC__
> diff --git a/eduke32/patches/patch-build_src_glbuild.c b/eduke32/patches/patch-build_src_glbuild.c
> deleted file mode 100644
> index ab7277bb04..0000000000
> --- a/eduke32/patches/patch-build_src_glbuild.c
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -$NetBSD: patch-build_src_glbuild.c,v 1.1 2015/08/19 20:36:32 yhardy Exp $
> -
> -Search for correctl libGL on NetBSD.
> -
> ---- build/src/glbuild.c.orig	2015-07-15 08:23:00.000000000 +0000
> -+++ build/src/glbuild.c
> -@@ -379,7 +379,7 @@ int32_t loadgldriver(const char *driver)
> -         driver = "opengl32.dll";
> - #elif defined EDUKE32_OSX
> -         driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
> --#elif defined __OpenBSD__
> -+#elif defined __OpenBSD__ || defined __NetBSD__
> -         driver = "libGL.so";
> - #else
> -         driver = "libGL.so.1";
> -@@ -1061,7 +1061,7 @@ int32_t loadglulibrary(const char *drive
> -         driver = "glu32.dll";
> - #elif defined __APPLE__
> -         driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; // FIXME: like I know anything about Apple.  Hah.
> --#elif defined __OpenBSD__
> -+#elif defined __OpenBSD__ || defined __NetBSD__
> -         driver = "libGLU.so";
> - #else
> -         driver = "libGLU.so.1";
> diff --git a/eduke32/patches/patch-gnumakefile b/eduke32/patches/patch-gnumakefile
> new file mode 100644
> index 0000000000..4b58bdfac6
> --- /dev/null
> +++ b/eduke32/patches/patch-gnumakefile
> @@ -0,0 +1,16 @@
> +$NetBSD$
> +
> +Was failing without this with GNUmakefile:928: start] Error 1
> +
> +--- GNUmakefile.orig	2020-03-17 03:19:02.000000000 +0000
> ++++ GNUmakefile
> +@@ -924,8 +924,7 @@ endif
> + 
> + all: duke3d
> + 
> +-start:
> +-	$(BUILD_STARTED)
> ++start: duke3d
> + 
> + tools: $(addsuffix $(EXESUFFIX),$(tools_targets)) | start
> + 	@$(call LL,$^)
> diff --git a/eduke32/patches/patch-mmulti.cpp b/eduke32/patches/patch-mmulti.cpp
> new file mode 100644
> index 0000000000..733cb08a66
> --- /dev/null
> +++ b/eduke32/patches/patch-mmulti.cpp
> @@ -0,0 +1,24 @@
> +$NetBSD$
> +
> +Add undeclared AI_* for NetBSD 
> +
> +--- source/build/src/mmulti.cpp.orig	2020-03-10 00:00:02.000000000 +0000
> ++++ source/build/src/mmulti.cpp
> +@@ -68,6 +68,17 @@ LPFN_WSARECVMSG WSARecvMsgPtr;
> + #endif
> + #endif
> + 
> ++#ifndef AI_ALL 
> ++# define AI_ALL 0 
> ++#endif 
> ++#ifndef AI_V4MAPPED 
> ++# define AI_V4MAPPED 0 
> ++#endif 
> ++#ifndef AI_ADDRCONFIG 
> ++# define AI_ADDRCONFIG 0 
> ++#endif
> ++
> ++
> + #include <unistd.h>
> + #include <netinet/in.h>
> + #include <arpa/inet.h>
> diff --git a/eduke32/patches/patch-source_m32exec.c b/eduke32/patches/patch-source_m32exec.c
> deleted file mode 100644
> index 7ff4ad7c53..0000000000
> --- a/eduke32/patches/patch-source_m32exec.c
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -$NetBSD$
> -
> -Define __STDC_LIMIT_MACROS before stdint.h is included. This code segment
> -appears in build/include/compat.h, but that is too late on NetBSD.
> -
> ---- source/m32exec.c.orig	2016-12-26 06:02:56.000000000 +0000
> -+++ source/m32exec.c
> -@@ -20,6 +20,13 @@ Foundation, Inc., 51 Franklin Street, Fi
> - */
> - //-------------------------------------------------------------------------
> - 
> -+#ifndef __STDC_FORMAT_MACROS
> -+# define __STDC_FORMAT_MACROS
> -+#endif
> -+#ifndef __STDC_LIMIT_MACROS
> -+# define __STDC_LIMIT_MACROS
> -+#endif
> -+
> - #include <time.h>
> - #include <stdlib.h>
> - 
> diff --git a/julius/DESCR b/julius/DESCR
> new file mode 100644
> index 0000000000..3ae04500a9
> --- /dev/null
> +++ b/julius/DESCR
> @@ -0,0 +1,11 @@
> +An open source re-implementation of Caesar III
> +The aim of this project is to create an open-source
> +version of Caesar 3, with the same logic as the original,
> +but with some UI enhancements, that is able to be played
> +on multiple platforms.
> +The same logic means that the saved games are 100% compatible,
> +and any gameplay bugs present in the original Caesar 3 game
> +will also be present in Julius.
> +Run Julius with the path where the original Caesar3 data
> +directory is extracted :
> +$ julius path-to-c3-directory
> diff --git a/julius/Makefile b/julius/Makefile
> new file mode 100644
> index 0000000000..bb187e5e5b
> --- /dev/null
> +++ b/julius/Makefile
> @@ -0,0 +1,25 @@
> +# $NetBSD$
> +
> +SUBDIR+=	julius
> +GITHUB_PROJECT=	julius
> +DISTNAME=	julius-1.4.0-source
> +PKGNAME=	julius-1.4.0
> +CATEGORIES=	games
> +MASTER_SITES=	${MASTER_SITE_GITHUB:=bvschaik/}
> +GITHUB_RELEASE=	v1.4.0
> +
> +MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
> +HOMEPAGE=	https://github.com/bvschaik/julius/
> +COMMENT=	Open source re-implementation of Caesar III
> +LICENSE=	gnu-gpl-v3
> +
> +WRKSRC=			${WRKDIR}/julius-1.4.0
> +USE_LANGUAGES=		c c++
> +USE_CMAKE=		yes
> +LDFLAGS.NetBSD+=	-lexecinfo
> +
> +.include "../../audio/SDL2_mixer/buildlink3.mk"
> +.include "../../devel/SDL2/buildlink3.mk"
> +.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
> +.include "../../graphics/png/buildlink3.mk"
> +.include "../../mk/bsd.pkg.mk"
> diff --git a/julius/PLIST b/julius/PLIST
> new file mode 100644
> index 0000000000..d11c536f72
> --- /dev/null
> +++ b/julius/PLIST
> @@ -0,0 +1,7 @@
> +@comment $NetBSD$
> +bin/julius
> +share/applications/com.github.bvschaik.julius.desktop
> +share/icons/hicolor/256x256/apps/com.github.bvschaik.julius.png
> +share/icons/hicolor/48x48/apps/com.github.bvschaik.julius.png
> +share/icons/hicolor/512x512/apps/com.github.bvschaik.julius.png
> +share/metainfo/com.github.bvschaik.julius.metainfo.xml
> diff --git a/julius/distinfo b/julius/distinfo
> new file mode 100644
> index 0000000000..348053552b
> --- /dev/null
> +++ b/julius/distinfo
> @@ -0,0 +1,6 @@
> +$NetBSD$
> +
> +SHA1 (julius-1.4.0-source.tar.gz) = 736756aa7ead1e1a2e3410ada15a846d8d736921
> +RMD160 (julius-1.4.0-source.tar.gz) = 49b8cee471c0ee84584f69849aed0f51076b6663
> +SHA512 (julius-1.4.0-source.tar.gz) = 757ed738dcc8c7f22421063a22878abe5b0aec2647590dd824f1fa1b5365ebd1a3a271082697996d788ad19b9705c24087765d96ad93e34ca1c1655931687d3b
> +Size (julius-1.4.0-source.tar.gz) = 8587589 bytes

-- 
Kind regards,

Yorick Hardy
References:
- Added a new game Julius, opensource re-implementation of Caesar 3 Fixed a broken eduke32 port
  - From: astr0b4by
Prev by Date: Added package maintainer mail address
Next by Date: julius: simplify
Previous by Thread: Added a new game Julius, opensource re-implementation of Caesar 3 Fixed a broken eduke32 port
Next by Thread: Added a new game - Jagged Alliance 2 Stracciatella
Indexes:
Home | Main Index | Thread Index | Old Index