[shotwell/wip/cleanup-facedetect: 4/6] Do not download extra data for flatpak

[Jens Georg <jensgeorg src gnome org>]

commit 25d407bb3a213a5a684ef68fc862a2f560e5dd2c
Author: Jens Georg <mail jensge org>
Date:   Sun Aug 14 19:45:37 2022 +0200

    Do not download extra data for flatpak
    
    Include torch file directly

 flatpak/org.gnome.Shotwell.json                    |  22 ---------------------
 subprojects/shotwell-facedetect/meson.build        |   4 ++++
 .../shotwell-facedetect/openface.nn4.small2.v1.t7  | Bin 0 -> 31510785 bytes
 3 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 44ce7005..33239e6e 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -228,29 +228,7 @@
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/shotwell.git/";,
                     "branch" : "master"
-                },
-                {
-                    "type" : "extra-data",
-                    "filename" : "openface.nn4.small2.v1.t7",
-                    "url" : "https://storage.cmusatyalab.org/openface-models/nn4.small2.v1.t7";,
-                    "sha256" : "9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08",
-                    "size" : 31510785
-                },
-                {
-                    "type" : "extra-data",
-                    "filename" : "res10_300x300_ssd_iter_140000_fp16.caffemodel",
-                    "url" : 
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/dnn_samples_face_detector_20180205_fp16/res10_300x300_ssd_iter_140000_fp16.caffemodel";,
-                    "sha256" : "510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76",
-                    "size" : 5351047
-                },
-                {
-                    "type" : "extra-data",
-                    "filename" : "deploy.prototxt",
-                    "url" : 
"https://raw.githubusercontent.com/opencv/opencv/master/samples/dnn/face_detector/deploy.prototxt";,
-                    "sha256" : "dcd661dc48fc9de0a341db1f666a2164ea63a67265c7f779bc12d6b3f2fa67e9",
-                    "size" : 28104
                 }
-
             ]
         }
     ]
diff --git a/subprojects/shotwell-facedetect/meson.build b/subprojects/shotwell-facedetect/meson.build
index 3cbe5e32..519bfac2 100644
--- a/subprojects/shotwell-facedetect/meson.build
+++ b/subprojects/shotwell-facedetect/meson.build
@@ -44,6 +44,10 @@ executable('shotwell-facedetect',
            install_dir : libexecdir)
 install_data('haarcascade_frontalface_alt.xml',
               install_dir : join_paths(get_option('datadir'), 'shotwell'))
+install_data(
+  'openface.nn4.small2.v1.t7',
+  install_dir: join_paths(get_option('datadir'), 'shotwell')
+)
 
 configure_file(
     input : 'org.gnome.Shotwell.Faces1.service.in',
diff --git a/subprojects/shotwell-facedetect/openface.nn4.small2.v1.t7 
b/subprojects/shotwell-facedetect/openface.nn4.small2.v1.t7
new file mode 100644
index 00000000..8a0d0197
Binary files /dev/null and b/subprojects/shotwell-facedetect/openface.nn4.small2.v1.t7 differ