updated to webfuse v0.3.0

.travis.yml

@@ -38,19 +38,6 @@ env:
 
 before_install:
     - sudo pip3 install --system meson
-    - mkdir .deps
-    - cd .deps
-    - wget https://github.com/warmcat/libwebsockets/archive/v3.2.0.tar.gz -O libwebsockets.tar.gz
-    - tar -xf libwebsockets.tar.gz
-    - cd libwebsockets-3.2.0
-    - mkdir .build
-    - cd .build
-    - cmake ..
-    - make
-    - sudo make install
-    - cd ..
-    - cd ..
-    - cd ..
 
 before_script:
     - meson build

meson.build

@@ -4,7 +4,13 @@ openssl_dep = dependency('openssl', version: '>=1.1.1')
 libconfig_dep = dependency('libconfig', version: '>=1.5')
 pam_dep = declare_dependency(link_args: ['-lpam'])
 
-libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.1') 
+libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.13', required: false)
+if not libwebsockets_dep.found()
+    cmake = import('cmake')
+    libwebsockets = cmake.subproject('libwebsockets')
+    libwebsockets_dep = libwebsockets.dependency('websockets_shared')
+endif
+
 jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep'])
 libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
 gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep']) 

subprojects/libwebsockets.wrap

@@ -0,0 +1,6 @@
+[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

subprojects/webfuse.wrap

@@ -1,7 +1,7 @@
 [wrap-file]
-directory = webfuse-meson_build
+directory = webfuse-0.3.0
 
-source_url = https://github.com/falk-werner/webfuse/archive/meson_build.tar.gz
+source_url = https://github.com/falk-werner/webfuse/archive/v0.3.0.tar.gz
-source_filename = meson_build.tar.gz
+source_filename = v0.3.0.tar.gz
-source_hash = 8bd4e07d0ff67f77c6465617986a2e698b4c1d6cd0abb66f6056fb9be2a29453
+source_hash = 3c0c0755be24f36cac563582b931f2fc1ba8e7a87bd240e8fefd4252cc2a10a4