CVS commit: pkgsrc/games/devilutionx

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/devilutionx
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Wed, 16 Oct 2019 12:00:51 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 16 12:00:51 UTC 2019

Modified Files:
        pkgsrc/games/devilutionx: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/devilutionx/patches:
            patch-3rdParty_StormLib_src_StormPort.h
Removed Files:
        pkgsrc/games/devilutionx/patches: patch-Source_inv.cpp
            patch-Source_list.h patch-Source_loadsave.cpp
            patch-Source_loadsave.h patch-structs.h

Log Message:
devilutionx: Update to 0.5.0

Features

    Sound is now accurate to the original
    All in-game issues fixed
    Delete hero, inline dialogs and scrollbars are now implemented
    Screenshots now have different names
    Multiple simultaneous dialogs fixed
    All builds are now 64bit (except for Windows and Raspberry Pi)
    Memory leaks and crashes fixed
    All keys are now mapped
    UI text now has correct shadows
    Much lower CPU usage

Known issues

    Error dialogs not implemented in main UI
    The game must restart after hosting multiplayer


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/devilutionx/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/devilutionx/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/devilutionx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/devilutionx/patches/patch-3rdParty_StormLib_src_StormPort.h
cvs rdiff -u -r1.1 -r0 pkgsrc/games/devilutionx/patches/patch-Source_inv.cpp \
    pkgsrc/games/devilutionx/patches/patch-Source_list.h \
    pkgsrc/games/devilutionx/patches/patch-Source_loadsave.h \
    pkgsrc/games/devilutionx/patches/patch-structs.h
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/games/devilutionx/patches/patch-Source_loadsave.cpp

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.7 pkgsrc/games/devilutionx/Makefile:1.8
--- pkgsrc/games/devilutionx/Makefile:1.7       Mon Jul 29 09:34:31 2019
+++ pkgsrc/games/devilutionx/Makefile   Wed Oct 16 12:00:51 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2019/07/29 09:34:31 nia Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/16 12:00:51 nia Exp $
 
-DISTNAME=      devilutionx-0.4.0
-PKGREVISION=   2
+DISTNAME=      devilutionx-0.5.0
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=diasurgical/}
 GITHUB_PROJECT=        devilutionX
@@ -33,31 +32,32 @@ CXXFLAGS+=  -DO_LARGEFILE=0 -Dstat64=stat
 
 CXXFLAGS+=     -DASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW=1
 
-ICON_SIZES=    1024 512 256 128 64 32 16
+# /usr/include/g++/cstdio:176:11: error: '::vfscanf' has not been declared
+# No idea.
+CXXFLAGS.NetBSD+=      -D_NETBSD_SOURCE
 
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/applications
-.for i in ${ICON_SIZES}
-INSTALLATION_DIRS+=    share/icons/hicolor/${i}x${i}/apps
-.endfor
-
-post-extract:
-       ${MV} ${WRKSRC}/Xcode/AppIcon.xcassets/AppIcon.appiconset/appicon-1.png \
-           ${WRKSRC}/Xcode/AppIcon.xcassets/AppIcon.appiconset/32.png
+INSTALLATION_DIRS+=    share/icons/hicolor/16x16/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/32x32/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/48x48/apps
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/devilutionx ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${FILESDIR}/devilutionx.desktop \
            ${DESTDIR}${PREFIX}/share/applications
