From f54966780802137d8668bc460174b895b77e9b3d Mon Sep 17 00:00:00 2001
From: Christopher Degawa <ccom@randomderp.com>
Date: Wed, 16 Dec 2020 04:32:10 +0000
Subject: [PATCH] meson: fix external builds with built_in_models

fixes #752

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---
 libvmaf/src/meson.build |  6 +++++-
 libvmaf/src/model.c     | 48 ++++++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/libvmaf/src/meson.build b/libvmaf/src/meson.build
index 3b8dd8333..11e8d8a31 100644
--- a/libvmaf/src/meson.build
+++ b/libvmaf/src/meson.build
@@ -122,7 +122,11 @@ if built_in_models_enabled
             json_model_c_sources += custom_target(
                   model_file,
                   output : '@PLAINNAME@.c',
-                  input : model_dir + model_file,
+                  input : configure_file(
+                    input : model_dir + model_file,
+                    output : model_file,
+                    copy: true
+                  ),
                   command : [xxd, '--include', '@INPUT@', '@OUTPUT@'],
             )
         endforeach
diff --git a/libvmaf/src/model.c b/libvmaf/src/model.c
index 933020011..293916e49 100644
--- a/libvmaf/src/model.c
+++ b/libvmaf/src/model.c
@@ -21,19 +21,19 @@ typedef struct VmafBuiltInModel {
 
 #if VMAF_BUILT_IN_MODELS
 #if VMAF_FLOAT_FEATURES
-extern const char ___src_______model_vmaf_float_v0_6_1neg_json;
-extern const int ___src_______model_vmaf_float_v0_6_1neg_json_len;
-extern const char ___src_______model_vmaf_float_v0_6_1_json;
-extern const int ___src_______model_vmaf_float_v0_6_1_json_len;
-extern const char ___src_______model_vmaf_float_b_v0_6_3_json;
-extern const int ___src_______model_vmaf_float_b_v0_6_3_json_len;
+extern const char src_vmaf_float_v0_6_1neg_json;
+extern const int src_vmaf_float_v0_6_1neg_json_len;
+extern const char src_vmaf_float_v0_6_1_json;
+extern const int src_vmaf_float_v0_6_1_json_len;
+extern const char src_vmaf_float_b_v0_6_3_json;
+extern const int src_vmaf_float_b_v0_6_3_json_len;
 #endif
-extern const char ___src_______model_vmaf_v0_6_1_json;
-extern const int ___src_______model_vmaf_v0_6_1_json_len;
-extern const char ___src_______model_vmaf_b_v0_6_3_json;
-extern const int ___src_______model_vmaf_b_v0_6_3_json_len;
-extern const char ___src_______model_vmaf_v0_6_1neg_json;
-extern const int ___src_______model_vmaf_v0_6_1neg_json_len;
+extern const char src_vmaf_v0_6_1_json;
+extern const int src_vmaf_v0_6_1_json_len;
+extern const char src_vmaf_b_v0_6_3_json;
+extern const int src_vmaf_b_v0_6_3_json_len;
+extern const char src_vmaf_v0_6_1neg_json;
+extern const int src_vmaf_v0_6_1neg_json_len;
 #endif
 
 static const VmafBuiltInModel built_in_models[] = {
@@ -41,34 +41,34 @@ static const VmafBuiltInModel built_in_models[] = {
 #if VMAF_FLOAT_FEATURES
     {
         .version = "vmaf_float_v0.6.1neg",
-        .data = &___src_______model_vmaf_float_v0_6_1neg_json,
-        .data_len = &___src_______model_vmaf_float_v0_6_1neg_json_len,
+        .data = &src_vmaf_float_v0_6_1neg_json,
+        .data_len = &src_vmaf_float_v0_6_1neg_json_len,
     },
     {
         .version = "vmaf_float_v0.6.1",
-        .data = &___src_______model_vmaf_float_v0_6_1_json,
-        .data_len = &___src_______model_vmaf_float_v0_6_1_json_len,
+        .data = &src_vmaf_float_v0_6_1_json,
+        .data_len = &src_vmaf_float_v0_6_1_json_len,
     },
     {
         .version = "vmaf_float_b_v0.6.3",
-        .data = &___src_______model_vmaf_float_b_v0_6_3_json,
-        .data_len = &___src_______model_vmaf_float_b_v0_6_3_json_len,
+        .data = &src_vmaf_float_b_v0_6_3_json,
+        .data_len = &src_vmaf_float_b_v0_6_3_json_len,
     },
 #endif
     {
         .version = "vmaf_v0.6.1",
-        .data = &___src_______model_vmaf_v0_6_1_json,
-        .data_len = &___src_______model_vmaf_v0_6_1_json_len,
+        .data = &src_vmaf_v0_6_1_json,
+        .data_len = &src_vmaf_v0_6_1_json_len,
     },
     {
         .version = "vmaf_b_v0.6.3",
-        .data = &___src_______model_vmaf_b_v0_6_3_json,
-        .data_len = &___src_______model_vmaf_b_v0_6_3_json_len,
+        .data = &src_vmaf_b_v0_6_3_json,
+        .data_len = &src_vmaf_b_v0_6_3_json_len,
     },
     {
         .version = "vmaf_v0.6.1neg",
-        .data = &___src_______model_vmaf_v0_6_1neg_json,
-        .data_len = &___src_______model_vmaf_v0_6_1neg_json_len,
+        .data = &src_vmaf_v0_6_1neg_json,
+        .data_len = &src_vmaf_v0_6_1neg_json_len,
     },
 #endif
     { 0 }