7 files changed, 48 insertions, 57 deletions
diff --git a/package/libinih/Makefile b/package/libinih/Makefile
new file mode 100644
index 000000000..81b70f308
--- /dev/null
+++ b/package/libinih/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libinih
+PKG_VERSION:=		r53
+PKG_RELEASE:=		1
+PKG_HASH:=		01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241
+PKG_DESCR:=		ini parser library
+PKG_SECTION:=		libs/misc
+PKG_BUILDDEP:=		meson-host
+PKG_URL:=		https://github.com/benhoyt/inih
+PKG_SITES:=		https://github.com/benhoyt/inih/archive/refs/tags/
+PKG_OPTS:=		dev
+
+DISTFILES:=             $(PKG_VERSION).tar.gz
+
+WRKDIST=		${WRKDIR}/inih-${PKG_VERSION}
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBINIH,libinih,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+libinih-install:
+	$(INSTALL_DIR) $(IDIR_LIBINIH)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libinih*.so* \
+		$(IDIR_LIBINIH)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/ninja/patches/patch-configure_py b/package/ninja/patches/patch-configure_py
new file mode 100644
index 000000000..cb743c891
--- /dev/null
+++ b/package/ninja/patches/patch-configure_py
@@ -0,0 +1,8 @@
+--- ninja-1.8.2.orig/configure.py	2017-09-11 03:20:10.000000000 +0200
++++ ninja-1.8.2/configure.py	2021-09-21 11:39:51.729841404 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # Copyright 2001 Google Inc. All Rights Reserved.
+ #
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index d66c24402..4da664645 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,13 +4,13 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
-PKG_VERSION:=		4.13.1
+PKG_VERSION:=		5.13.0
 PKG_RELEASE:=		1
-PKG_HASH:=		8c64d349d191e24c84eeb1611be767e4a11b81016bd5b73f3a20a0bf39dd3536
+PKG_HASH:=		4e142d4babe086adf9016d8c606c805829da08e46389a4433f40346204f90cdb
 PKG_DESCR:=		utilities for xfs filesystems
 PKG_SECTION:=		sys/fs
-PKG_DEPENDS:=		libuuid libblkid libncurses
-PKG_BUILDDEP:=		e2fsprogs ncurses
+PKG_DEPENDS:=		libuuid libblkid libncurses libinih
+PKG_BUILDDEP:=		e2fsprogs ncurses libinih
 PKG_NEEDS:=		threads
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
diff --git a/package/xfsprogs/patches/patch-io_Makefile b/package/xfsprogs/patches/patch-io_Makefile
deleted file mode 100644
index e740615b1..000000000
--- a/package/xfsprogs/patches/patch-io_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfsprogs-4.11.0.orig/io/Makefile	2017-05-05 20:47:11.000000000 +0200
-+++ xfsprogs-4.11.0/io/Makefile	2017-06-03 20:54:04.368047450 +0200
-@@ -13,8 +13,8 @@ CFILES = init.c \
- 	getrusage.c imap.c link.c mmap.c open.c parent.c pread.c prealloc.c \
- 	pwrite.c reflink.c seek.c shutdown.c stat.c sync.c truncate.c utimes.c
- 
--LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBPTHREAD)
--LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE)
-+LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBHANDLE) $(LIBPTHREAD)
-+LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) $(LIBHANDLE)
- LLDFLAGS = -static-libtool-libs
- 
- ifeq ($(HAVE_FADVISE),yes)
diff --git a/package/xfsprogs/patches/patch-libxfs_Makefile b/package/xfsprogs/patches/patch-libxfs_Makefile
deleted file mode 100644
index 2f38b240f..000000000
--- a/package/xfsprogs/patches/patch-libxfs_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- xfsprogs-4.13.1.orig/libxfs/Makefile	2017-09-09 02:35:35.000000000 +0200
-+++ xfsprogs-4.13.1/libxfs/Makefile	2017-11-25 17:47:45.180739534 +0100
-@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT)
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
- 
--LDIRT = gen_crc32table crc32table.h crc32selftest
-+LDIRT = gen_crc32table crc32table.h
- 
--default: crc32selftest ltdepend $(LTLIBRARY)
-+default: ltdepend $(LTLIBRARY)
- 
- crc32table.h: gen_crc32table.c crc32defs.h
- 	@echo "    [CC]     gen_crc32table"
diff --git a/package/xfsprogs/patches/patch-quota_Makefile b/package/xfsprogs/patches/patch-quota_Makefile
deleted file mode 100644
index 00bc37ef5..000000000
--- a/package/xfsprogs/patches/patch-quota_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfsprogs-4.11.0.orig/quota/Makefile	2017-05-05 20:47:11.000000000 +0200
-+++ xfsprogs-4.11.0/quota/Makefile	2017-06-03 20:57:53.306759013 +0200
-@@ -14,8 +14,8 @@ CFILES += $(PKG_PLATFORM).c
- PCFILES = darwin.c freebsd.c irix.c linux.c
- LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
- 
--LLDLIBS = $(LIBXCMD)
--LTDEPENDENCIES = $(LIBXCMD)
-+LLDLIBS = $(LIBXFS) $(LIBXCMD)
-+LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
- LLDFLAGS = -static
- 
- ifeq ($(ENABLE_READLINE),yes)
diff --git a/package/xfsprogs/patches/patch-spaceman_Makefile b/package/xfsprogs/patches/patch-spaceman_Makefile
deleted file mode 100644
index 1bd7da4a7..000000000
--- a/package/xfsprogs/patches/patch-spaceman_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfsprogs-4.13.1.orig/spaceman/Makefile	2017-09-09 02:35:35.000000000 +0200
-+++ xfsprogs-4.13.1/spaceman/Makefile	2017-11-25 17:55:33.271558933 +0100
-@@ -9,8 +9,8 @@ LTCOMMAND = xfs_spaceman
- HFILES = init.h space.h
- CFILES = init.c file.c prealloc.c trim.c
- 
--LLDLIBS = $(LIBXCMD)
--LTDEPENDENCIES = $(LIBXCMD)
-+LLDLIBS = $(LIBXFS) $(LIBXCMD)
-+LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
- LLDFLAGS = -static
- 
- ifeq ($(ENABLE_READLINE),yes)