Merge branch 'feature/upstream' into develop

1 files changed, 170 insertions, 0 deletions

diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
new file mode 100644
index 0000000..e6492f3
--- /dev/null
+++ b/flatpak/org.gnome.Shotwell.json
@@ -0,0 +1,170 @@
+{
+    "app-id": "org.gnome.Shotwell",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.28",
+    "sdk": "org.gnome.Sdk",
+    "command" : "shotwell",
+    "rename-desktop-file" : "shotwell.desktop",
+    "rename-icon" : "shotwell",
+    "rename-appdata-file" : "shotwell.appdata.xml",
+    "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",
+        "--filesystem=xdg-run/dconf",
+        "--share=ipc",
+        "--share=network",
+        "--device=all",
+        "--socket=wayland",
+        "--socket=x11",
+        "--talk-name=ca.desrt.dconf",
+        "--talk-name=org.freedesktop.FileManager1",
+        "--talk-name=org.gnome.SettingsDaemon",
+        "--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": "libgee",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.1.tar.xz",
+                    "sha256" : "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630"
+                }
+            ],
+            "config-opts" : ["--disable-introspection", "--disable-docs"]
+        },
+        {
+            "name": "libusb",
+            "sources" : [
+                {
+                "type" : "archive",
+                "url" : "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2",
+                "sha256" : "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157"
+                }
+            ],
+            "config-opts" : ["--disable-udev"]
+        },
+        {
+            "name": "libghoto2",
+            "cleanup" : ["/bin", "/lib/udev", "/share/doc"],
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://datapacket.dl.sourceforge.net/project/gphoto/libgphoto/2.5.18/libgphoto2-2.5.18.tar.bz2",
+                    "sha256" : "5b17b89d7ca0ec35c72c94ac3701e87d49e52371f9509b8e5c08c913ae57a7ec"
+                }
+            ],
+            "config-opts" : ["--disable-introspection", "--disable-docs"]
+        },
+
+        {
+            "name": "liboauth",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://netix.dl.sourceforge.net/project/liboauth/liboauth-1.0.3.tar.gz",
+                    "sha256": "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
+                }
+            ]
+        },
+        {
+            "name": "libgdata",
+            "cleanup": ["/share/gtk-doc"],
+            "config-opts": [ "--disable-always-build-tests",
+                "--disable-introspection",
+                "--disable-Werror",
+                "--disable-static",
+                "--disable-goa" ],
+                "sources": [
+                    {
+                        "type": "archive",
+                        "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.9.tar.xz",
+                        "sha256": "85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a"
+                    }
+                ]
+        },
+
+
+        {
+            "name": "exiv2",
+            "cleanup": [ "/bin" ],
+            "buildsystem": "cmake",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/Exiv2/exiv2/",
+                    "commit" : "e7ffd83af29187190da7f98dcbca8a4d70e19582"
+                }
+            ]
+        },
+        {
+            "name": "gexiv2",
+            "cleanup" : ["/lib/girepository-1.0", "/share/gir-1.0"],
+            "config-opts" : ["--without-python2-girdir", "--without-python3-girdir"],
+            "build-options" : {
+                "env": {
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
+                }
+            },
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gexiv2.git/"
+                }
+            ]
+        },
+
+        {
+            "name": "libraw",
+            "config-opts": [ "--disable-examples", "--disable-static" ],
+            "cleanup": [ "/share/doc" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://www.libraw.org/data/LibRaw-0.18.13.tar.gz",
+                    "sha256": "cb1f9d0d1fabc8967d501d95c05d2b53d97a2b917345c66553b1abbea06757ca"
+                },
+                {
+                    "type": "patch",
+                    "path": "patches/libraw-pkgconfig.patch"
+                }
+            ]
+        },
+        {
+            "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", "-DBUILD_opencv_apps=OFF"],
+            "sources": [
+                {
+                    "type": "git",
+                    "tag": "3.4.1",
+                    "commit" : "6ffc48769ac60d53c4bd1913eac15117c9b1c9f7",
+                    "url": "https://github.com/opencv/opencv"
+                }
+            ]
+        },
+        {
+            "name": "shotwell",
+            "buildsystem": "meson",
+            "config-opts" : ["-Dudev=false", "-Dinstall-apport-hook=false", "-Dface-detection=true"],
+            "sources" : [
+                {
+                    "type": "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/shotwell",
+                    "branch" : "master"
+                }
+            ]
+        }
+    ]
+}