From bc1eefa099ce85c683ab718dc807b334eca43571 Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sat, 9 Apr 2022 17:27:30 +0000
Subject: [PATCH] community/nvme-cli: upgrade to 2.0

---
 community/nvme-cli/APKBUILD          | 26 +++++++++++++++++++-------
 community/nvme-cli/add-limits.patch  | 20 --------------------
 community/nvme-cli/fix-include.patch | 10 ++++++++++
 3 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 community/nvme-cli/add-limits.patch
 create mode 100644 community/nvme-cli/fix-include.patch

diff --git a/community/nvme-cli/APKBUILD b/community/nvme-cli/APKBUILD
index 5e514f53776..766d749c193 100644
--- a/community/nvme-cli/APKBUILD
+++ b/community/nvme-cli/APKBUILD
@@ -1,32 +1,44 @@
 # Contributor: Florian Heigl <florian.heigl@gmail.com>
 # Maintainer: Florian Heigl <florian.heigl@gmail.com>
 pkgname=nvme-cli
-pkgver=1.16
+pkgver=2.0
 pkgrel=0
 pkgdesc="NVM-Express user space tooling for Linux"
 options="!check" # Requires nose2
 arch="all"
 url="https://github.com/linux-nvme/nvme-cli"
 license="GPL-2.0-only"
-makedepends="linux-headers coreutils util-linux-dev util-linux uuidgen"
+makedepends="
+	libnvme-dev
+	linux-headers
+	meson
+	util-linux-dev
+	uuidgen
+	zlib-dev
+	"
 subpackages="
 	$pkgname-doc
 	$pkgname-bash-completion
 	$pkgname-zsh-completion
 	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v$pkgver.tar.gz
-	add-limits.patch"
+	fix-include.patch
+	"
 
 build() {
-	make PREFIX=/usr
+	abuild-meson \
+		-Ddocs=man \
+		-Dudevrulesdir=/usr/lib/udev/rules.d/ \
+		. output
+	meson compile -C output
 }
 
 package() {
-	make PREFIX=/usr DESTDIR="$pkgdir" UDEVDIR=/usr/lib/udev install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 	rm -rf "$pkgdir"/usr/lib/systemd
 }
 
 sha512sums="
-c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff  nvme-cli-1.16.tar.gz
-cee0623c3b17c74edc365eed80b3a03086ccb68f4fe00a0cd13ee65f0602a1edb0eed64a352403dd71a25f2779dc410fd2497a17be1e565958a7616dd375da70  add-limits.patch
+24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417  nvme-cli-2.0.tar.gz
+473571ed325e26cd12d9688689342112d7a64ce3e9b700bbe8b616cd7d57799a0c11e317683ba1183e5884e6930e874057108a9182e2c5b7495e3ed877f1f2ff  fix-include.patch
 "
diff --git a/community/nvme-cli/add-limits.patch b/community/nvme-cli/add-limits.patch
deleted file mode 100644
index d6271819979..00000000000
--- a/community/nvme-cli/add-limits.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nvme-cli-1.14.orig/nvme-rpmb.c
-+++ nvme-cli-1.14/nvme-rpmb.c
-@@ -25,6 +25,7 @@
- #include <sys/socket.h>
- #include <linux/if_alg.h>
- #include <linux/socket.h>
-+#include <limits.h>
- 
- #include "nvme.h"
- #include "nvme-print.h"
---- nvme-cli-1.14.orig/nvme-topology.c
-+++ nvme-cli-1.14/nvme-topology.c
-@@ -5,6 +5,7 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include <limits.h>
- 
- #include "nvme.h"
- #include "nvme-ioctl.h"
diff --git a/community/nvme-cli/fix-include.patch b/community/nvme-cli/fix-include.patch
new file mode 100644
index 00000000000..660c294961c
--- /dev/null
+++ b/community/nvme-cli/fix-include.patch
@@ -0,0 +1,10 @@
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+ 
+ static const char base64_table[65] =
+ 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";