From owner-svn-ports-all@freebsd.org Sat Nov 2 11:09:33 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2E26317F9D5; Sat, 2 Nov 2019 11:09:33 +0000 (UTC) (envelope-from tobik@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 474xCd0Rcmz4VVr; Sat, 2 Nov 2019 11:09:33 +0000 (UTC) (envelope-from tobik@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 E7D612271A; Sat, 2 Nov 2019 11:09:32 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA2B9Wj0036980; Sat, 2 Nov 2019 11:09:32 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA2B9VCK036975; Sat, 2 Nov 2019 11:09:31 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201911021109.xA2B9VCK036975@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 2 Nov 2019 11:09:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516296 - in head/games/devilutionX: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/devilutionX: . files X-SVN-Commit-Revision: 516296 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sat, 02 Nov 2019 11:09:33 -0000 Author: tobik Date: Sat Nov 2 11:09:31 2019 New Revision: 516296 URL: https://svnweb.freebsd.org/changeset/ports/516296 Log: games/devilutionX: Update to 0.5.0 This release builds fine with Clang now. PR: 241336 Submitted by: benny.goemans@gmail.com (maintainer) Added: head/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h (contents, props changed) Modified: head/games/devilutionX/Makefile head/games/devilutionX/distinfo head/games/devilutionX/files/patch-CMakeLists.txt head/games/devilutionX/pkg-message Modified: head/games/devilutionX/Makefile ============================================================================== --- head/games/devilutionX/Makefile Sat Nov 2 11:00:30 2019 (r516295) +++ head/games/devilutionX/Makefile Sat Nov 2 11:09:31 2019 (r516296) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= devilutionX -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.5.0 +PORTREVISION= 0 CATEGORIES= games MAINTAINER= benny.goemans@gmail.com @@ -10,20 +10,15 @@ COMMENT= Open-source implementation of Diablo Game eng LICENSE= UNLICENSE -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= Uses inline x86 assembly - LIB_DEPENDS= libsodium.so:security/libsodium USES= cmake dos2unix sdl -USE_GCC= yes USE_SDL= mixer2 sdl2 ttf2 PLIST_FILES= bin/devilutionx USE_GITHUB= yes GH_ACCOUNT= diasurgical -GH_PROJECT= devilutionX OPTIONS_DEFAULT= RELEASE Modified: head/games/devilutionX/distinfo ============================================================================== --- head/games/devilutionX/distinfo Sat Nov 2 11:00:30 2019 (r516295) +++ head/games/devilutionX/distinfo Sat Nov 2 11:09:31 2019 (r516296) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558349866 -SHA256 (diasurgical-devilutionX-0.4.0_GH0.tar.gz) = 2a2ca9c375aaca6958a4bcca001acf7e714e86adca80b1c03684befa48ea576c -SIZE (diasurgical-devilutionX-0.4.0_GH0.tar.gz) = 1351201 +TIMESTAMP = 1570734030 +SHA256 (diasurgical-devilutionX-0.5.0_GH0.tar.gz) = 45f779084aa7459880e5eab1bf3d63dcd223d937485a840dc055e7d1e8eace5c +SIZE (diasurgical-devilutionX-0.5.0_GH0.tar.gz) = 1767600 Added: head/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h Sat Nov 2 11:09:31 2019 (r516296) @@ -0,0 +1,10 @@ +--- 3rdParty/StormLib/src/StormPort.h.orig 2019-10-11 11:58:58 UTC ++++ 3rdParty/StormLib/src/StormPort.h +@@ -165,6 +165,7 @@ + #include + #include + #include ++ #include + + #ifndef __BIG_ENDIAN__ + #define PLATFORM_LITTLE_ENDIAN Modified: head/games/devilutionX/files/patch-CMakeLists.txt ============================================================================== --- head/games/devilutionX/files/patch-CMakeLists.txt Sat Nov 2 11:00:30 2019 (r516295) +++ head/games/devilutionX/files/patch-CMakeLists.txt Sat Nov 2 11:09:31 2019 (r516296) @@ -1,8 +1,32 @@ ---- CMakeLists.txt.orig 2019-05-13 15:14:29 UTC +--- CMakeLists.txt.orig 2019-10-11 23:27:07 UTC +++ CMakeLists.txt -@@ -287,3 +287,5 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # Silence appfat.cpp warnings +@@ -68,6 +68,9 @@ list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DI + if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) + set(ASAN OFF) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate") ++ add_definitions(-D__BSD_VISIBLE=1) ++ add_definitions(-D__POSIX_VISIBLE=200809L) ++ add_definitions(-D__XSI_VISIBLE=1) + endif() + + if(WIN32) +@@ -337,8 +340,8 @@ endif() + + if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + # Change __FILE__ to only show the path relative to the project folder +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined") + + if(DEBUG) + # Note: For Valgrind suppor. +@@ -368,6 +371,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # Silence appfat.cpp warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing") endif() + +install(TARGETS devilutionx DESTINATION ${BINDIR}) + + if(APPLE) + set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) Modified: head/games/devilutionX/pkg-message ============================================================================== --- head/games/devilutionX/pkg-message Sat Nov 2 11:00:30 2019 (r516295) +++ head/games/devilutionX/pkg-message Sat Nov 2 11:09:31 2019 (r516296) @@ -7,11 +7,8 @@ If you don't own it yet, you can buy it at https://www Copy DIABDAT.MPQ to ~/.local/share/diasurgical/devilution/diabdat.mpq Pay attention to the case, the resulting file needs to be entirely lowercase! -If you have any issues with this game, file a bug report on the GitHub page: +If you have any issues with this game, please file a bug report on the GitHub page: https://github.com/diasurgical/devilutionX/issues - -Note that only 32-bit builds are currently supported, amd64 is experimental but -seems to be working fine as far as I've tested. EOM } ]