d1x-rebirth: update to d1x-rebirth-20191018

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: d1x-rebirth: update to d1x-rebirth-20191018
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 03 Nov 2019 06:08:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Nov 3 08:08:30 2019 +0200
Changeset:	5503c1c16b196cd036ced4ee8adb44b9cfb863f4

Modified Files:
	d1x-rebirth/DESCR
	d1x-rebirth/LICENSE
	d1x-rebirth/Makefile
	d1x-rebirth/distinfo
	d1x-rebirth/options.mk
Added Files:
	d1x-rebirth/patches/patch-SConstruct

Log Message:
d1x-rebirth: update to d1x-rebirth-20191018

No changelog provided (changes listed at https://github.com/dxx-rebirth/dxx-rebirth).

pkgsrc: change "raspberrypi" option to the standard "rpi" option.

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

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

diffstat:
 d1x-rebirth/DESCR                    |  15 ++---
 d1x-rebirth/LICENSE                  | 116 ++++++++++++++++++++++-------------
 d1x-rebirth/Makefile                 |  24 +++++---
 d1x-rebirth/distinfo                 |   8 ++-
 d1x-rebirth/options.mk               |   6 +-
 d1x-rebirth/patches/patch-SConstruct |  24 ++++++++
 6 files changed, 127 insertions(+), 66 deletions(-)

diffs:
diff --git a/d1x-rebirth/DESCR b/d1x-rebirth/DESCR
index 60c5096dc7..5dc98ad3cd 100644
--- a/d1x-rebirth/DESCR
+++ b/d1x-rebirth/DESCR
@@ -1,10 +1,11 @@
-DXX-Rebirth is a Source Port of the Descent and Descent 2 Engines
-for Windows, Mac OS, Linux (most *NIX systems), offering OpenGL
-graphics and effects, advanced Multiplayer, many improvements and
-new features.
+DXX-Rebirth is based on the late D1X and D2X source ports (which,
+in turn, were based on the original Descent source and LDescent).
+The Rebirth Team has spent a lot of time working to improve the
+source code by fixing old bugs and adding some improvements, while
+always staying true to our philosophy: Keep it Descent!
 
-Descent and Descent 2 are pretty old games so you usually run into
-problems running it on more recent Hardware and Operating Systems.
-DXX-Rebirth will also take care about this for you.
+It is the goal of DXX-Rebirth to keep Descent 1 & 2 alive and well,
+updating them for modern PCs while also keeping them the same games
+you remember playing back in 1995!
 
 This is the Descent source port. The data files are not included.
diff --git a/d1x-rebirth/LICENSE b/d1x-rebirth/LICENSE
index 13b82a2dca..69e2e7dd43 100644
--- a/d1x-rebirth/LICENSE
+++ b/d1x-rebirth/LICENSE
@@ -1,44 +1,72 @@
-D1X-Rebirth License 
-
-Preamble
---------
-
-This License is designed to allow the Descent programming community to
-continue to have the Descent source open and available to anyone.
-
-Original Parallax License
--------------------------
-
-THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
-SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
-END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
-ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
-IN USING, DISPLAYING,  AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
-SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
-FREE PURPOSES.  IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
-CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES.  THE END-USER UNDERSTANDS
-AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
-COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
-
-We make no warranties as to the usability or correctness of this code.
--------------------------
-
-The D1X-Rebirth project is the combination of the original Parallax code and the 
-modifications and additions made to source code.  While the original code is 
-only under the Original Parallax License the D1X-Rebirth project contains original 
-code that was not made by Parallax.  This ADDED and/or CHANGED code has the 
-following added restrictions:
-
-1) By using this source you are agreeing to these terms.  
-
-2) D1X-Rebirth and derived works may only be modified if ONE of the following is done:
-	
-	a) The modified version is placed under this license.  The source 
-	code used to create the modified version is freely and publicly 
-	available under this license.  
-
-	b) The modified version is only used by the developer.
-
-3) D1X-REBIRTH IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+DXX-REBIRTH LICENSE
+====================
+The original Descent source release is copyright by Parallax and subject 
+to the Parallax license below.  Contributions from the D1X/D2X ("DXX") 
+and D1X-Rebirth/D2X-Rebirth ("Rebirth") projects are copyright their 
+respective contributors.  The DXX and Rebirth contributors grant you 
+permission to convey their work, with or without modifications, pursuant 
+to the terms of the GNU General Public License, version 3 ("GPLv3").  As 
+a special exception, in recognition of the restrictions imposed by the 
+original Parallax license, you are excused from GPLv3 requirements that 
+conflict with the restrictions of the original Parallax license, but 
+only to the extent that such excuse is required to prevent a conflict 
+between the terms of the original Parallax license and the GNU General 
+Public License v3.  This special exception is an "Additional permission" 
+as defined by section 7 of the GNU General Public License v3.  All 
+provisions of the GPLv3 that can be satisfied without violating the 
+original Parallax license must be satisfied to the greatest extent 
+possible without violating the original Parallax license.  Failure to 
+satisfy any non-excused GPLv3 provision is expressly prohibited under 
+this license, and is therefore void and is handled pursuant to GPLv3 
+section 8 "Termination.", exactly as would occur for a non-permitted 
+propagation or modification of a GPLv3 covered work that had no special 
+exceptions.
+
+For purposes of this document, "copyright by Parallax" shall include any 
+subsequent entities to which some or all of the Parallax copyrights were 
+transferred, without regard to how the transfer occurred.  In the event 
+that you are permitted to convey the material originally copyright by 
+Parallax under terms other than the original Parallax license below, 
+whether due to a general relicensing by the appropriate copyright 
+holders, due to special permission from the appropriate copyright 
+holders, or any other circumstance, the contributions from the DXX and 
+Rebirth projects remain subject to the GNU General Public License, 
+version 3.  The special exception described in the preceding paragraph 
+excuses only conflicts with the original Parallax license.  If a 
+subsequent license to the Parallax work conflicts with the GPLv3 in any 
+way that the original Parallax license did not conflict, then such new 
+conflicts are not excused.  As detailed in GPLv3 section 12 "No 
+Surrender of Others' Freedom.", if you cannot simultaneously satisfy the 
+non-excused terms of the GPLv3 and all other conditions imposed on you, 
+then you may not convey the GPLv3 covered work at all.
+
+Additionally, if you are permitted to convey the material originally 
+copyright by Parallax under terms other than the original Parallax 
+license, and such new permission allows you to comply with the GPLv3 to 
+a greater extent than the original Parallax license allowed, and you 
+convey the covered work or a portion thereof, then such conveyance must 
+comply with all GPLv3 terms which can be satisfied without violating the 
+permission under which you convey the material originally copyright by 
+Parallax.
+
+
+See GPL-3.txt for further details on the GPLv3.
+For project history and its contributors, please visit the 
+DXX-Rebirth GIT repository at https://github.com/dxx-rebirth/dxx-rebirth/
+
+
+
+PARALLAX LICENSE
+================
+THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
+SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
+END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
+ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
+IN USING, DISPLAYING,  AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
+SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
+FREE PURPOSES.  IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
+CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES.  THE END-USER UNDERSTANDS
+AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
+COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
+
+We make no warranties as to the usability or correctness of this code.
\ No newline at end of file
diff --git a/d1x-rebirth/Makefile b/d1x-rebirth/Makefile
index febfa0d2e1..dcd17bef12 100644
--- a/d1x-rebirth/Makefile
+++ b/d1x-rebirth/Makefile
@@ -1,35 +1,41 @@
 # $NetBSD: Makefile,v 1.1 2015/08/19 19:06:08 yhardy Exp $
 
