From ee867b9caf4e4dd759a8af76d8857602537a3da3 Mon Sep 17 00:00:00 2001
From: FlightlessMango <flightlessmangoyt@gmail.com>
Date: Fri, 18 Dec 2020 09:02:37 +0100
Subject: [PATCH] nanopb 0.4.4 meson wrap

---
 .gitignore              |  1 +
 meson.build             |  2 ++
 src/server/meson.build  | 18 ++----------------
 subprojects/nanopb.wrap | 11 ++++++++---
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50e3374e..ccaf9d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ lib32-mangohud*.tar.*
 # subprojects
 subprojects/packagecache/
 subprojects/Vulkan-Headers-*/
+subprojects/nanopb-*/
 
 #GNU Global Metadata
 **/GPATH
diff --git a/meson.build b/meson.build
index 42808573..a68ef93f 100644
--- a/meson.build
+++ b/meson.build
@@ -218,6 +218,8 @@ endif
 
 dearimgui_sp = subproject('dearimgui')
 dearimgui_dep = dearimgui_sp.get_variable('dearimgui_dep')
+nanopb_sp = subproject('nanopb')
+nanopb_dep = nanopb_sp.get_variable('nanopb_dep')
 
 if ['windows', 'mingw'].contains(host_machine.system())
   subdir('modules/minhook')
diff --git a/src/server/meson.build b/src/server/meson.build
index e716349a..93c6a8a4 100644
--- a/src/server/meson.build
+++ b/src/server/meson.build
@@ -1,19 +1,5 @@
-cmake = import('cmake')
-
-nanopb = dependency('nanopb', version : '>=0.4.2', method : 'cmake', modules : ['nanopb::protobuf-nanopb-static'], required : false)
+nanopb = dependency('nanopb', version : '>=0.4.2', modules : ['nanopb::protobuf-nanopb-static'], required : false)
 must_regenerate_pb = nanopb.found()
-if not nanopb.found()
-	opt_var = cmake.subproject_options()
-	opt_var.add_cmake_defines({
-		#'-DCMAKE_C_COMPILER=' + ,
-		'nanopb_BUILD_GENERATOR': true,
-		'BUILD_SHARED_LIBS': false,
-		'CMAKE_C_FLAGS': '-DPB_ENABLE_MALLOC',
-		'CMAKE_POSITION_INDEPENDENT_CODE': true,
-	})
-	nanopb_proj = cmake.subproject('nanopb', options: opt_var)
-	nanopb = nanopb_proj.dependency('protobuf-nanopb-static')
-endif
 
 rpc_common_sources = files('common.c')
 
@@ -46,7 +32,7 @@ rpc_common = static_library(
     pre_args,
   ],
   dependencies : [
-    nanopb,
+    nanopb_dep,
   ],
   #link_args : ['-lprotobuf-nanopb'],
 )
diff --git a/subprojects/nanopb.wrap b/subprojects/nanopb.wrap
index b36adf60..afc43119 100644
--- a/subprojects/nanopb.wrap
+++ b/subprojects/nanopb.wrap
@@ -1,4 +1,9 @@
-[wrap-git]
-directory = nanopb
-url = https://github.com/nanopb/nanopb
+[wrap-file]
+directory = nanopb-0.4.4
+source_url = https://github.com/nanopb/nanopb/archive/0.4.4.tar.gz
+source_filename = 0.4.4.tar.gz
+source_hash = 66621e896c1e357d21b4e5bcc87584afd95abe18ea7a3314ce2696048ab340db
 revision = 0.4.4
+patch_url = https://flightlessmango.com/wraps/nanopb.zip
+patch_filename = nanopb.zip
+patch_hash = 88a0006fdce7cf452e395c0f246e6cbfda497d62cd65eeaa3d90b2243e43be02
\ No newline at end of file