From 4a1f033a8f2adc844de620285828072222b3cfeb Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Fri, 2 Oct 2020 12:16:30 +0300
Subject: build: adopt meson build for v3 branch

---
 meson.build       |  2 +-
 meson_options.txt |  2 +-
 src/meson.build   | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 9bf7748..b30172d 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
 	'apk-tools',
 	['c'],
 	default_options : ['c_std=gnu99'],
-	version: '2.10.5',
+	version: '3.0.0_pre0',
 	meson_version: '>=0.51'
 )
 pkgc = import('pkgconfig')
diff --git a/meson_options.txt b/meson_options.txt
index 0677faa..9d803d9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,4 +2,4 @@ option('docs', description: 'Build manpages with scdoc', type: 'feature', value:
 option('help', description: 'Build help into apk binaries, needs lua and lua-zlib', type: 'feature', value: 'auto')
 option('lua', description: 'Build luaapk (lua bindings)', type: 'feature', value: 'auto')
 option('lua_version', description: 'Lua version to build against', type: 'string', value: '5.3')
-option('static_apk', description: 'Also build apk.static', type: 'boolean', value: true)
+option('static_apk', description: 'Also build apk.static', type: 'boolean', value: false)
diff --git a/src/meson.build b/src/meson.build
index c93429f..216ce0e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,8 @@
+libapk_so_version = '2.99.0'
 libapk_src = [
+	'adb.c',
+	'adb_trust.c',
+	'apk_adb.c',
 	'atom.c',
 	'blob.c',
 	'commit.c',
@@ -35,9 +39,13 @@ libapk_headers = [
 
 apk_src = [
 	'apk.c',
+	'app_adbdump.c',
+	'app_adbsign.c',
 	'app_add.c',
 	'app_audit.c',
 	'app_cache.c',
+	'app_convdb.c',
+	'app_convndx.c',
 	'app_del.c',
 	'app_dot.c',
 	'app_fetch.c',
@@ -46,6 +54,7 @@ apk_src = [
 	'app_info.c',
 	'app_list.c',
 	'app_manifest.c',
+	'app_mkndx.c',
 	'app_policy.c',
 	'app_update.c',
 	'app_upgrade.c',
@@ -85,7 +94,7 @@ apk_cargs = [
 libapk_shared = shared_library(
 	'apk',
 	libapk_src,
-	version: meson.project_version(),
+	version: libapk_so_version,
 	install: not subproject,
 	dependencies: [
 		libfetch_dep,
@@ -113,7 +122,7 @@ if not subproject
 	pkgc.generate(
 		libapk_shared,
 		name: 'apk',
-		version: meson.project_version(),
+		version: libapk_so_version,
 	)
 
 	install_headers(
-- 
cgit v1.2.3-70-g09d2