-DISTNAME=	d1x-rebirth_v0.58.1-src
-PKGNAME=	d1x-rebirth-0.58.1
+DISTNAME=	dxx-rebirth_20191018-src
+PKGNAME=	d1x-rebirth-20191018
 CATEGORIES=	games
-MASTER_SITES=	http://www.dxx-rebirth.com/download/dxx/
+MASTER_SITES=	https://www.dxx-rebirth.com/download/dxx/rebirth/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.dxx-rebirth.com/
+HOMEPAGE=	https://www.dxx-rebirth.com/
 COMMENT=	Source port of the Descent 1 engine
-#LICENSE=	# TODO: (see mk/license.mk)
+#LICENSE=	parallax AND (gnu-gpl3-v3 WITH exception)
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
 SCONS=			${PREFIX}/bin/scons
-SCONS_ARGS+=		-C ${WRKSRC} prefix=${PREFIX}
+SCONS_ARGS+=		-C ${WRKSRC}
+SCONS_ARGS+=		DESTDIR=${DESTDIR}
+SCONS_ARGS+=		d1x=
+SCONS_ARGS+=		prefix=${PREFIX}
+SCONS_ARGS+=		sdlmixer=1
 SCONS_ARGS+=		sharepath=${PREFIX}/share/d1x-rebirth
 
-INSTALLATION_DIRS=	bin
+PYTHON_VERSIONS_INCOMPATIBLE=	36 37 38
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/d1x-rebirth ${DESTDIR}${PREFIX}/bin
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS} install
 
 .include "options.mk"
