From 6a5c473653f03aee818d835b53ca30b62a3be6c7 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 12 May 2020 17:11:53 -0400
Subject: meson using subproject directory, not dub directly

- will not work until meson.build files in
  - d2sqlite3
  - imageformats
  (request adding upstream)
  - dyaml and its dependency tinyendian already
    provide their meson.build
  (should probably revert to meson dub until
  resolved)
- based on 1468425 meson build (no issue now with
  imagefomats using 7.0.2)
---
 subprojects/README                   | 22 +++++++++++++++++
 subprojects/d2sqlite3.meson.build    | 48 ++++++++++++++++++++++++++++++++++++
 subprojects/d2sqlite3.wrap           |  4 +++
 subprojects/dyaml.wrap               |  4 +++
 subprojects/imageformats.meson.build | 40 ++++++++++++++++++++++++++++++
 subprojects/imageformats.wrap        |  4 +++
 subprojects/tinyendian.wrap          |  4 +++
 7 files changed, 126 insertions(+)
 create mode 100644 subprojects/README
 create mode 100644 subprojects/d2sqlite3.meson.build
 create mode 100644 subprojects/d2sqlite3.wrap
 create mode 100644 subprojects/dyaml.wrap
 create mode 100644 subprojects/imageformats.meson.build
 create mode 100644 subprojects/imageformats.wrap
 create mode 100644 subprojects/tinyendian.wrap

(limited to 'subprojects')

diff --git a/subprojects/README b/subprojects/README
new file mode 100644
index 0000000..c4d9dcc
--- /dev/null
+++ b/subprojects/README
@@ -0,0 +1,22 @@
+- d2sqlite3
+  - dub
+    - https://code.dlang.org/packages/d2sqlite3
+  - upstream
+    - https://github.com/biozic/d2sqlite3
+- dyaml
+  - dub
+    - https://code.dlang.org/packages/dyaml
+  - upstream
+    - https://github.com/dlang-community/D-YAML
+  - upstream git clone
+    - https://github.com/dlang-community/D-YAML.git
+- imageformats
+  - dub
+    - https://code.dlang.org/packages/imageformats
+  - upstream git clone
+    - https://github.com/lgvz/imageformats
+- tinyendian (dyaml dependency)
+  - dub
+    - http://code.dlang.org/packages/tinyendian
+  - upstream git clone
+    - https://github.com/dlang-community/tinyendian.git
diff --git a/subprojects/d2sqlite3.meson.build b/subprojects/d2sqlite3.meson.build
new file mode 100644
index 0000000..1685738
--- /dev/null
+++ b/subprojects/d2sqlite3.meson.build
@@ -0,0 +1,48 @@
+project('d2sqlite3', 'd',
+  meson_version: '>=0.46',
+  license: 'BSL-1.0',
+  version: '0.18.3'
+)
+
+project_soversion = '0'
+
+src_dir = include_directories('source/')
+pkgc = import('pkgconfig')
+
+sqlite_dep = dependency('sqlite3')
+
+d2sqlite3_src = [
+  'source/d2sqlite3/database.d',
+  'source/d2sqlite3/internal/memory.d',
+  'source/d2sqlite3/internal/util.d',
+  'source/d2sqlite3/library.d',
+  'source/d2sqlite3/package.d',
+  'source/d2sqlite3/results.d',
+  'source/d2sqlite3/sqlite3.d',
+  'source/d2sqlite3/statement.d',
+]
+install_subdir('source/d2sqlite3/', install_dir: 'include/d/d2sqlite3/')
+
+d2sqlite3_lib = library('d2sqlite3',
+  [d2sqlite3_src],
+  include_directories: [src_dir],
+  dependencies: [sqlite_dep],
+  install: true,
+  version: meson.project_version(),
+  soversion: project_soversion
+)
+
+pkgc.generate(name: 'd2sqlite3',
+  libraries: d2sqlite3_lib,
+  subdirs: 'd/d2sqlite3/',
+  version: meson.project_version(),
+  requires: ['sqlite3'],
+  description: 'A small wrapper around SQLite for the D programming language.'
+)
+
+# for use by others which embed this as subproject
+d2sqlite3_dep = declare_dependency(
+  link_with: [d2sqlite3_lib],
+  dependencies: [sqlite_dep],
+  include_directories: [src_dir]
+)
diff --git a/subprojects/d2sqlite3.wrap b/subprojects/d2sqlite3.wrap
new file mode 100644
index 0000000..78643b5
--- /dev/null
+++ b/subprojects/d2sqlite3.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = d2sqlite3
+url       = https://github.com/biozic/d2sqlite3.git
+revision  = head
diff --git a/subprojects/dyaml.wrap b/subprojects/dyaml.wrap
new file mode 100644
index 0000000..8b3f503
--- /dev/null
+++ b/subprojects/dyaml.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = dyaml
+url       = https://github.com/dlang-community/D-YAML.git
+revision  = head
diff --git a/subprojects/imageformats.meson.build b/subprojects/imageformats.meson.build
new file mode 100644
index 0000000..7c05434
--- /dev/null
+++ b/subprojects/imageformats.meson.build
@@ -0,0 +1,40 @@
+project('imageformats', 'd',
+  meson_version: '>=0.46',
+  license: 'BSL-1.0',
+  version: '7.0.2'
+)
+
+project_soversion = '0'
+
+src_dir = include_directories('.')
+pkgc = import('pkgconfig')
+
+imageformats_src = [
+  'imageformats/bmp.d',
+  'imageformats/jpeg.d',
+  'imageformats/package.d',
+  'imageformats/png.d',
+  'imageformats/tga.d'
+]
+install_subdir('imageformats/', install_dir: 'include/d/imageformats-d/')
+
+imageformats_lib = library('imageformats-d',
+  [imageformats_src],
+  include_directories: [src_dir],
+  install: true,
+  version: meson.project_version(),
+  soversion: project_soversion
+)
+
+pkgc.generate(name: 'imageformats-d',
+  libraries: imageformats_lib,
+  subdirs: 'd/imageformats-d/',
+  version: meson.project_version(),
+  description: 'Decoders for PNG, TGA, BMP, JPEG and encoders for PNG, TGA, BMP.'
+)
+
+# for use by others which embed this as subproject
+imageformats_dep = declare_dependency(
+    link_with: [imageformats_lib],
+    include_directories: [src_dir]
+)
diff --git a/subprojects/imageformats.wrap b/subprojects/imageformats.wrap
new file mode 100644
index 0000000..09f342c
--- /dev/null
+++ b/subprojects/imageformats.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = imageformats
+url       = https://github.com/lgvz/imageformats.git
+revision  = head
diff --git a/subprojects/tinyendian.wrap b/subprojects/tinyendian.wrap
new file mode 100644
index 0000000..331a753
--- /dev/null
+++ b/subprojects/tinyendian.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = tinyendian
+url       = https://github.com/dlang-community/tinyendian.git
+revision  = head
-- 
cgit v1.2.3