Merge branch 'feature/upstream' into develop

1 files changed, 97 insertions, 0 deletions

diff --git a/flatpak/org.gnome.Shotwell.Faces.json b/flatpak/org.gnome.Shotwell.Faces.json
new file mode 100644
index 0000000..a44634b
--- /dev/null
+++ b/flatpak/org.gnome.Shotwell.Faces.json
@@ -0,0 +1,97 @@
+{
+    "app-id" : "org.gnome.Shotwell.Faces1",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "40",
+    "sdk" : "org.gnome.Sdk",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "finish-args" : [
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--filesystem=xdg-download",
+        "--filesystem=xdg-pictures",
+        "--share=ipc",
+        "--talk-name=org.gtk.vfs",
+        "--talk-name=org.gtk.vfs.*"
+    ],
+    "cleanup" : [
+        "/include",
+        "/lib/pkconfig",
+        "/share/pkgconfig",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/vala",
+        "/lib/girepository",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "opencv",
+            "buildsystem" : "cmake",
+            "builddir" : true,
+            "cleanup" : [
+                "/share/OpenCV/*.cmake",
+                "/share/OpenCV/*.supp"
+            ],
+            "config-opts" : [
+                "-DBUILD_TESTS=OFF",
+                "-DBUILD_EXAMPLES=OFF",
+                "-DBUILD_PERF_TESTS=OFF",
+                "-DWITH_FFMPEG=OFF",
+                "-DWITH_GTK=OFF",
+                "-DWITH_GSTREAMER=OFF",
+                "-DWITH_JASPER=OFF",
+                "-DWITH_OPENEXR=OFF",
+                "-DWITH_GDAL=OFF",
+                "-DWITH_GDCM=OFF",
+                "-DBUILD_opencv_apps=OFF",
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DBUILD_LIST=imgproc,imgcodecs,objdetect,dnn"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "tag" : "4.2.0",
+                    "commit" : "bda89a6469aa79ecd8713967916bd754bff1d931",
+                    "url" : "https://github.com/opencv/opencv"
+                }
+            ]
+        },
+        {
+            "name" : "shotwell-facedetect",
+            "buildsystem" : "meson",
+            "subdir" : "subprojects/shotwell-facedetect",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "path": "/home/jgeorg/Source/GNOME/shotwell",
+                    "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
+                }
+            ]
+        }
+    ]
+}