Merge branch 'release/debian/0.32.1-1'debian/0.32.1-1

1 files changed, 184 insertions, 82 deletions

diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index d79226f..d3ce3f8 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -1,35 +1,29 @@
 {
-    "app-id": "org.gnome.Shotwell",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "41",
-    "branch": "testing",
-    "sdk": "org.gnome.Sdk",
+    "app-id" : "org.gnome.Shotwell",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
     "command" : "shotwell",
-    "rename-desktop-file" : "shotwell.desktop",
-    "rename-icon" : "shotwell",
-    "rename-appdata-file" : "shotwell.appdata.xml",
     "tags" : [
-        "testing"
+        "nightly"
     ],
-    "finish-args": [
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--filesystem=xdg-run/dconf",
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "finish-args" : [
         "--filesystem=/media",
         "--filesystem=/run/media",
         "--filesystem=xdg-download",
         "--filesystem=xdg-pictures",
+        "--filesystem=xdg-run/gvfsd",
         "--share=ipc",
         "--share=network",
         "--device=all",
+        "--device=dri",
         "--socket=wayland",
-        "--socket=x11",
-        "--talk-name=ca.desrt.dconf",
+        "--socket=fallback-x11",
         "--talk-name=org.freedesktop.FileManager1",
         "--talk-name=org.gnome.SettingsDaemon",
-        "--talk-name=org.gtk.vfs",
         "--talk-name=org.gtk.vfs.*",
-        "--env=GSETTINGS_BACKEND=dconf"
+        "--talk-name=org.freedesktop.secrets"
     ],
     "cleanup" : [
         "/include",
@@ -44,119 +38,227 @@
     ],
     "modules" : [
         {
-            "name": "libusb",
+            "name" : "opencv",
+            "buildsystem" : "cmake-ninja",
+            "builddir" : true,
+            "cleanup" : [
+                "/share/OpenCV/*.cmake",
+                "/share/OpenCV/*.supp"
+            ],
+            "build-options" : {
+                "cxxflags" : "-Wp,-U_GLIBCXX_ASSERTIONS",
+                "cflags" : "-Wp,-U_GLIBCXX_ASSERTIONS"
+            },
+            "config-opts" : [
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DOPENCV_GENERATE_PKGCONFIG=ON",
+                "-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" : "archive",
-                    "url" : "https://github.com/libusb/libusb/archive/v1.0.24.tar.gz",
-                    "sha256" : "b7724c272dfc5713dce88ff717efd60f021ca5b7c8e30f08ebb2c42d2eea08ae"
+                    "type" : "git",
+                    "commit" : "6dbc5e032fa851d1a25fb4a895d735ed3441975b",
+                    "url" : "https://github.com/opencv/opencv"
                 }
+            ]
+        },
+        {
+            "name": "libportal",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                 "--libdir=/app/lib",
+                "--buildtype=debugoptimized",
+                "-Dbackend-gtk3=enabled",
+                "-Dbackend-gtk4=disabled",
+                "-Dbackend-qt5=disabled",
+                "-Ddocs=false",
+                "-Dtests=false"
             ],
-            "config-opts" : ["--disable-udev"]
+            "sources" : [
+                {
+                    "type": "git",
+                    "url": "https://github.com/flatpak/libportal.git",
+                    "branch": "main"
+                }
+            ]
         },
         {
-            "name": "libghoto2",
-            "cleanup" : ["/bin", "/lib/udev", "/share/doc"],
+            "name" : "libusb",
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://github.com/gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz",
-                    "sha256" : "a7253bd18c6ef65352150ac36a668f883a5ad2634eb6455b3ca9aa6ac98d0073",
-                    "dest-filename" : "libgphoto2-2.5.27.tar.xz"
+                    "url" : "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2",
+                    "sha256" : "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
                 }
             ],
