CVS commit: pkgsrc/games/devilutionx

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Nov 15 16:49:18 UTC 2023

Modified Files:
        pkgsrc/games/devilutionx: Makefile distinfo
        pkgsrc/games/devilutionx/patches: patch-CMakeLists.txt

Log Message:
devilutionx: Fix libsodium fallout


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/games/devilutionx/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/devilutionx/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.28 pkgsrc/games/devilutionx/Makefile:1.29
--- pkgsrc/games/devilutionx/Makefile:1.28      Sun Nov 12 13:21:30 2023
+++ pkgsrc/games/devilutionx/Makefile   Wed Nov 15 16:49:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2023/11/12 13:21:30 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2023/11/15 16:49:18 nia Exp $
 
 DISTNAME=      devilutionx-1.2.1
 PKGREVISION=   10
@@ -27,6 +27,8 @@ CMAKE_ARGS+=  -DCMAKE_BUILD_TYPE="Release
 CMAKE_ARGS+=   -DASAN=OFF -DUBSAN=OFF
 CMAKE_ARGS+=   -DDEBUG=OFF
 CMAKE_ARGS+=   -DVERSION_NUM=${PKGVERSION_NOREV}
+CMAKE_ARGS+=   -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON
+CMAKE_ARGS+=   -DDEVILUTIONX_STATIC_LIBSODIUM=OFF
 
 LDFLAGS.SunOS+=        -lsocket
 

Index: pkgsrc/games/devilutionx/distinfo
diff -u pkgsrc/games/devilutionx/distinfo:1.13 pkgsrc/games/devilutionx/distinfo:1.14
--- pkgsrc/games/devilutionx/distinfo:1.13      Sat Sep 24 08:46:23 2022
+++ pkgsrc/games/devilutionx/distinfo   Wed Nov 15 16:49:18 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2022/09/24 08:46:23 nia Exp $
+$NetBSD: distinfo,v 1.14 2023/11/15 16:49:18 nia Exp $
 
 BLAKE2s (devilutionx-1.2.1.tar.gz) = 38022f5b5025687f909001c7ea554ee2d6db1489bdd321fa1fac3749064f1168
 SHA512 (devilutionx-1.2.1.tar.gz) = 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
 Size (devilutionx-1.2.1.tar.gz) = 3573200 bytes
 SHA1 (patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = 1fdf31e70f72d4c4cadb76f64d06c3974e6f61d9
-SHA1 (patch-CMakeLists.txt) = 473f486534fc6d286ae04fe0d85502ee7a67d078
+SHA1 (patch-CMakeLists.txt) = 1bc95895aaad5e3e1f2f1d61843683585c3ef3eb

Index: pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt:1.3 pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt:1.3   Sat Sep 24 08:46:23 2022
+++ pkgsrc/games/devilutionx/patches/patch-CMakeLists.txt       Wed Nov 15 16:49:18 2023
@@ -1,11 +1,24 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2022/09/24 08:46:23 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2023/11/15 16:49:18 nia Exp $
+
+CMake's detection of libsodium is broken for whatever reason,
+and it finds uses libpthread. Use pkg-config to find it.
 
 Do not force libstdc++ to be linked statically, creates problems
 with PIE code.
 
---- CMakeLists.txt.orig        2022-09-24 08:40:00.299506879 +0000
+--- CMakeLists.txt.orig        2023-11-15 16:40:30.182662267 +0000
 +++ CMakeLists.txt
-@@ -607,10 +607,6 @@ foreach(target devilution ${BIN_TARGET} 
+@@ -158,7 +158,8 @@ endif()
+ if(NOT NONET)
+   if(DEVILUTIONX_SYSTEM_LIBSODIUM)
+     set(sodium_USE_STATIC_LIBS ${DEVILUTIONX_STATIC_LIBSODIUM})
+-    find_package(sodium REQUIRED)
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(sodium libsodium)
+   else()
+     add_subdirectory(3rdParty/libsodium)
+   endif()
+@@ -607,10 +608,6 @@ foreach(target devilution ${BIN_TARGET} 
    target_compile_definitions(${target} PRIVATE ${def_list})
  endforeach(target)