d2x-rebirth: update to d2x-rebirth-20191018
No changelog provided (changes listed at https://github.com/dxx-rebirth/dxx-rebirth). pkgsrc: change "raspberrypi" option to the standard "rpi" option.
This commit is contained in:
Yorick Hardy
parent
5503c1c16b
commit
66c38b0bdc
|
|
@ -1,10 +1,11 @@
|
||||||
DXX-Rebirth is a Source Port of the Descent and Descent 2 Engines
|
DXX-Rebirth is based on the late D1X and D2X source ports (which,
|
||||||
for Windows, Mac OS, Linux (most *NIX systems), offering OpenGL
|
in turn, were based on the original Descent source and LDescent).
|
||||||
graphics and effects, advanced Multiplayer, many improvements and
|
The Rebirth Team has spent a lot of time working to improve the
|
||||||
new features.
|
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
|
It is the goal of DXX-Rebirth to keep Descent 1 & 2 alive and well,
|
||||||
problems running it on more recent Hardware and Operating Systems.
|
updating them for modern PCs while also keeping them the same games
|
||||||
DXX-Rebirth will also take care about this for you.
|
you remember playing back in 1995!
|
||||||
|
|
||||||
This is the Descent 2 source port. The data files are not included.
|
This is the Descent 2 source port. The data files are not included.
|
||||||
|
|
|
||||||
|
|
@ -1,67 +1,72 @@
|
||||||
The Descent 2 source code was released by Parallax with this license:
|
DXX-REBIRTH LICENSE
|
||||||
---------------------------------------------------------------------------
|
====================
|
||||||
|
The original Descent source release is copyright by Parallax and subject
|
||||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
to the Parallax license below. Contributions from the D1X/D2X ("DXX")
|
||||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
and D1X-Rebirth/D2X-Rebirth ("Rebirth") projects are copyright their
|
||||||
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
|
respective contributors. The DXX and Rebirth contributors grant you
|
||||||
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
|
permission to convey their work, with or without modifications, pursuant
|
||||||
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
to the terms of the GNU General Public License, version 3 ("GPLv3"). As
|
||||||
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
a special exception, in recognition of the restrictions imposed by the
|
||||||
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
|
original Parallax license, you are excused from GPLv3 requirements that
|
||||||
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
|
conflict with the restrictions of the original Parallax license, but
|
||||||
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
|
only to the extent that such excuse is required to prevent a conflict
|
||||||
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
between the terms of the original Parallax license and the GNU General
|
||||||
|
Public License v3. This special exception is an "Additional permission"
|
||||||
We make no warranties as to the usability or correctness of this code.
|
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
|
||||||
The modifications to Descent 2 which make up D2X-Rebirth are covered by the
|
satisfy any non-excused GPLv3 provision is expressly prohibited under
|
||||||
same license as the d1x project, given below.
|
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.
|
||||||
D1x License
|
|
||||||
|
For purposes of this document, "copyright by Parallax" shall include any
|
||||||
Preamble
|
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
|
||||||
This License is designed to allow the Descent programming community to
|
Parallax under terms other than the original Parallax license below,
|
||||||
continue to have the Descent source open and available to anyone.
|
whether due to a general relicensing by the appropriate copyright
|
||||||
|
holders, due to special permission from the appropriate copyright
|
||||||
Original Parallax License
|
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
|
||||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
excuses only conflicts with the original Parallax license. If a
|
||||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
subsequent license to the Parallax work conflicts with the GPLv3 in any
|
||||||
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
|
way that the original Parallax license did not conflict, then such new
|
||||||
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
|
conflicts are not excused. As detailed in GPLv3 section 12 "No
|
||||||
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
Surrender of Others' Freedom.", if you cannot simultaneously satisfy the
|
||||||
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
non-excused terms of the GPLv3 and all other conditions imposed on you,
|
||||||
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
|
then you may not convey the GPLv3 covered work at all.
|
||||||
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.
|
Additionally, if you are permitted to convey the material originally
|
||||||
COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
copyright by Parallax under terms other than the original Parallax
|
||||||
|
license, and such new permission allows you to comply with the GPLv3 to
|
||||||
We make no warranties as to the usability or correctness of this code.
|
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
|
||||||
The D1x project is the combination of the original Parallax code and the
|
permission under which you convey the material originally copyright by
|
||||||
modifications and additions made to source code. While the original code is
|
Parallax.
|
||||||
only under the Original Parallax License the D1x project contains original
|
|
||||||
code that was not made by Parallax. This ADDED and/or CHANGED code has the
|
|
||||||
following added restrictions:
|
See GPL-3.txt for further details on the GPLv3.
|
||||||
|
For project history and its contributors, please visit the
|
||||||
1) By using this source you are agreeing to these terms.
|
DXX-Rebirth GIT repository at https://github.com/dxx-rebirth/dxx-rebirth/
|
||||||
|
|
||||||
2) D1x 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
|
PARALLAX LICENSE
|
||||||
code used to create the modified version is freely and publicly
|
================
|
||||||
available under this license.
|
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||||
|
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||||
b) The modified version is only used by the developer.
|
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
|
||||||
3) D1X IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
|
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
||||||
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
||||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
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.
|
||||||
|
|
@ -1,35 +1,41 @@
|
||||||
# $NetBSD: Makefile,v 1.1 2015/08/19 19:11:02 yhardy Exp $
|
# $NetBSD: Makefile,v 1.1 2015/08/19 19:06:08 yhardy Exp $
|
||||||
|
|
||||||
DISTNAME= d2x-rebirth_v0.58.1-src
|
DISTNAME= dxx-rebirth_20191018-src
|
||||||
PKGNAME= d2x-rebirth-0.58.1
|
PKGNAME= d2x-rebirth-20191018
|
||||||
CATEGORIES= games
|
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
|
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||||
HOMEPAGE= http://www.dxx-rebirth.com/
|
HOMEPAGE= https://www.dxx-rebirth.com/
|
||||||
COMMENT= Source port of the Descent 2 engine
|
COMMENT= Source port of the Descent 2 engine
|
||||||
#LICENSE= # TODO: (see mk/license.mk)
|
#LICENSE= parallax AND (gnu-gpl3-v3 WITH exception)
|
||||||
|
|
||||||
USE_LANGUAGES= c c++
|
USE_LANGUAGES= c c++
|
||||||
USE_TOOLS+= pkg-config
|
USE_TOOLS+= pkg-config
|
||||||
|
|
||||||
BUILD_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
|
BUILD_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
|
||||||
SCONS= ${PREFIX}/bin/scons
|
SCONS= ${PREFIX}/bin/scons
|
||||||
SCONS_ARGS+= -C ${WRKSRC} prefix=${PREFIX}
|
SCONS_ARGS+= -C ${WRKSRC}
|
||||||
SCONS_ARGS+= sharepath=${PREFIX}/share/d1x-rebirth
|
SCONS_ARGS+= DESTDIR=${DESTDIR}
|
||||||
|
SCONS_ARGS+= d2x=
|
||||||
|
SCONS_ARGS+= prefix=${PREFIX}
|
||||||
|
SCONS_ARGS+= sdlmixer=1
|
||||||
|
SCONS_ARGS+= sharepath=${PREFIX}/share/d2x-rebirth
|
||||||
|
|
||||||
INSTALLATION_DIRS= bin
|
PYTHON_VERSIONS_INCOMPATIBLE= 36 37 38
|
||||||
|
|
||||||
do-build:
|
do-build:
|
||||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
|
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
|
||||||
|
|
||||||
do-install:
|
do-install:
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/d2x-rebirth ${DESTDIR}${PREFIX}/bin
|
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS} install
|
||||||
|
|
||||||
.include "options.mk"
|
.include "options.mk"
|
||||||
.include "../../lang/python/pyversion.mk"
|
|
||||||
|
|
||||||
.include "../../audio/SDL_mixer/buildlink3.mk"
|
.include "../../audio/SDL_mixer/buildlink3.mk"
|
||||||
.include "../../devel/SDL/buildlink3.mk"
|
.include "../../devel/SDL/buildlink3.mk"
|
||||||
.include "../../devel/physfs/buildlink3.mk"
|
.include "../../devel/physfs/buildlink3.mk"
|
||||||
|
.include "../../graphics/png/buildlink3.mk"
|
||||||
|
.include "../../lang/python/pyversion.mk"
|
||||||
.include "../../mk/bsd.pkg.mk"
|
.include "../../mk/bsd.pkg.mk"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
$NetBSD: distinfo,v 1.1 2015/08/19 19:11:02 yhardy Exp $
|
$NetBSD: distinfo,v 1.1 2015/08/19 19:06:08 yhardy Exp $
|
||||||
|
|
||||||
SHA1 (d2x-rebirth_v0.58.1-src.tar.gz) = 2f8576da0ab445a1cd79663996b06b8c53ebb5c1
|
SHA1 (dxx-rebirth_20191018-src.tar.xz) = 32e889e5c75750497817e2427b1f5ecce1579351
|
||||||
RMD160 (d2x-rebirth_v0.58.1-src.tar.gz) = 0d5edf7becbe4114525d84fad33f5ae2e0fc21f4
|
RMD160 (dxx-rebirth_20191018-src.tar.xz) = 28e10d43263ad45d96613e6414ed6af6ada893bc
|
||||||
SHA512 (d2x-rebirth_v0.58.1-src.tar.gz) = 19281c8dc554d595f6c40cbef2f4921c6325cd736ec648cb1abf60ad6a339e59b882b8a1426987f7bcfb8413c78bbda9b6f7fa86a6ff8927550a37d0290873fd
|
SHA512 (dxx-rebirth_20191018-src.tar.xz) = cfdea22b15112ef5013504cbb2a5df8e936c180ab41cbb48e0fe7fd990870dff0ac255091a80e46b33a67a7d4cf1136ab2cc351fa0e74dd905db3280bf784fc2
|
||||||
Size (d2x-rebirth_v0.58.1-src.tar.gz) = 1375376 bytes
|
Size (dxx-rebirth_20191018-src.tar.xz) = 1315824 bytes
|
||||||
SHA1 (patch-include_physfsrwops.h) = 31496ca6262412a3f62945086236fb863dd16af7
|
SHA1 (patch-SConstruct) = 046b2a5627a601d8654b538be410ae2946f194c6
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
# $NetBSD: options.mk,v 1.1 2015/08/19 19:11:02 yhardy Exp $
|
# $NetBSD: options.mk,v 1.1 2015/08/19 19:11:02 yhardy Exp $
|
||||||
|
|
||||||
PKG_OPTIONS_VAR= PKG_OPTIONS.d2x-rebirth
|
PKG_OPTIONS_VAR= PKG_OPTIONS.d2x-rebirth
|
||||||
PKG_SUPPORTED_OPTIONS= raspberrypi
|
PKG_SUPPORTED_OPTIONS= rpi
|
||||||
PKG_SUGGESTED_OPTIONS=
|
PKG_SUGGESTED_OPTIONS=
|
||||||
|
|
||||||
.include "../../mk/bsd.prefs.mk"
|
.include "../../mk/bsd.prefs.mk"
|
||||||
.include "../../mk/bsd.options.mk"
|
.include "../../mk/bsd.options.mk"
|
||||||
|
|
||||||
.if !empty(PKG_OPTIONS:Mraspberrypi)
|
.if !empty(PKG_OPTIONS:Mrpi)
|
||||||
SCONS_ARGS+= raspberrypi=1
|
SCONS_ARGS+= raspberrypi=1
|
||||||
SCONS_ARGS+= rpi_vc_path=${PREFIX}
|
SCONS_ARGS+= rpi_vc_path=${PREFIX}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if !empty(PKG_OPTIONS:Mraspberrypi)
|
.if !empty(PKG_OPTIONS:Mrpi)
|
||||||
.include "../../misc/raspberrypi-userland/buildlink3.mk"
|
.include "../../misc/raspberrypi-userland/buildlink3.mk"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -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')}),
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
$NetBSD$
|
|
||||||
|
|
||||||
--- ./include/physfsrwops.h.orig 2019-03-04 22:58:02.523929348 -0800
|
|
||||||
+++ ./include/physfsrwops.h 2019-03-04 22:58:18.372226593 -0800
|
|
||||||
@@ -44,7 +44,7 @@
|
|
||||||
* @return A valid SDL_RWops structure on success, NULL on error. Specifics
|
|
||||||
* of the error can be gleaned from PHYSFS_getLastError().
|
|
||||||
*/
|
|
||||||
-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
|
|
||||||
+SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open a platform-independent filename for writing, and make it accessible
|
|
||||||
@@ -56,7 +56,7 @@
|
|
||||||
* @return A valid SDL_RWops structure on success, NULL on error. Specifics
|
|
||||||
* of the error can be gleaned from PHYSFS_getLastError().
|
|
||||||
*/
|
|
||||||
-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
|
|
||||||
+SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open a platform-independent filename for appending, and make it accessible
|
|
||||||
@@ -68,7 +68,7 @@
|
|
||||||
* @return A valid SDL_RWops structure on success, NULL on error. Specifics
|
|
||||||
* of the error can be gleaned from PHYSFS_getLastError().
|
|
||||||
*/
|
|
||||||
-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
|
|
||||||
+SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make a SDL_RWops from an existing PhysicsFS file handle. You should
|
|
||||||
@@ -80,7 +80,7 @@
|
|
||||||
* @return A valid SDL_RWops structure on success, NULL on error. Specifics
|
|
||||||
* of the error can be gleaned from PHYSFS_getLastError().
|
|
||||||
*/
|
|
||||||
-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
|
|
||||||
+SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue