diff --git a/extra/opendht/.SRCINFO b/extra/opendht/.SRCINFO index 06b6ca289..8dc3e3f7d 100644 --- a/extra/opendht/.SRCINFO +++ b/extra/opendht/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = opendht pkgdesc = C++17 Distributed Hash Table (DHT) implementation - pkgver = 3.1.9 - pkgrel = 4 + pkgver = 3.2.0 + pkgrel = 1 epoch = 1 url = https://github.com/savoirfairelinux/opendht arch = x86_64 @@ -10,8 +10,8 @@ pkgbase = opendht makedepends = git makedepends = cmake makedepends = msgpack-cxx - makedepends = asio makedepends = restinio + makedepends = asio makedepends = cython makedepends = python-setuptools depends = glibc @@ -22,11 +22,13 @@ pkgbase = opendht depends = jsoncpp depends = libjsoncpp.so depends = fmt - depends = http-parser depends = openssl + depends = llhttp optdepends = python: to use the Python bindings optdepends = msgpack-cxx: linking against opendht - source = git+https://github.com/savoirfairelinux/opendht#commit=4eaa53a4a6c5bee338c0363a765a68505bd75085 - sha256sums = a62ef74869dde75c52ae3b26d187499be58d293b41aed3730d277793ecb4a420 + source = git+https://github.com/savoirfairelinux/opendht#tag=v3.2.0 + source = llhttp.patch + sha256sums = 12f71503ba7253ca5545676ffed7a6fea9497e0227c9e2112d1901b7c8a63412 + sha256sums = 0f0b394656f719508ea83dd3ea87b08245fa1413a91e50a144dede20b2e3ca22 pkgname = opendht diff --git a/extra/opendht/PKGBUILD b/extra/opendht/PKGBUILD index 1ec435882..2c0946c75 100644 --- a/extra/opendht/PKGBUILD +++ b/extra/opendht/PKGBUILD @@ -7,30 +7,28 @@ pkgname=opendht epoch=1 -pkgver=3.1.9 -pkgrel=4 +pkgver=3.2.0 +pkgrel=1 pkgdesc="C++17 Distributed Hash Table (DHT) implementation" arch=(x86_64) url="https://github.com/savoirfairelinux/opendht" license=(GPL3) -depends=(glibc gnutls nettle readline argon2 jsoncpp libjsoncpp.so fmt http-parser openssl) -makedepends=(git cmake msgpack-cxx asio restinio cython python-setuptools cppunit) +depends=(glibc gnutls nettle readline argon2 jsoncpp libjsoncpp.so fmt openssl llhttp) +makedepends=(git cmake msgpack-cxx restinio asio cython python-setuptools cppunit) optdepends=('python: to use the Python bindings' 'msgpack-cxx: linking against opendht') -_commit=4eaa53a4a6c5bee338c0363a765a68505bd75085 -source=(git+${url}#commit=${_commit}) -sha256sums=('a62ef74869dde75c52ae3b26d187499be58d293b41aed3730d277793ecb4a420') +source=(git+${url}#tag=v$pkgver + llhttp.patch) +sha256sums=('12f71503ba7253ca5545676ffed7a6fea9497e0227c9e2112d1901b7c8a63412' + '0f0b394656f719508ea83dd3ea87b08245fa1413a91e50a144dede20b2e3ca22') -pkgver() { - cd ${pkgname} - git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./;s/-/+/' +prepare() { + patch -d $pkgname -p1 < llhttp.patch # Fix llhttp lib name } build() { cmake -B build -S ${pkgname} \ - -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DOPENDHT_DOCUMENTATION=OFF \ -DOPENDHT_TESTS=ON \ -DOPENDHT_SYSTEMD=ON \ diff --git a/extra/opendht/llhttp.patch b/extra/opendht/llhttp.patch new file mode 100644 index 000000000..ddcb5390f --- /dev/null +++ b/extra/opendht/llhttp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57f767af..6b9403ef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,7 +97,7 @@ if (NOT MSVC) + + # llhttp + find_path(LLHTTP_INCLUDE_DIR llhttp.h) +- find_library(LLHTTP_LIBRARY libllhttp) ++ find_library(LLHTTP_LIBRARY llhttp) + if (LLHTTP_INCLUDE_DIR AND LLHTTP_LIBRARY) + message(STATUS "Found llhttp ${LLHTTP_INCLUDE_DIR} ${LLHTTP_LIBRARY}") + add_library(llhttp_static STATIC IMPORTED)