Hi Brian, On Wed, 1 Jan 2020 10:54:05 -0500 Brian Callahan wrote:
> Hi ports -- > > Here is a new version of DevilutionX. > The changelog can be found here: > https://github.com/diasurgical/devilutionX/releases/tag/1.0.0 > > Looking for testers, particularly !amd64 testers. I tried on powerpc. It builds. As far as the runtime is concerned, colors are fine, which is already great, but it then fails later with: >> TTF_OpenFont: Couldn't open CharisSILB.ttf Unlike the AmigaPorts version. It's not related to a bad or corrupted MPQ file because... > OK? ... it works fine on amd64, i've just lightly tested it though. They use DOS line endings, converting them for patched files looks like a good idea. Your call. OK cwen@ either way. Charlène. Index: Makefile =================================================================== RCS file: /cvs/ports/games/devilutionx/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile 9 Nov 2019 22:35:19 -0000 1.4 +++ Makefile 1 Jan 2020 16:55:45 -0000 @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.4 2019/11/09 22:35:19 bcallah Exp $ COMMENT = open source engine recreation for Diablo 1 game -DISTNAME = devilutionx-0.5.0 +PKGNAME = ${DISTNAME:L} CATEGORIES = games x11 GH_ACCOUNT = diasurgical GH_PROJECT = devilutionX -GH_COMMIT = 2afc5862a0762bdf1a2005249d5e34245815c595 +GH_TAGNAME = 1.0.0 MAINTAINER = Brian Callahan <[email protected]> @@ -34,6 +34,9 @@ USE_GMAKE = Yes USE_NINJA = No NO_TEST = Yes + +post-extract: + @cd ${WRKSRC} && perl -i -pe 's/\r$$//' CMakeLists.txt # No install target do-install: Index: distinfo =================================================================== RCS file: /cvs/ports/games/devilutionx/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 9 Nov 2019 22:35:19 -0000 1.3 +++ distinfo 1 Jan 2020 16:55:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (devilutionx-0.5.0-2afc5862.tar.gz) = W+N9S07qWHqFLPuv9Km18EIY+x0dIHGHvgukmL5By7o= -SIZE (devilutionx-0.5.0-2afc5862.tar.gz) = 1781028 +SHA256 (devilutionX-1.0.0.tar.gz) = +vsLrJNbu+6OJh1/vS1Op2m4i7x4uhr/73QGSizHd3k= +SIZE (devilutionX-1.0.0.tar.gz) = 1798349 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/devilutionx/patches/patch-CMakeLists_txt,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 9 Nov 2019 22:35:19 -0000 1.3 +++ patches/patch-CMakeLists_txt 1 Jan 2020 16:55:45 -0000 @@ -5,19 +5,19 @@ Don't do git here. Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -18,14 +18,8 @@ option(NIGHTLY_BUILD "Enable options for nightly build - option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF) - option(NONET "Disable network" OFF) - --include(CMake/git.cmake) --get_git_tag(GIT_TAG) --if(NOT CMAKE_BUILD_TYPE MATCHES "Release") -- get_git_commit_hash(GIT_COMMIT_HASH) --endif() -- - project(DevilutionX -- VERSION ${GIT_TAG} -+ VERSION 0.5.0 - LANGUAGES C CXX) - - if(BINARY_RELEASE) +@@ -19,14 +19,8 @@ option(NIGHTLY_BUILD "Enable options for nightly build + option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF) + option(NONET "Disable network" OFF) + +-include(CMake/git.cmake) +-get_git_tag(GIT_TAG) +-if(NOT CMAKE_BUILD_TYPE MATCHES "Release") +- get_git_commit_hash(GIT_COMMIT_HASH) +-endif() +- + project(DevilutionX +- VERSION ${GIT_TAG} ++ VERSION 1.0.0 + LANGUAGES C CXX) + + if(BINARY_RELEASE)