-            "config-opts" : ["--disable-introspection", "--disable-docs"]
+            "config-opts" : [
+                "--disable-udev"
+            ]
         },
         {
-            "name": "liboauth",
-            "config-opts": [ "--enable-nss" ],
-            "sources": [
+            "name" : "libghoto2",
+            "cleanup" : [
+                "/bin",
+                "/lib/udev",
+                "/share/doc"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url" : "https://sourceforge.net/projects/liboauth/files/liboauth-1.0.3.tar.gz/download",
-                    "sha256" : "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f",
-                    "dest-filename" : "liboauth-1.0.3.tar.gz"
+                    "type" : "archive",
+                    "url" : "https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.30/libgphoto2-2.5.30.tar.bz2/download",
+                    "sha256" : "ee61a1dac6ad5cf711d114e06b90a6d431961a6e7ec59f4b757a7cd77b1c0fb4",
+                    "dest-filename" : "libgphoto2-2.5.30.tar.bz2"
                 }
+            ],
+            "config-opts" : [
+                "--disable-introspection",
+                "--disable-docs"
             ]
         },
         {
-            "name": "libgdata",
-            "buildsystem" : "meson",
-            "cleanup": ["/share/gtk-doc"],
-            "config-opts": [ "-Dintrospection=false", "-Dalways_build_tests=false", "-Dgoa=disabled", "-Dgtk_doc=false"],
-                "sources": [
-                    {
-                        "type": "archive",
-                        "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.13.tar.xz",
-                        "sha256": "eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e"
-                    }
-                ]
+            "name": "libraw",
+            "config-opts": [ "--disable-examples", "--disable-static" ],
+            "cleanup": [ "/share/doc" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url" : "https://www.libraw.org/data/LibRaw-0.21.1.tar.gz",
+                    "sha256" : "630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd"
+                },
+                {
+                    "type": "patch",
+                    "path": "patches/libraw-pkgconfig.patch"
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "autoreconf -fiv"
+                    ]
+                }
+            ]
         },
         {
-            "name": "exiv2",
-            "cleanup": [ "/bin" ],
-            "buildsystem": "cmake-ninja",
+            "name" : "exiv2",
+            "cleanup" : [
+                "/bin"
+            ],
+            "buildsystem" : "cmake-ninja",
             "config-opts" : [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DCMAKE_BUILD_TYPE=Release",
                 "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",
-                "-DEXIV2_BUILD_SAMPLES=OFF"
+                "-DEXIV2_BUILD_SAMPLES=OFF",
+                "-DEXIV2_BUILD_UNIT_TESTS=OFF",
+                "-DEXIV2_ENABLE_BMFF=ON"
             ],
-            "sources": [
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://github.com/Exiv2/exiv2/",
-                    "commit" : "d3f7e92240a5e8bb827846c6094f46f9c7b53585"
+                    "type" : "git",
+                    "url" : "https://github.com/Exiv2/exiv2/",
+                    "branch" : "0.27-maintenance"
                 }
             ]
         },
         {
-            "name": "gexiv2",
+            "name" : "gexiv2",
             "buildsystem" : "meson",
-            "cleanup" : ["/lib/girepository-1.0", "/share/gir-1.0"],
-            "config-opts" : ["-Dpython2_girdir=no", "-Dpython3_girdir=no"],
+            "cleanup" : [
+                "/lib/girepository-1.0",
+                "/share/gir-1.0"
+            ],
+            "config-opts" : [
+                "-Dpython3=false"
+            ],
             "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"
+                "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": [
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gexiv2.git/",
-                    "commit" : "e4d65b31cd77f28ef248117e161de9d8cc31d712"
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gexiv2.git/"
                 }
             ]
         },
         {
-            "name": "libraw",
-            "config-opts": [ "--disable-examples", "--disable-static" ],
-            "cleanup": [ "/share/doc" ],
-            "sources": [
+            "name": "de256",
+            "buildsystem": "cmake-ninja",
+            "config-opts" : [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DENABLE_DECODER=Off",
+                "-DENABLE_ENCODER=OfF"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url" : "https://www.libraw.org/data/LibRaw-0.20.0.tar.gz",
-                    "sha256" : "1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3"
-                },
+                    "type": "git",
+                    "url" : "https://github.com/strukturag/libde265.git",
+                    "tag" : "v1.0.11",
+                    "commit" : "e255f0571a46935955deef15808e52b18043788c"
+                }
+            ]
+        },
+        {
+            "name" : "libheif",
+            "buildsystem" : "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DLIBDE265=On",
+                "-DWITH_DAV1D=Off",
+                "-DWITH_AOM_ENCODER=Off",
+                "-DWITH_AOM_DECODER=Off",
+                "-DWITH_SvtEnc=Off",
+                "-DWITH_RAV1E=Off",
+                "-DWITH_ENABLE_PLUGIN_LOADING=On",
+                "-DWITH_EXAMPLES=Off"
+            ],
+            "sources" : [
                 {
-                    "type": "patch",
-                    "path": "patches/libraw-pkgconfig.patch"
+                    "type" : "git",
+                    "url" : "https://github.com/strukturag/libheif",
+                    "tag" : "v1.15.2",
+                    "commit" : "516ef5522680c7cb62768a34ecb24f3b165ec8b4"
                 }
+            ],
+            "post-install" :  [
+                "mkdir -p /app/lib/gdk-pixbuf-2.0/2.10.0/loaders",
+                "mv $(pkg-config --define-variable=prefix=/app --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0)/* /app/lib/gdk-pixbuf-2.0/2.10.0/loaders",
+                "gdk-pixbuf-query-loaders /app/lib/gdk-pixbuf-2.0/2.10.0/loaders/*  > /app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
             ]
         },
         {
-            "name": "shotwell",
-            "buildsystem": "meson",
-            "config-opts" : ["-Dudev=false", "-Dinstall-apport-hook=false", "-Dface-detection=false", "-Dfatal_warnings=false"],
+            "name" : "shotwell",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dfatal_warnings=true",
+                "-Dudev=false",
+                "-Dinstall_apport_hook=false",
+                "-Dface_detection_helper_bus=private",
+                "-Dface_detection=true",
+                "-Dextra_pixbuf_loaders_path=/app/lib/gdk-pixbuf-2.0/2.10.0"
+            ],
             "sources" : [
                 {
-                    "type": "git",
+                    "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/shotwell.git/",
-                    "commit" : "382ac43b6b5fb688bf43a03601e48abd05925b89"
+                    "branch" : "master"
                 }
-            ],
-            "post-install" : [
-                "mv /app/share/applications/shotwell-viewer.desktop /app/share/applications/org.gnome.Shotwell.Viewer.desktop"
             ]
         }
     ]