-.include "../../lang/python/pyversion.mk"
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/d1x-rebirth/distinfo b/d1x-rebirth/distinfo
index 1c78f2d711..6acd97fe86 100644
--- a/d1x-rebirth/distinfo
+++ b/d1x-rebirth/distinfo
@@ -1,5 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/08/19 19:06:08 yhardy Exp $
 
-SHA1 (d1x-rebirth_v0.58.1-src.tar.gz) = edd9c42f113f5de330ab7f296b0328b2504794f8
-RMD160 (d1x-rebirth_v0.58.1-src.tar.gz) = 972b268c1dbbfc032ef73e7391b804bb26d7dfc4
-Size (d1x-rebirth_v0.58.1-src.tar.gz) = 1247599 bytes
+SHA1 (dxx-rebirth_20191018-src.tar.xz) = 32e889e5c75750497817e2427b1f5ecce1579351
+RMD160 (dxx-rebirth_20191018-src.tar.xz) = 28e10d43263ad45d96613e6414ed6af6ada893bc
+SHA512 (dxx-rebirth_20191018-src.tar.xz) = cfdea22b15112ef5013504cbb2a5df8e936c180ab41cbb48e0fe7fd990870dff0ac255091a80e46b33a67a7d4cf1136ab2cc351fa0e74dd905db3280bf784fc2
+Size (dxx-rebirth_20191018-src.tar.xz) = 1315824 bytes
+SHA1 (patch-SConstruct) = 046b2a5627a601d8654b538be410ae2946f194c6
diff --git a/d1x-rebirth/options.mk b/d1x-rebirth/options.mk
index bd291ed33c..1e57537d33 100644
--- a/d1x-rebirth/options.mk
+++ b/d1x-rebirth/options.mk
@@ -1,17 +1,17 @@
 # $NetBSD: options.mk,v 1.1 2015/08/19 19:06:08 yhardy Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.d1x-rebirth
-PKG_SUPPORTED_OPTIONS=		raspberrypi
+PKG_SUPPORTED_OPTIONS=		rpi
 PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mraspberrypi)
+.if !empty(PKG_OPTIONS:Mrpi)
 SCONS_ARGS+=	raspberrypi=1
 SCONS_ARGS+=	rpi_vc_path=${PREFIX}
 .endif
 
-.if !empty(PKG_OPTIONS:Mraspberrypi)
+.if !empty(PKG_OPTIONS:Mrpi)
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
 .endif
diff --git a/d1x-rebirth/patches/patch-SConstruct b/d1x-rebirth/patches/patch-SConstruct
new file mode 100644
index 0000000000..2a8f1bb8f8
--- /dev/null
+++ b/d1x-rebirth/patches/patch-SConstruct
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Also support NetBSD.
+
+--- SConstruct.orig	2019-10-02 02:06:00.000000000 +0000
++++ SConstruct
+@@ -3621,7 +3621,7 @@ class DXXCommon(LazyObjectConstructor):
+ 			expect_sconf_tuple = ('0', '1', conftests.expect_sconf_success, conftests.expect_sconf_failure)
+ 			sconf_tuple = ('0', '1', '2', conftests.sconf_force_failure, conftests.sconf_force_success, conftests.sconf_assume_success)
+ 			sys_platform = sys.platform
+-			for platform in ('linux', 'freebsd', 'openbsd'):
++			for platform in ('linux', 'freebsd', 'netbsd', 'openbsd'):
+ 				if sys_platform.startswith(platform):
+ 					sys_platform = platform
+ 					break
+@@ -3654,7 +3654,7 @@ class DXXCommon(LazyObjectConstructor):
+ 						'cross-compile to specified platform',
+ 						{
+ 							'map': {'msys':'win32'},
+-							'allowed_values' : ('darwin', 'linux', 'freebsd', 'openbsd', 'win32'),
++							'allowed_values' : ('darwin', 'linux', 'freebsd', 'netbsd', 'openbsd', 'win32'),
+ 							}
+ 						),
+ 					('raspberrypi', None, 'build for Raspberry Pi (automatically selects opengles)', {'ignorecase': 2, 'map': {'1':'yes', 'true':'yes', '0':'no', 'false':'no'}, 'allowed_values': ('yes', 'no', 'mesa')}),
Prev by Date: Update quickjs to version 2019-10-27
Next by Date: d2x-rebirth: update to d2x-rebirth-20191018
Previous by Thread: Update quickjs to version 2019-10-27
Next by Thread: d2x-rebirth: update to d2x-rebirth-20191018
Indexes:
Home | Main Index | Thread Index | Old Index