summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/devilutionx/Makefile37
-rw-r--r--games/devilutionx/PLIST6
-rw-r--r--games/devilutionx/distinfo13
-rw-r--r--games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp4
-rw-r--r--games/devilutionx/patches/patch-CMakeLists.txt23
5 files changed, 41 insertions, 42 deletions
diff --git a/games/devilutionx/Makefile b/games/devilutionx/Makefile
index 9aedb0260a5..3f28922e82f 100644
--- a/games/devilutionx/Makefile
+++ b/games/devilutionx/Makefile
@@ -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}-${PKGVERSION_NOREV}
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"
diff --git a/games/devilutionx/PLIST b/games/devilutionx/PLIST
index d4204a442fb..8ac94c8fb38 100644
--- a/games/devilutionx/PLIST
+++ b/games/devilutionx/PLIST
@@ -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
diff --git a/games/devilutionx/distinfo b/games/devilutionx/distinfo
index 27bc7cac6bc..d29bcb9e2ed 100644
--- a/games/devilutionx/distinfo
+++ b/games/devilutionx/distinfo
@@ -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
diff --git a/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp b/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
index 06d8a72f1d6..d259a1b4315 100644
--- a/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
+++ b/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
@@ -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
diff --git a/games/devilutionx/patches/patch-CMakeLists.txt b/games/devilutionx/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..95d461fcdb0
--- /dev/null
+++ b/games/devilutionx/patches/patch-CMakeLists.txt
@@ -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()
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 09:30:11 +0000