meson using dubdoc-reform_v0.9.2

- the good
  - works
  - project looks pretty clean
- the bad
  - subprojects built externally
  - not suitable for debian packaging

11 files changed, 127 insertions, 334 deletions

diff --git a/.gitignore b/.gitignore
index a3a6702..65910b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,14 +32,6 @@
 !*.ssm
 !**/*.sst
 !**/*.ssm
-!subprojects
-!subprojects/*.wrap
-!subprojects/*.meson.build
-# !subprojects/dyaml
-# !subprojects/d2sqlite3
-# !subprojects/imageformats
-# !subprojects/tinyendian
-subprojects/*/.gitignore
 !pod.manifest
 !sisu_document_make
 !config_local_site
diff --git a/makefile b/makefile
index 9489c0f..8b23e43 100644
--- a/makefile
+++ b/makefile
@@ -93,31 +93,13 @@ all_ver: dmd_ver ldc_ver gdc_ver
 all_debug: dmd_debug gdc_debug ldc_debug
 meson_clean_build_dir:
 	rm -r build; mkdir build
-meson_get_subprojects: meson_clean_build_dir
-	rm -rf subprojects/d2sqlite3; rm -rf subprojects/imageformats
-	rm -rf subprojects/dyaml; rm -rf subprojects/tinyendian
-	git clone https://github.com/biozic/d2sqlite3.git subprojects/d2sqlite3
-	git clone https://github.com/lgvz/imageformats.git subprojects/imageformats
-	cd subprojects/d2sqlite3; \
-	git checkout -b add_meson_build_patch; \
-	cp ../d2sqlite3.meson.build meson.build; \
-	git add . ; git commit -m"project meson.build added"; \
-	cd ../..
-	cd subprojects/imageformats; \
-	git checkout -b add_meson_build_patch; \
-	cp ../imageformats.meson.build meson.build; \
-	git add . ; git commit -m"project meson.build added"; \
-	cd ../..
-mesonclean: clean skel tangle dub_upgrade
-	meson --buildtype=debugoptimized build
-	ninja -C build
 meson_build: meson_clean_build_dir
 	meson --buildtype=debugoptimized build
 	ninja -C build
 	notify-send -t 0 'D meson build ldc compiled test release executable ready' 'spine'
-meson_upgrade: dub_upgrade meson_get_subprojects
-meson_upgrade_and_build: dub_upgrade meson_get_subprojects meson_clean_build_dir meson_build
-meson: meson_clean_build_dir meson_build
+meson_redo: meson_clean_build_dir meson_build
+meson_project_build_clean: clean skel tangle dub_upgrade meson_build
+meson: meson_clean_build_dir dub_upgrade meson_build
 all_clean: clean tangle dmd ldc gdc
 all_ver_clean: clean tangle dmd_ver ldc_ver gdc_ver
 all_debug_ver: dmd_debug_ver gdc_debug_ver ldc_debug_ver
@@ -178,7 +160,6 @@ skel:
 	mkdir -p $(PRG_BINDIR); \
 	mkdir -p $(PRG_BINDIR)-archive; \
 	mkdir -p build; \
-	mkdir -p subprojects; \
 	mkdir -p views; \
 	mkdir -p data; \
 	mkdir -p util; \
@@ -192,7 +173,6 @@ skel:
 init: skel
 clean:
 	rm -rf build; \
-	rm -rf subprojects; \
 	rm -rf $(PRG_SRCDIR); \
 	rm -rf $(PRG_DOCDIR);
 clean_bin:
@@ -204,7 +184,6 @@ clean_docs:
 expunge:
 	rm -f dub.selections.json; \
 	rm -rf build; \
-	rm -rf subprojects; \
 	rm -rf $(PRG_SRCDIR); \
 	rm -rf $(PRG_BINDIR); \
 	rm -rf $(PRG_DOCDIR);
