From 34f37d4b5285a2c0749858efb32cdc771a4fd004 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Mon, 22 Jul 2024 17:06:30 -0400
Subject: [PATCH] contrib: update natpmp, use CMake
Change-Id: I4aa469134be1167847413d970f745d695d561315
---
contrib/src/dhtnet/rules.mak | 2 +-
contrib/src/natpmp/SHA512SUMS | 1 +
contrib/src/natpmp/rules.mak | 11 +++++------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/src/dhtnet/rules.mak b/contrib/src/dhtnet/rules.mak
index 75a3c42f5e..bd370e748c 100644
--- a/contrib/src/dhtnet/rules.mak
+++ b/contrib/src/dhtnet/rules.mak
@@ -1,5 +1,5 @@
# DHTNET
-DHTNET_VERSION := fd29c1d63cdd9768c6a850526d4e4b285ea50b12
+DHTNET_VERSION := cfe512b0632eea046f683b22e42d01eeb943d751
DHTNET_URL := https://review.jami.net/plugins/gitiles/dhtnet/+archive/$(DHTNET_VERSION).tar.gz
PKGS += dhtnet
diff --git a/contrib/src/natpmp/SHA512SUMS b/contrib/src/natpmp/SHA512SUMS
index f6bc1d2125..de5e8c0ad2 100644
--- a/contrib/src/natpmp/SHA512SUMS
+++ b/contrib/src/natpmp/SHA512SUMS
@@ -1 +1,2 @@
1697a414f0ff73876c177d8e09242c8da6fd4bc9b1c3a893bfb082420bfdac30f455507b81937042caaf6b30756d2055c073ee1de1ac73f7ef31e4c68e5c4ed7 libnatpmp-20230423.tar.gz
+d277d7bd3a3cb47b18e8af2efc1e5c4e14e976dcd5732ff4741477da290a5e081a39ec1a482075700174c302601d54a641bc5cbe22eb7a4ee335ec0def359343 libnatpmp-007c3a53165a0551c877130eea4d966885ce19ae.tar.gz
diff --git a/contrib/src/natpmp/rules.mak b/contrib/src/natpmp/rules.mak
index 9ee1adbbe9..c2f0914a40 100644
--- a/contrib/src/natpmp/rules.mak
+++ b/contrib/src/natpmp/rules.mak
@@ -1,6 +1,6 @@
# libnatpmp
-NATPMP_VERSION := 20230423
-NATPMP_URL := http://miniupnp.free.fr/files/download.php?file=libnatpmp-$(NATPMP_VERSION).tar.gz
+NATPMP_VERSION := 007c3a53165a0551c877130eea4d966885ce19ae
+NATPMP_URL := https://github.com/miniupnp/libnatpmp/archive/${NATPMP_VERSION}.tar.gz
ifndef HAVE_WIN32
ifndef HAVE_ANDROID
@@ -21,11 +21,10 @@ $(TARBALLS)/libnatpmp-$(NATPMP_VERSION).tar.gz:
natpmp: libnatpmp-$(NATPMP_VERSION).tar.gz .sum-natpmp
$(UNPACK)
- $(APPLY) $(SRC)/natpmp/0001-remove-shared-libs-executables.patch
$(MOVE)
-.natpmp: natpmp
- cd $< && $(MAKE) INSTALLPREFIX="$(PREFIX)" $(HOSTVARS) install
- -rm -f $(PREFIX)/lib/libnatpmp.so* $(PREFIX)/lib/libnatpmp.dylib*
+.natpmp: natpmp toolchain.cmake
+ cd $< && $(HOSTVARS) $(CMAKE) .
+ cd $< && $(MAKE) install
cd $< && cp natpmp_declspec.h $(PREFIX)/include/
touch $@
--
GitLab