From owner-svn-ports-all@freebsd.org Mon May 27 19:16:42 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFBD715A8AB7; Mon, 27 May 2019 19:16:41 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 72E0E81BA2; Mon, 27 May 2019 19:16:41 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 456A57538; Mon, 27 May 2019 19:16:41 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4RJGflB059189; Mon, 27 May 2019 19:16:41 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4RJGeXR059185; Mon, 27 May 2019 19:16:40 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201905271916.x4RJGeXR059185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 27 May 2019 19:16:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502814 - in head/games/dxx-rebirth: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/games/dxx-rebirth: . files X-SVN-Commit-Revision: 502814 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 72E0E81BA2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 May 2019 19:16:42 -0000 Author: pkubaj Date: Mon May 27 19:16:39 2019 New Revision: 502814 URL: https://svnweb.freebsd.org/changeset/ports/502814 Log: games/dxx-rebirth: update to 20190523 Update to 20190523. Upstream also changed its naming convention. Change mainainer to my @FreeBSD.org address. Sort USES, add USES=sdl tar:xz (tarball switched to xz). Add patches from https://github.com/dxx-rebirth/dxx-rebirth/pull/426 Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D20425 Added: head/games/dxx-rebirth/files/patch-similar_main_digiobj.cpp (contents, props changed) head/games/dxx-rebirth/files/patch-similar_main_object.cpp (contents, props changed) Deleted: head/games/dxx-rebirth/files/patch-similar_editor_med.cpp head/games/dxx-rebirth/files/patch-similar_main_inferno.cpp Modified: head/games/dxx-rebirth/Makefile head/games/dxx-rebirth/distinfo head/games/dxx-rebirth/files/patch-SConstruct Modified: head/games/dxx-rebirth/Makefile ============================================================================== --- head/games/dxx-rebirth/Makefile Mon May 27 19:14:18 2019 (r502813) +++ head/games/dxx-rebirth/Makefile Mon May 27 19:16:39 2019 (r502814) @@ -2,12 +2,13 @@ # $FreeBSD$ PORTNAME= dxx-rebirth -DISTVERSION= 0.60.0-beta2 +PORTVERSION= 20190523 +DISTVERSIONSUFFIX= -src CATEGORIES= games -MASTER_SITES= https://www.dxx-rebirth.com/download/dxx/user/afuturepilot/ -EXTRACT_SUFX= -git.tar.gz +MASTER_SITES= https://www.dxx-rebirth.com/download/dxx/weekly/ +DISTNAME= ${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX} -MAINTAINER= pkubaj@anongoth.pl +MAINTAINER= pkubaj@FreeBSD.org COMMENT= Open source port of Descent and Descent 2 LICENSE= GPLv3 PARALLAX @@ -22,7 +23,7 @@ BROKEN_aarch64= fails to configure: DXX-Archive.3: che LIB_DEPENDS= libphysfs.so:devel/physfs \ libpng.so:graphics/png -USES= compiler:c++14-lang localbase:ldflags gl pkgconfig scons +USES= compiler:c++14-lang gl localbase:ldflags pkgconfig scons sdl tar:xz USE_GL= gl glu USE_SDL= mixer sdl Modified: head/games/dxx-rebirth/distinfo ============================================================================== --- head/games/dxx-rebirth/distinfo Mon May 27 19:14:18 2019 (r502813) +++ head/games/dxx-rebirth/distinfo Mon May 27 19:16:39 2019 (r502814) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542814122 -SHA256 (dxx-rebirth-0.60.0-beta2-git.tar.gz) = 1e684f98c3f2e44407617dd014964d73637d1f6893327b583f282da944227c6a -SIZE (dxx-rebirth-0.60.0-beta2-git.tar.gz) = 1873282 +TIMESTAMP = 1558946168 +SHA256 (dxx-rebirth_20190523-src.tar.xz) = a12c2defd587029b951d75a2b2e47e01d9ae7214aeac185b99cd413c970583e6 +SIZE (dxx-rebirth_20190523-src.tar.xz) = 1317288 Modified: head/games/dxx-rebirth/files/patch-SConstruct ============================================================================== --- head/games/dxx-rebirth/files/patch-SConstruct Mon May 27 19:14:18 2019 (r502813) +++ head/games/dxx-rebirth/files/patch-SConstruct Mon May 27 19:16:39 2019 (r502814) @@ -1,11 +1,20 @@ ---- SConstruct.orig 2018-11-21 15:51:35 UTC +--- SConstruct.orig 2019-05-23 09:33:10 UTC +++ SConstruct -@@ -3502,7 +3502,7 @@ class DXXCommon(LazyObjectConstructor): +@@ -3560,6 +3560,8 @@ class DXXCommon(LazyObjectConstructor): + sys_platform = 'linux' + elif sys_platform.startswith('openbsd'): + sys_platform = 'openbsd' ++ elif sys_platform.startswith('freebsd'): ++ sys_platform = 'freebsd' + return ( + { 'variable': EnumVariable, - 'arguments': ( - ('host_endian', None, 'endianness of host platform', {'allowed_values' : ('little', 'big')}), -- ('host_platform', sys.platform.rstrip('0123456789'), 'cross-compile to specified platform', {'allowed_values' : ('darwin', 'linux', 'openbsd', 'win32')}), -+ ('host_platform', sys.platform.rstrip('0123456789'), 'cross-compile to specified platform', {'allowed_values' : ('darwin', 'linux', 'freebsd', 'openbsd', 'win32')}), - ('screenshot', 'png', 'screenshot file format', {'allowed_values' : ('legacy', 'png')}), - ), - }, +@@ -3589,7 +3591,7 @@ class DXXCommon(LazyObjectConstructor): + 'cross-compile to specified platform', + { + 'map': {'msys':'win32'}, +- 'allowed_values' : ('darwin', 'linux', 'openbsd', 'win32'), ++ 'allowed_values' : ('darwin', 'linux', 'openbsd', 'win32', 'freebsd'), + } + ), + ('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')}), Added: head/games/dxx-rebirth/files/patch-similar_main_digiobj.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dxx-rebirth/files/patch-similar_main_digiobj.cpp Mon May 27 19:16:39 2019 (r502814) @@ -0,0 +1,11 @@ +--- similar/main/digiobj.cpp.orig 2019-05-27 11:05:14 UTC ++++ similar/main/digiobj.cpp +@@ -578,7 +578,7 @@ void digi_sync_sounds() + &s.volume, &s.pan, s.max_distance ); + + } else if ( s.flags & SOF_LINK_TO_OBJ ) { +- const auto objp = [&vcobjptr, &s]{ ++ const auto objp = [&s]{ + if (Newdemo_state != ND_STATE_PLAYBACK) + return vcobjptr(s.link_type.obj.objnum); + auto objnum = newdemo_find_object(s.link_type.obj.objsignature); Added: head/games/dxx-rebirth/files/patch-similar_main_object.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dxx-rebirth/files/patch-similar_main_object.cpp Mon May 27 19:16:39 2019 (r502814) @@ -0,0 +1,20 @@ +--- similar/main/object.cpp.orig 2019-05-27 09:10:54 UTC ++++ similar/main/object.cpp +@@ -1057,7 +1057,7 @@ static void free_object_slots(uint_fast32_t num_used) + + // Capture before num_to_free modified + const auto &&r = partial_const_range(obj_list, num_to_free); +- auto l = [&vmobjptr, &r, &num_to_free](bool (*predicate)(const vcobjptr_t)) -> bool { ++ auto l = [&r, &num_to_free](bool (*predicate)(const vcobjptr_t)) -> bool { + range_for (const auto i, r) + { + const auto &&o = vmobjptr(i); +@@ -1508,7 +1508,7 @@ static void start_player_death_sequence(object &player + auto &proximity = player_info.hoard.orbs; + if (proximity < player_info.max_hoard_orbs) + { +- const auto is_bad_kill = [&vmobjptr]{ ++ const auto is_bad_kill = []{ + auto &lplr = get_local_player(); + auto &lplrobj = get_local_plrobj(); + const auto killer_objnum = lplrobj.ctype.player_info.killer_objnum;