Update function2 wrap to 4.2.0 and patch_directory

And switch to wrap-git.

CHANGELOG.md

@@ -33,6 +33,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
   receives timer events while doing offline audio processing, so we now prevent
   that from happening.
 
+### Packaging notes
+
+- The function2 wrap dependency was updated to version 4.2.0.
+
 ## [3.6.0] - 2021-10-15
 
 ### Added

meson.build

@@ -228,7 +228,7 @@ boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost)
 # TODO: Meson doesn't have a way to define version ranges, does it? Like
 #       `^>=5.2.0`, `>=5.2.0 && <6.0.0` or `5.2.*`.
 bitsery_dep = dependency('bitsery', version : '>=5.2.0', fallback : ['bitsery', 'bitsery_dep'])
-function2_dep = dependency('function2', version : '>=4.1.0', fallback : ['function2', 'function2_dep'])
+function2_dep = dependency('function2', version : '>=4.2.0', fallback : ['function2', 'function2_dep'])
 threads_dep = dependency('threads')
 tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.1.0', fallback : ['tomlplusplus', 'tomlplusplus_dep'])
 

subprojects/.gitignore

@@ -3,3 +3,6 @@
 # The above pattern doesn't match submodules
 /tomlplusplus
 /vst3
+
+# And we obviously don't want to ignore our overlays
+!/function2-patch/*

subprojects/function2-patch/meson.build

@@ -0,0 +1,3 @@
+project('function2', 'cpp', version : '4.2.0')
+
+function2_dep = declare_dependency(include_directories : include_directories('include'))

subprojects/function2.wrap

@@ -1,11 +1,7 @@
-[wrap-file]
+[wrap-git]
-directory = function2-4.1.0
+url = https://github.com/Naios/function2.git
+# Tag 4.2.0
+revision = 02ca99831de59c7c3a4b834789260253cace0ced
+depth = 1
 
-source_url = https://github.com/Naios/function2/archive/4.1.0.tar.gz
+patch_directory = subprojects/function2-patch
-source_filename = function2-4.1.0.tar.gz
-source_hash = c3aaeaf93bf90c0f4505a18f1094b51fe28881ce202c3bf78ec4efb336c51981
-
-# TODO: Meson 0.55 added patch_directory, so we can just use that instead
-patch_url = file:./subprojects/function2-patch-4.1.0.tar.xz
-patch_filename = function2-patch-4.1.0.tar.xz
-patch_hash = 4b966afd862413ea1f3d96484e74401992ec958f1ee2b4cc161f3cb7c36fe7ba