upgpkg: dwarfs-git 0.7.0.RC4.r0.g3dfad5a-1

upstream release

2 files changed, 30 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8913edb616c8..a2e62dab05bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 pkgbase = dwarfs-git
 	pkgdesc = A fast high compression read-only file system
-	pkgver = 0.5.6.r60.gf07e7e3
+	pkgver = 0.7.0.RC4.r0.g3dfad5a
 	pkgrel = 1
 	url = https://github.com/mhx/dwarfs
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	makedepends = cmake
-	makedepends = sparsehash
 	makedepends = ruby-ronn
 	makedepends = boost
 	makedepends = libevent
-	makedepends = libaio
+	makedepends = libdwarf
 	depends = fuse3
 	depends = openssl
 	depends = boost-libs
 	depends = jemalloc
+	depends = xxhash
 	depends = lz4
 	depends = xz
 	depends = zstd
+	depends = libarchive
+	depends = brotli
 	depends = libunwind
 	depends = google-glog
 	depends = fmt
diff --git a/PKGBUILD b/PKGBUILD
index 03b2e9a65959..f0777820d3b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,51 +2,57 @@
 
 _pkgname=dwarfs
 pkgname=${_pkgname}-git
-pkgver=0.5.6.r60.gf07e7e3
+pkgver=0.7.0.RC4.r0.g3dfad5a
 pkgrel=1
 pkgdesc="A fast high compression read-only file system"
 url='https://github.com/mhx/dwarfs'
 arch=('x86_64')
 license=('GPL3')
 depends=(
-  'fuse3' 'openssl' 'boost-libs' 'jemalloc'
-  'lz4' 'xz' 'zstd'
+  'fuse3' 'openssl' 'boost-libs' 'jemalloc' 'xxhash'
+  'lz4' 'xz' 'zstd' 'libarchive' 'brotli'
   'libunwind' 'google-glog' 'fmt' 'gflags' 'double-conversion'
   # 'python'
 )
 makedepends=(
-  'git' 'cmake' 'sparsehash' 'ruby-ronn'
-  'boost' 'libevent' 'libaio'
-  # 'liburing' 'libsodium'
+  'git' 'cmake' 'ruby-ronn'
+  'boost' 'libevent' 'libdwarf'
 )
-source=("${pkgname}::git+https://github.com/mhx/dwarfs.git")
+source=("$pkgname::git+https://github.com/mhx/dwarfs.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${pkgname}"
+  cd "$pkgname"
 
   git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "${pkgname}"
+  cd "$pkgname"
 
   git submodule update --init --depth=1
 }
 
 build() {
-  cd "$pkgname"
-
-  cmake -B "$srcdir/build" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=None
-
-  cmake --build "$srcdir/build"
+  cmake -B build -S "$pkgname" \
+    -W no-dev \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_BUILD_TYPE=None \
+    -D CMAKE_LIBRARY_ARCHITECTURE="$CARCH" \
+    -D PREFER_SYSTEM_ZSTD=ON \
+    -D PREFER_SYSTEM_XXHASH=ON \
+    -D PREFER_SYSTEM_LIBFMT=ON
+
+  cmake --build build
 }
 
 package() {
-  cmake --install build \
-    --prefix "${pkgdir}/usr"
+  DESTDIR="$pkgdir" cmake --install build \
+
+  mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin"
+  rm -rf "$pkgdir/usr/sbin"
+
+  cd "$pkgname"
 
-  install -Dm0644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE
 }