From 9487b3c2d447397167457f6cc4d9af190e0319a8 Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Wed, 14 Oct 2020 21:25:22 +0200
Subject: [PATCH] removed subprojects

---
 deps.sh                        | 14 +++++++++++++-
 meson.build                    |  3 +--
 subprojects/fuse3.wrap         |  7 -------
 subprojects/gtest.wrap         | 10 ----------
 subprojects/jansson.wrap       | 10 ----------
 subprojects/libwebsockets.wrap |  6 ------
 subprojects/webfuse.wrap       |  7 -------
 7 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 subprojects/fuse3.wrap
 delete mode 100644 subprojects/gtest.wrap
 delete mode 100644 subprojects/jansson.wrap
 delete mode 100644 subprojects/libwebsockets.wrap
 delete mode 100644 subprojects/webfuse.wrap

diff --git a/deps.sh b/deps.sh
index ffc5298..4b709d1 100644
--- a/deps.sh
+++ b/deps.sh
@@ -1,4 +1,4 @@
-PACKAGES="libfuse lws jansson"
+PACKAGES="libfuse lws jansson gtest webfuse"
 
 libfuse_VERSION=3.9.1
 libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz
@@ -17,3 +17,15 @@ jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.g
 jansson_MD5=c4b106528d5ffb521178565de1ba950d
 jansson_DIR=jansson-${jansson_VERSION}
 jansson_TYPE=cmake
+
+gtest_VERSION=1.10.0
+gtest_URL=https://github.com/google/googletest/archive/release-${1.10.0}.tar.gz
+gtest_md5=ecd1fa65e7de707cd5c00bdac56022cd
+gtest_DIR=googletest-release-${1.10.0}
+gtest_TYPE=cmake
+
+webfuse_VERSION=0.5.0
+webfuse_URL=https://github.com/falk-werner/webfuse/archive/v${webfuse_VERSION}.tar.gz
+webfuse_MD5=535c9f261c90c109a138daa3ee9f95ba
+webfuse_DIR=webfuse-${webfuse_VERSION}
+webfuse_TYPE=meson
diff --git a/meson.build b/meson.build
index 8dc0a25..2bdfb7c 100644
--- a/meson.build
+++ b/meson.build
@@ -12,8 +12,7 @@ libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0')
 jansson_dep = dependency('jansson', version: '>=2.11')
 libfuse_dep = dependency('fuse3', version: '>=3.8.0')
 
-webfuse_adapter_dep = dependency('webfuse', version: '>=0.5.0', 
-    fallback: ['webfuse', 'webfuse_dep'], default_options: ['without_tests=true'])
+webfuse_adapter_dep = dependency('webfuse', version: '>=0.5.0')
 
 inc_dir = include_directories('src')
 
diff --git a/subprojects/fuse3.wrap b/subprojects/fuse3.wrap
deleted file mode 100644
index 2861f7c..0000000
--- a/subprojects/fuse3.wrap
+++ /dev/null
@@ -1,7 +0,0 @@
-[wrap-file]
-directory = libfuse-fuse-3.9.1
-
-source_url = https://github.com/libfuse/libfuse/archive/fuse-3.9.1.tar.gz
-source_filename = fuse-3.9.1.tar.gz
-source_hash = 4f3dea4979c30fbd85f46b8812bee5945bd6bb4487165eb01ecde57bbfbb332f
-
diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap
deleted file mode 100644
index d52b0b3..0000000
--- a/subprojects/gtest.wrap
+++ /dev/null
@@ -1,10 +0,0 @@
-[wrap-file]
-directory = googletest-release-1.10.0
-
-source_url = https://github.com/google/googletest/archive/release-1.10.0.zip
-source_filename = gtest-1.10.0.zip
-source_hash = 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/gtest/1.10.0/1/get_zip
-patch_filename = gtest-1.10.0-1-wrap.zip
-patch_hash = 04ff14e8880e4e465f6260221e9dfd56fea6bc7cce4c4aff0dc528e4a2c8f514
\ No newline at end of file
diff --git a/subprojects/jansson.wrap b/subprojects/jansson.wrap
deleted file mode 100644
index 6282afd..0000000
--- a/subprojects/jansson.wrap
+++ /dev/null
@@ -1,10 +0,0 @@
-[wrap-file]
-directory = jansson-2.11
-
-source_url = http://www.digip.org/jansson/releases/jansson-2.11.tar.bz2
-source_filename = jansson-2.11.tar.bz2
-source_hash = 783132e2fc970feefc2fa54199ef65ee020bd8e0e991a78ea44b8586353a0947
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/jansson/2.11/3/get_zip
-patch_filename = jansson-2.11-3-wrap.zip
-patch_hash = 0bcac510994890048d42658c674e33dd7d88715fc1e3bf49d10012f57b0e0020
\ No newline at end of file
diff --git a/subprojects/libwebsockets.wrap b/subprojects/libwebsockets.wrap
deleted file mode 100644
index f1aa3ee..0000000
--- a/subprojects/libwebsockets.wrap
+++ /dev/null
@@ -1,6 +0,0 @@
-[wrap-file]
-directory = libwebsockets-4.0.13
-
-source_url = https://github.com/warmcat/libwebsockets/archive/v4.0.13.zip
-source_filename = v4.0.13.zip
-source_hash = 0914ea3fdec496daf6b6a5c00f7ba1b52eb8cc3d55b66685df92920b232fd7a5
\ No newline at end of file
diff --git a/subprojects/webfuse.wrap b/subprojects/webfuse.wrap
deleted file mode 100644
index 1c26202..0000000
--- a/subprojects/webfuse.wrap
+++ /dev/null
@@ -1,7 +0,0 @@
-[wrap-file]
-directory = webfuse-0.5.0
-
-source_url = https://github.com/falk-werner/webfuse/archive/v0.5.0.tar.gz
-source_filename = webfuse-0.5.0.tar.gz
-source_hash = 3a84aabab55dc4ca270a644b2c35704e31bcfbc3b42d40b673ab4071baf4c1fd
-