diff --git a/meson.build b/meson.build
index b483de4..c8300ff 100644
--- a/meson.build
+++ b/meson.build
@@ -49,15 +49,17 @@ spine_sources = [
 source_root = meson.source_root()
 sources_dir = include_directories('src/')
 # Dependencies
-dep_dyaml        = dependency('dyaml',          version: '>= 0.8.0',  fallback: ['dyaml',          'dyaml_dep'])
-dep_d2sqlite3    = dependency('d2sqlite3',      version: '>= 0.18.3', fallback: ['d2sqlite3',      'd2sqlite3_dep'])
-dep_imageformats = dependency('imageformats',   version: '>= 7.0.2',  fallback: ['imageformats',   'imageformats_dep'])
+dep_tinyendian   = dependency('tinyendian',   version: '>= 0.2.0',  fallback: ['tinyendian',   'tinyendian_dep'],   method: 'dub')
+dep_dyaml        = dependency('dyaml',        version: '>= 0.8.0',  fallback: ['dyaml',        'dyaml_dep'],        method: 'dub')
+dep_d2sqlite3    = dependency('d2sqlite3',    version: '>= 0.18.3', fallback: ['d2sqlite3',    'd2sqlite3_dep'],    method: 'dub')
+dep_imageformats = dependency('imageformats', version: '>= 7.0.2',  fallback: ['imageformats', 'imageformats_dep'], method: 'dub')
 # Executable
 spine_exe = executable('spine',
   [spine_sources],
   include_directories : [sources_dir],
   d_import_dirs: [include_directories('views')],
   dependencies : [
+    dep_tinyendian,
     dep_dyaml,
     dep_d2sqlite3,
     dep_imageformats,
diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index e594fe0..863dd25 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -200,37 +200,20 @@ all_debug: dmd_debug gdc_debug ldc_debug
 
 ******** _meson_ build                                           :meson:
 
-- bug in build of imageformats > v7.0.0 (currently at 7.0.2)
-  (try fix meson/ninja/ld.gold for imageformats HEAD)
+meson using dub
+- works & looks pretty clean
+- but subprojects built externally & not suitable for debian packaging
 
 #+BEGIN_SRC makefile :tangle ../makefile
 meson_clean_build_dir:
 	rm -r build; mkdir build
-meson_get_subprojects: meson_clean_build_dir
-	rm -rf subprojects/d2sqlite3; rm -rf subprojects/imageformats
-	rm -rf subprojects/dyaml; rm -rf subprojects/tinyendian
-	git clone https://github.com/biozic/d2sqlite3.git subprojects/d2sqlite3
-	git clone https://github.com/lgvz/imageformats.git subprojects/imageformats
-	cd subprojects/d2sqlite3; \
-	git checkout -b add_meson_build_patch; \
-	cp ../d2sqlite3.meson.build meson.build; \
-	git add . ; git commit -m"project meson.build added"; \
-	cd ../..
-	cd subprojects/imageformats; \
-	git checkout -b add_meson_build_patch; \
-	cp ../imageformats.meson.build meson.build; \
-	git add . ; git commit -m"project meson.build added"; \
-	cd ../..
-mesonclean: clean skel tangle dub_upgrade
-	meson --buildtype=debugoptimized build
-	ninja -C build
 meson_build: meson_clean_build_dir
 	meson --buildtype=debugoptimized build
 	ninja -C build
 	notify-send -t 0 'D meson build ldc compiled test release executable ready' 'spine'
-meson_upgrade: dub_upgrade meson_get_subprojects
-meson_upgrade_and_build: dub_upgrade meson_get_subprojects meson_clean_build_dir meson_build
-meson: meson_clean_build_dir meson_build
+meson_redo: meson_clean_build_dir meson_build
+meson_project_build_clean: clean skel tangle dub_upgrade meson_build
+meson: meson_clean_build_dir dub_upgrade meson_build
 #+END_SRC
 
 ******* clean & tangle                                   :clean:tangle:
@@ -386,7 +369,6 @@ skel:
 	mkdir -p $(PRG_BINDIR); \
 	mkdir -p $(PRG_BINDIR)-archive; \
 	mkdir -p build; \
-	mkdir -p subprojects; \
 	mkdir -p views; \
 	mkdir -p data; \
 	mkdir -p util; \
@@ -400,7 +382,6 @@ skel:
 init: skel
 clean:
 	rm -rf build; \
-	rm -rf subprojects; \
 	rm -rf $(PRG_SRCDIR); \
 	rm -rf $(PRG_DOCDIR);
 clean_bin:
@@ -412,7 +393,6 @@ clean_docs:
 expunge:
 	rm -f dub.selections.json; \
 	rm -rf build; \
-	rm -rf subprojects; \
 	rm -rf $(PRG_SRCDIR); \
 	rm -rf $(PRG_BINDIR); \
 	rm -rf $(PRG_DOCDIR);
@@ -1086,15 +1066,17 @@ spine_sources = [
 source_root = meson.source_root()
 sources_dir = include_directories('src/')
 # Dependencies
-dep_dyaml        = dependency('dyaml',          version: '>= 0.8.0',  fallback: ['dyaml',          'dyaml_dep'])
-dep_d2sqlite3    = dependency('d2sqlite3',      version: '>= 0.18.3', fallback: ['d2sqlite3',      'd2sqlite3_dep'])
-dep_imageformats = dependency('imageformats',   version: '>= 7.0.2',  fallback: ['imageformats',   'imageformats_dep'])
+dep_tinyendian   = dependency('tinyendian',   version: '>= 0.2.0',  fallback: ['tinyendian',   'tinyendian_dep'],   method: 'dub')
+dep_dyaml        = dependency('dyaml',        version: '>= 0.8.0',  fallback: ['dyaml',        'dyaml_dep'],        method: 'dub')
+dep_d2sqlite3    = dependency('d2sqlite3',    version: '>= 0.18.3', fallback: ['d2sqlite3',    'd2sqlite3_dep'],    method: 'dub')
+dep_imageformats = dependency('imageformats', version: '>= 7.0.2',  fallback: ['imageformats', 'imageformats_dep'], method: 'dub')
 # Executable
 spine_exe = executable('spine',
   [spine_sources],
   include_directories : [sources_dir],
   d_import_dirs: [include_directories('views')],
   dependencies : [
+    dep_tinyendian,
     dep_dyaml,
     dep_d2sqlite3,
     dep_imageformats,
@@ -1105,7 +1087,7 @@ spine_exe = executable('spine',
 
 ** subprojects
 
-#+BEGIN_SRC txt :tangle ../subprojects/README
+#+BEGIN_SRC txt :NO-tangle ../subprojects/README
 - d2sqlite3
   - dub
     - https://code.dlang.org/packages/d2sqlite3
@@ -1130,6 +1112,110 @@ spine_exe = executable('spine',
     - https://github.com/dlang-community/tinyendian.git
 #+END_SRC
 
+* .gitignore                                                      :gitignore:
+
+#+BEGIN_SRC sh :tangle ../.gitignore
+# git ls-files --others --exclude-from=.git/info/exclude
+#./.dub/**
+*
+!.gitignore
+!COPYRIGHT
+!README
+!makefile
+!version.txt
+!dub.json
+!dub.sdl
+!meson.build
+!tangle
+!*.org
+!*.d
+!*.rb
+!conf.sdl
+!org
+!util
+!src
+!src/doc_reform
+!src/doc_reform/*
+!src_yaml
+!src_yaml/doc_reform
+!src_yaml/doc_reform/*
+!data
+!data/*
+!data/src/**
+!data/src_yaml/**
+!data/pod/**
+!data/pod_yaml/**
+!*.sst
+!*.ssm
+!**/*.sst
+!**/*.ssm
+!pod.manifest
+!sisu_document_make
+!config_local_site
+!sisudoc
+!views
+!docs/*.html
+!notes
+notes/**
+!notes/*.org
+!notes/sisu-description.sst
+!notes/reminders
+!notes/reminders/**
+.dub/**
+tmp/**
+*_.org
+*_.d
+*_.txt
+*_
+*~
+\#*
+*.\#*
+#!*/
+#*~
+#\#*
+#*.\#*
+#!debian
+#!debian/**
+#.reggae/**
+#+END_SRC
+
+* sh script to batch process _emacs org babel tangle_     :shell_script:tangle:
+  [[http://orgmode.org/manual/Batch-execution.html]]
+creates a shell batch script called "tangle", that will tangle (emacs org
+babel tangle) org files in ./org/ to create .d source files in ./src/doc_reform/
+(similar functionality is contained within the "makefile" created by this
+"dr_build_scaffold.org" file make tangle)
+
+#+BEGIN_SRC sh :tangle ../tangle :tangle-mode (identity #o755) :shebang #!/bin/sh
+# -*- mode: shell-script -*-
+# tangle files with org-mode
+DIR=`pwd`
+ORGFILES=""
+EMACSLISP=/usr/share/emacs/site-lisp
+ORG_VER_AVAILABLE=$(shell echo `ls -d ~/.emacs.d/elpa/org-???????? | cut -d '-' -f2`)
+EMACSLISP_ORG=~/.emacs.d/elpa/org-$($(shell echo $(ORG_VER_AVAILABLE)))
+ORG_CONTRIB_VER_AVAILABLE=$(shell echo `ls -d ~/.emacs.d/elpa/org-plus-???????? | cut -d '-' -f2`)
+EMACSLISP_ORG_CONTRIB=~/.emacs.d/elpa/org-plus-contrib-$($(shell echo $(ORG_CONTRIB_VER_AVAILABLE)))
+# wrap each argument in the code required to call tangle on it
+for i in $@; do
+  ORGFILES="$ORGFILES \"$i\""
+done
+emacs --batch -Q -q \
+--eval "(progn
+(add-to-list 'load-path (expand-file-name \"$EMACSLISP\"))
+(add-to-list 'load-path (expand-file-name \"$EMACSLISP_ORG\" t))
+(add-to-list 'load-path (expand-file-name \"$EMACSLISP_ORG_CONTRIB\" t))
+(require 'org)(require 'ob)(require 'ob-tangle)
+(mapc (lambda (file)
+  (find-file (expand-file-name file \"$DIR\"))
+  (setq-local org-src-preserve-indentation t)
+  (org-babel-tangle)
+  (kill-buffer)) '($ORGFILES)))" 2>&1 #|grep tangled
+#+END_SRC
+
+* __END__
+
+** meson subprojects [now taken care of using dub]
 *** d2sqlite3
 ****  wrap
 
@@ -1138,12 +1224,11 @@ spine_exe = executable('spine',
 directory = d2sqlite3
 url       = https://github.com/biozic/d2sqlite3.git
 revision  = head
-# revision  = add_meson_build_patch
 #+END_SRC
 
 ****  meson.build
 
-#+BEGIN_SRC sh :tangle ../subprojects/d2sqlite3.meson.build
+#+BEGIN_SRC sh :NO-tangle ../subprojects/d2sqlite3.meson.build
 project('d2sqlite3', 'd',
   meson_version: '>=0.46',
   license: 'BSL-1.0',
@@ -1197,7 +1282,7 @@ d2sqlite3_dep = declare_dependency(
 *** dyaml
 ****  wrap
 
-#+BEGIN_SRC sh :tangle ../subprojects/dyaml.wrap
+#+BEGIN_SRC sh :NO-tangle ../subprojects/dyaml.wrap
 [wrap-git]
 directory = dyaml
 url       = https://github.com/dlang-community/D-YAML.git
@@ -1287,12 +1372,11 @@ dyaml_dep = declare_dependency(
 directory = imageformats
 url       = https://github.com/lgvz/imageformats.git
 revision  = head
-# revision  = add_meson_build_patch
 #+END_SRC
 
 ****  meson.build
 
-#+BEGIN_SRC sh :tangle ../subprojects/imageformats.meson.build
+#+BEGIN_SRC sh :NO-tangle ../subprojects/imageformats.meson.build
 project('imageformats', 'd',
   meson_version: '>=0.46',
   license: 'BSL-1.0',
@@ -1391,116 +1475,6 @@ tinyendian_dep = declare_dependency(
 )
 #+END_SRC
 
-* .gitignore                                                      :gitignore:
-
-#+BEGIN_SRC sh :tangle ../.gitignore
-# git ls-files --others --exclude-from=.git/info/exclude
-#./.dub/**
-*
-!.gitignore
-!COPYRIGHT
-!README
-!makefile
-!version.txt
-!dub.json
-!dub.sdl
-!meson.build
-!tangle
-!*.org
-!*.d
-!*.rb
-!conf.sdl
-!org
-!util
-!src
-!src/doc_reform
-!src/doc_reform/*
-!src_yaml
-!src_yaml/doc_reform
-!src_yaml/doc_reform/*
-!data
-!data/*
-!data/src/**
-!data/src_yaml/**
-!data/pod/**
-!data/pod_yaml/**
-!*.sst
-!*.ssm
-!**/*.sst
-!**/*.ssm
-!subprojects
-!subprojects/*.wrap
-!subprojects/*.meson.build
-# !subprojects/dyaml
-# !subprojects/d2sqlite3
-# !subprojects/imageformats
-# !subprojects/tinyendian
-subprojects/*/.gitignore
-!pod.manifest
-!sisu_document_make
-!config_local_site
-!sisudoc
-!views
-!docs/*.html
-!notes
-notes/**
-!notes/*.org
-!notes/sisu-description.sst
-!notes/reminders
-!notes/reminders/**
-.dub/**
-tmp/**
-*_.org
-*_.d
-*_.txt
-*_
-*~
-\#*
-*.\#*
-#!*/
-#*~
-#\#*
-#*.\#*
-#!debian
-#!debian/**
-#.reggae/**
-#+END_SRC
-
-* sh script to batch process _emacs org babel tangle_     :shell_script:tangle:
-  [[http://orgmode.org/manual/Batch-execution.html]]
-creates a shell batch script called "tangle", that will tangle (emacs org
-babel tangle) org files in ./org/ to create .d source files in ./src/doc_reform/
-(similar functionality is contained within the "makefile" created by this
-"dr_build_scaffold.org" file make tangle)
-
-#+BEGIN_SRC sh :tangle ../tangle :tangle-mode (identity #o755) :shebang #!/bin/sh
-# -*- mode: shell-script -*-
-# tangle files with org-mode
-DIR=`pwd`
-ORGFILES=""
-EMACSLISP=/usr/share/emacs/site-lisp
-ORG_VER_AVAILABLE=$(shell echo `ls -d ~/.emacs.d/elpa/org-???????? | cut -d '-' -f2`)
-EMACSLISP_ORG=~/.emacs.d/elpa/org-$($(shell echo $(ORG_VER_AVAILABLE)))
-ORG_CONTRIB_VER_AVAILABLE=$(shell echo `ls -d ~/.emacs.d/elpa/org-plus-???????? | cut -d '-' -f2`)
-EMACSLISP_ORG_CONTRIB=~/.emacs.d/elpa/org-plus-contrib-$($(shell echo $(ORG_CONTRIB_VER_AVAILABLE)))
-# wrap each argument in the code required to call tangle on it
-for i in $@; do
-  ORGFILES="$ORGFILES \"$i\""
-done
-emacs --batch -Q -q \
---eval "(progn
-(add-to-list 'load-path (expand-file-name \"$EMACSLISP\"))
-(add-to-list 'load-path (expand-file-name \"$EMACSLISP_ORG\" t))
-(add-to-list 'load-path (expand-file-name \"$EMACSLISP_ORG_CONTRIB\" t))
-(require 'org)(require 'ob)(require 'ob-tangle)
-(mapc (lambda (file)
-  (find-file (expand-file-name file \"$DIR\"))
-  (setq-local org-src-preserve-indentation t)
-  (org-babel-tangle)
-  (kill-buffer)) '($ORGFILES)))" 2>&1 #|grep tangled
-#+END_SRC
-
-* __END__
 ** build
 *** dub
 
diff --git a/subprojects/README b/subprojects/README
deleted file mode 100644
index c4d9dcc..0000000
--- a/subprojects/README
+++ /dev/null
@@ -1,22 +0,0 @@
-- 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.dub.sdl b/subprojects/d2sqlite3.dub.sdl
deleted file mode 100644
index f2bd29f..0000000
--- a/subprojects/d2sqlite3.dub.sdl
+++ /dev/null
@@ -1,29 +0,0 @@
-name        "d2sqlite3"
-description "A thin wrapper around SQLite 3"
-homepage    "https://github.com/biozic/d2sqlite3"
-authors     "Nicolas Sicard" "Other contributors: see Github repo"
-copyright   "Copyright 2011-18 Nicolas Sicard"
-license     "BSL-1.0"
-targetType  "library"
-configuration "with-lib" {
-    systemDependencies "SQLite version >= 3.8.7"
-    libs "sqlite3"
-    excludedSourceFiles "source/tests.d"
-}
-configuration "without-lib" {
-    excludedSourceFiles "source/tests.d"
-}
-configuration "all-included" {
-    libs "sqlite3" platform="windows"
-    copyFiles "lib/win32/sqlite3.dll" "lib/win32/sqlite3.lib" platform="windows-x86"
-    copyFiles "lib/win64/sqlite3.dll" "lib/win64/sqlite3.lib" platform="windows-x86_64"
-    preBuildCommands "make -C $PACKAGE_DIR -f sqlite3.mak" platform="posix"
-    sourceFiles "sqlite3.o" platform="posix"
-    libs "dl" platform="linux-gdc"
-    excludedSourceFiles "source/tests.d"
-}
-configuration "travis" {
-    preBuildCommands "make -C $PACKAGE_DIR -f sqlite3.mak" platform="posix"
-    sourceFiles "sqlite3.o" platform="posix"
-    versions "SqliteEnableColumnMetadata" "SqliteEnableUnlockNotify"
-}
diff --git a/subprojects/d2sqlite3.meson.build b/subprojects/d2sqlite3.meson.build
deleted file mode 100644
index 1685738..0000000
--- a/subprojects/d2sqlite3.meson.build
+++ /dev/null
@@ -1,48 +0,0 @@
-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/dyaml.wrap b/subprojects/dyaml.wrap
deleted file mode 100644
index 8b3f503..0000000
--- a/subprojects/dyaml.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-directory = dyaml
-url       = https://github.com/dlang-community/D-YAML.git
-revision  = head
diff --git a/subprojects/imageformats.dub.sdl b/subprojects/imageformats.dub.sdl
deleted file mode 100644
index 2814286..0000000
--- a/subprojects/imageformats.dub.sdl
+++ /dev/null
@@ -1,7 +0,0 @@
-name "imageformats"
-description "Decoders for PNG, TGA, BMP, JPEG and encoders for PNG, TGA, BMP."
-authors "Tero Hänninen"
-license "BSL-1.0"
-targetName "imageformats"
-sourcePaths "imageformats"
-importPaths "."
diff --git a/subprojects/imageformats.meson.build b/subprojects/imageformats.meson.build
deleted file mode 100644
index 7c05434..0000000
--- a/subprojects/imageformats.meson.build
+++ /dev/null
@@ -1,40 +0,0 @@
-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/tinyendian.wrap b/subprojects/tinyendian.wrap
deleted file mode 100644
index 331a753..0000000
--- a/subprojects/tinyendian.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-directory = tinyendian
-url       = https://github.com/dlang-community/tinyendian.git
-revision  = head