CVS commit: pkgsrc/games/devilutionx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 19 17:07:22 UTC 2020

Modified Files:
        pkgsrc/games/devilutionx: Makefile PLIST distinfo
        pkgsrc/games/devilutionx/patches:
            patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
Added Files:
        pkgsrc/games/devilutionx/patches: patch-CMakeLists.txt

Log Message:
devilutionx: Update to 1.1.0

Features

    Propper widescreen (and other aspects) support
    Select difficulty in single player (remembered in the save game)
    Adjustable game speed in-game
    V-sync can now be disabled in the ini
    Better line drawing function used for the automap
    Support for loading custom Hell level maps
    Make all objects and monsters available to custom maps
    Added support for joining a game via hostname instead of IP

Bugfixes

    You can now enter and exit fullscreen also when the game is paused
    [Amiga] Fix double-clicking in menu

Original Diablo bugs

    Fix some monsters AC and to-hit values on Nightmare/Hell ending up as 0
    Fix player base block resetting to 0 after loading a save game
    Correctly render trees in front of the player
    Fully render sprites that are larger than the floor tiles
    Fix objects disappearing when walking on the opposite wall
    Dupping via belt has been fixed
    Correctly detect if the mouse is clicking the world or UI in some areas
    Minor typography corrections
    Corrected name of Chamber of Bones in automap
    Correctly align the inventory slots


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/devilutionx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/devilutionx/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/devilutionx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
cvs rdiff -u -r0 -r1.1 pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/games/devilutionx/Makefile
diff -u pkgsrc/games/devilutionx/Makefile:1.14 pkgsrc/games/devilutionx/Makefile:1.15
--- pkgsrc/games/devilutionx/Makefile:1.14      Tue Aug 18 17:57:50 2020
+++ pkgsrc/games/devilutionx/Makefile   Mon Oct 19 17:07:22 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/08/18 17:57:50 leot Exp $
+# $NetBSD: Makefile,v 1.15 2020/10/19 17:07:22 nia Exp $
 
-DISTNAME=      devilutionx-1.0.1
-PKGREVISION=   1
+DISTNAME=      devilutionx-1.1.0
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=diasurgical/}
 GITHUB_PROJECT=        devilutionX