-.for i in ${ICON_SIZES}
-       ${INSTALL_DATA} ${WRKSRC}/Xcode/AppIcon.xcassets/AppIcon.appiconset/${i}.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/devilutionx.png
-.endfor
+       ${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
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/devilutionx/PLIST
diff -u pkgsrc/games/devilutionx/PLIST:1.1 pkgsrc/games/devilutionx/PLIST:1.2
--- pkgsrc/games/devilutionx/PLIST:1.1  Wed Jul  3 10:58:12 2019
+++ pkgsrc/games/devilutionx/PLIST      Wed Oct 16 12:00:51 2019
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/03 10:58:12 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/16 12:00:51 nia Exp $
 bin/devilutionx
 share/applications/devilutionx.desktop
-share/icons/hicolor/1024x1024/apps/devilutionx.png
-share/icons/hicolor/128x128/apps/devilutionx.png
 share/icons/hicolor/16x16/apps/devilutionx.png
-share/icons/hicolor/256x256/apps/devilutionx.png
 share/icons/hicolor/32x32/apps/devilutionx.png
-share/icons/hicolor/512x512/apps/devilutionx.png
-share/icons/hicolor/64x64/apps/devilutionx.png
+share/icons/hicolor/48x48/apps/devilutionx.png

Index: pkgsrc/games/devilutionx/distinfo
diff -u pkgsrc/games/devilutionx/distinfo:1.4 pkgsrc/games/devilutionx/distinfo:1.5
--- pkgsrc/games/devilutionx/distinfo:1.4       Mon Jul 29 09:34:31 2019
+++ pkgsrc/games/devilutionx/distinfo   Wed Oct 16 12:00:51 2019
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.4 2019/07/29 09:34:31 nia Exp $
+$NetBSD: distinfo,v 1.5 2019/10/16 12:00:51 nia Exp $
 
-SHA1 (devilutionx-0.4.0.tar.gz) = d5d71cf752dc0b5c89f9827b52f1567cb5cfb8f4
-RMD160 (devilutionx-0.4.0.tar.gz) = 0b647b8ee4641d9af000d4d54e1008a506a9fc66
-SHA512 (devilutionx-0.4.0.tar.gz) = ba8f650f8dd00e3b08f6ac082566351c8f3b6162d7bfa2fdf3464b38c201b08677d2f6151f2272e1d73eb972b8babc49b38364523d10763eb179f6b682641443
-Size (devilutionx-0.4.0.tar.gz) = 1351201 bytes
-SHA1 (patch-Source_inv.cpp) = 788414c9141da13391cd4f540e364a034fd87b41
-SHA1 (patch-Source_list.h) = 1dd4dbe80c2d99ef127462de0b8cfc35e1b861de
-SHA1 (patch-Source_loadsave.cpp) = ea0d7f41ddec197f7b8002fba8a8479c3f49c415
-SHA1 (patch-Source_loadsave.h) = 6d7e7cc9e188e5a406c10caceb0aa80139c6e301
-SHA1 (patch-structs.h) = d9cba47b2ca876529aef33d4190f082d134cdcb6
+SHA1 (devilutionx-0.5.0.tar.gz) = f4dabf51605ac211d314830af797a0fa0114a059
+RMD160 (devilutionx-0.5.0.tar.gz) = 7a66413fa3c352136465b9ae373654e68f30c6fa
+SHA512 (devilutionx-0.5.0.tar.gz) = 36ad803b5b71d0ec98c3284716ed92067af742234306e723eba536404111b63efab869e5cce540f8acb1369992ba1c0c9cf0425cfb1ad37a6c970037abc54522
+Size (devilutionx-0.5.0.tar.gz) = 1767600 bytes
+SHA1 (patch-3rdParty_StormLib_src_StormPort.h) = a59ea9c29a86067b908aab7e8d3e344711407e0a

Added files:

Index: pkgsrc/games/devilutionx/patches/patch-3rdParty_StormLib_src_StormPort.h
diff -u /dev/null pkgsrc/games/devilutionx/patches/patch-3rdParty_StormLib_src_StormPort.h:1.1
--- /dev/null   Wed Oct 16 12:00:51 2019
+++ pkgsrc/games/devilutionx/patches/patch-3rdParty_StormLib_src_StormPort.h    Wed Oct 16 12:00:51 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-3rdParty_StormLib_src_StormPort.h,v 1.1 2019/10/16 12:00:51 nia Exp $
+
+strings.h for strncasecmp.
+
+--- 3rdParty/StormLib/src/StormPort.h.orig     2019-10-09 22:34:02.000000000 +0000
++++ 3rdParty/StormLib/src/StormPort.h
+@@ -162,6 +162,7 @@
+   #include <stdio.h>
+   #include <stdarg.h>
+   #include <string.h>
++  #include <strings.h>
+   #include <ctype.h>
+   #include <assert.h>
+   #include <errno.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index