@@ -15,7 +14,7 @@ WRKSRC=               ${WRKDIR}/${GITHUB_PROJECT}-${P
 
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++14
+USE_LANGUAGES= c c++
 
 # std::make_unique, etc
 GCC_REQD+=     5
@@ -26,30 +25,10 @@ CMAKE_ARG_PATH=     ..
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 CMAKE_ARGS+=   -DASAN=OFF -DUBSAN=OFF
 CMAKE_ARGS+=   -DDEBUG=OFF
-CMAKE_ARGS+=   -DFASTER=OFF
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-CXXFLAGS+=     -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate
-.endif
-
-# /usr/include/g++/cstdio:176:11: error: '::vfscanf' has not been declared
-# No idea.
-CXXFLAGS.NetBSD+=      -D_NETBSD_SOURCE
-
-# 3rdParty/StormLib/src/SFileFindFile.cpp: In function 'int CheckWildCard(const char*, const char*)':
-# 3rdParty/StormLib/src/SFileFindFile.cpp:72:54: error: array subscript has type 'char' [-Werror=char-subscripts]
-#                  if(AsciiToUpperTable[szWildCardPtr[0]] == AsciiToUpperTable[szString[0]])
-#                                                       ^
-# Maybe fix this later.
-BUILDLINK_TRANSFORM+=  rm:-Werror=char-subscripts
 
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/applications
-INSTALLATION_DIRS+=    share/icons/hicolor/16x16/apps
-INSTALLATION_DIRS+=    share/icons/hicolor/32x32/apps
-INSTALLATION_DIRS+=    share/icons/hicolor/48x48/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/512x512/apps
 
 pre-configure:
        ${MKDIR} -p ${WRKSRC}/build
@@ -58,12 +37,8 @@ do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/build/devilutionx ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${FILESDIR}/devilutionx.desktop \
            ${DESTDIR}${PREFIX}/share/applications
-       ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/16.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps/devilutionx.png
-       ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/Diablo_32.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/devilutionx.png
-       ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/Diablo_48.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/devilutionx.png
+       ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/icon.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/devilutionx.png
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"

Index: pkgsrc/games/devilutionx/PLIST
diff -u pkgsrc/games/devilutionx/PLIST:1.2 pkgsrc/games/devilutionx/PLIST:1.3
--- pkgsrc/games/devilutionx/PLIST:1.2  Wed Oct 16 12:00:51 2019
+++ pkgsrc/games/devilutionx/PLIST      Mon Oct 19 17:07:22 2020
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/10/16 12:00:51 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/10/19 17:07:22 nia Exp $
 bin/devilutionx
 share/applications/devilutionx.desktop
-share/icons/hicolor/16x16/apps/devilutionx.png
-share/icons/hicolor/32x32/apps/devilutionx.png
-share/icons/hicolor/48x48/apps/devilutionx.png
+share/icons/hicolor/512x512/apps/devilutionx.png

Index: pkgsrc/games/devilutionx/distinfo
diff -u pkgsrc/games/devilutionx/distinfo:1.8 pkgsrc/games/devilutionx/distinfo:1.9
--- pkgsrc/games/devilutionx/distinfo:1.8       Mon Mar 30 19:36:39 2020
+++ pkgsrc/games/devilutionx/distinfo   Mon Oct 19 17:07:22 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2020/03/30 19:36:39 joerg Exp $
+$NetBSD: distinfo,v 1.9 2020/10/19 17:07:22 nia Exp $
 
-SHA1 (devilutionx-1.0.1.tar.gz) = 891c1b2d1956e8d7cef14d486e99f448c98a6694
-RMD160 (devilutionx-1.0.1.tar.gz) = 07bb1f4afef0a354b717add0afb0528689258868
-SHA512 (devilutionx-1.0.1.tar.gz) = 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
-Size (devilutionx-1.0.1.tar.gz) = 2005920 bytes
-SHA1 (patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = fdbfcc0d6e796a060d66013fcd59df6ef9383769
+SHA1 (devilutionx-1.1.0.tar.gz) = 41329a1af38c8c30996f9730255a4172028dc80e
+RMD160 (devilutionx-1.1.0.tar.gz) = 1fd4f89b57b3d4b576e75068918803378dee8a9c
+SHA512 (devilutionx-1.1.0.tar.gz) = 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
+Size (devilutionx-1.1.0.tar.gz) = 2271614 bytes
+SHA1 (patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = 1fdf31e70f72d4c4cadb76f64d06c3974e6f61d9
+SHA1 (patch-CMakeLists.txt) = 99963356afd54ca93493bd498cbd37e14a37c67a

Index: pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
diff -u pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp:1.1 
pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp:1.2
--- pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp:1.1       Mon Mar 30 19:36:39 2020
+++ pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp   Mon Oct 19 17:07:22 2020
@@ -1,4 +1,6 @@
-$NetBSD: patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2020/03/30 19:36:39 joerg Exp $
+$NetBSD: patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.2 2020/10/19 17:07:22 nia Exp $
+
+Support newer NetBSD with udata that doesn't need casting.
 
 --- 3rdParty/asio/include/asio/detail/impl/kqueue_reactor.ipp.orig     2020-03-09 00:37:54.000000000 +0000
 +++ 3rdParty/asio/include/asio/detail/impl/kqueue_reactor.ipp

Added files:

Index: pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Oct 19 17:07:22 2020
+++ pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt       Mon Oct 19 17:07:22 2020
@@ -0,0 +1,23 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/10/19 17:07:22 nia Exp $
+
+NetBSD support.
+
+--- CMakeLists.txt.orig        2020-10-10 22:26:16.000000000 +0000
++++ CMakeLists.txt
+@@ -92,10 +92,14 @@ elseif(TARGET_PLATFORM STREQUAL "cpigame
+   include(cpigamesh_defs)
+ endif()
+ 
+-if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD OR ${CMAKE_SYSTEM_NAME} STREQUAL OpenBSD)
++if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD OR ${CMAKE_SYSTEM_NAME} STREQUAL NetBSD OR ${CMAKE_SYSTEM_NAME} STREQUAL OpenBSD)
+   set(ASAN OFF)
+   set(UBSAN OFF)
+-  add_definitions(-D_BSD_SOURCE)
++  if(${CMAKE_SYSTEM_NAME} STREQUAL NetBSD)
++    add_definitions(-D_NETBSD_SOURCE)
++  else()
++    add_definitions(-D_BSD_SOURCE)
++  endif()
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
+ endif()
+