Merge branch 'darktable-org:master' into master

.ci/Brewfile

@@ -1,5 +1,5 @@
 #    This file is part of darktable.
-#    copyright (c) 2016 Roman Lebedev.
+#    Copyright (C) 2016-2023 darktable developers.
 #
 #    darktable is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -14,27 +14,33 @@
 #    You should have received a copy of the GNU General Public License
 #    along with darktable.  If not, see <http://www.gnu.org/licenses/>.
 
+brew 'coreutils'
 brew 'cmake'
+brew 'pkg-config'
+brew 'adwaita-icon-theme'
 brew 'desktop-file-utils'
 brew 'exiv2'
 brew 'gettext'
 brew 'git'
 brew 'glib'
 brew 'gmic'
 brew 'gphoto2'
-brew 'graphicsmagick'
 brew 'gtk+3'
 brew 'gtk-mac-integration'
 brew 'icu4c'
+brew 'imagemagick@6'
 brew 'intltool'
 brew 'iso-codes'
+brew 'jpeg-turbo'
+brew 'jpeg-xl'
 brew 'json-glib'
+brew 'jsonschema'
 brew 'lensfun'
 brew 'libavif'
 brew 'libheif'
+brew 'libraw'
 brew 'librsvg'
 brew 'libsecret'
-brew 'libsoup@2'
 brew 'little-cms2'
 brew 'lua'
 brew 'libomp'
@@ -48,6 +54,4 @@ brew 'sdl2'
 brew 'cmocka'
 brew 'curl'
 brew 'perl'
-brew 'jpeg'
-brew 'jpeg-xl'
 brew 'webp'

.ci/Dockerfile

@@ -98,7 +98,6 @@ RUN rm -rf /var/lib/apt/lists/* && apt-get update && \
     librsvg2-dev \
     libsaxon-java \
     libsecret-1-dev \
-    libsoup2.4-dev \
     libsqlite3-dev \
     libtiff5-dev \
     libwebp-dev \

.ci/ci-script.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #    This file is part of darktable.
-#    copyright (c) 2016 Roman Lebedev.
+#    Copyright (C) 2016-2023 darktable developers.
 #
 #    darktable is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -16,65 +16,52 @@
 #    You should have received a copy of the GNU General Public License
 #    along with darktable.  If not, see <http://www.gnu.org/licenses/>.
 
-# it is supposed to be run by travis-ci
-# expects a few env variables to be set:
-#   BUILD_DIR - the working directory, where to build
-#   INSTALL_DIR - the installation prefix.
-#   SRC_DIR - read-only directory with git checkout to compile
-#   CC, CXX, CFLAGS, CXXFLAGS are not required, should make sense too
-#   TARGET - either build, skiptest, nofeatures or usermanual
+# This script is supposed to be run by Travis CI or GitHub workflow.
+# It expects a few env variables to be set:
+#   BUILD_DIR - the working directory where the program will be built
+#   INSTALL_DIR - the installation prefix
+#   SRC_DIR - directory with the source code to be compiled
+#   CC, CXX, CFLAGS, CXXFLAGS are optional, but make sense for build
+#   TARGET - either build, skiptest, nofeatures or nofeatures_nosse
 #   ECO - some other flags for cmake
 
 set -ex
 
-VERBOSE="-v"
-KEEPGOING="-k0"
+if [ "$GENERATOR" = "Ninja" ];
+then
+  VERBOSE="-v"
+  KEEPGOING="-k0"
+  JOBS=""
+fi;
 
 if [ "$GENERATOR" = "Unix Makefiles" ];
 then
   VERBOSE="VERBOSE=1";
   KEEPGOING="-k"
+  JOBS="-j2"
 fi;
 
 if [ "$GENERATOR" = "MSYS Makefiles" ];
 then
   VERBOSE="VERBOSE=1";
   KEEPGOING="-k"
+  JOBS="-j2"
 fi;
 
-if [ -z "${MAKEFLAGS+x}" ];
-then
-  MAKEFLAGS="-j2 $VERBOSE"
-fi
-
 target_build()
 {
-  # to get as much of the issues into the log as possible
-  cmake --build "$BUILD_DIR" -- $MAKEFLAGS || cmake --build "$BUILD_DIR" -- -j1 "$VERBOSE" "$KEEPGOING"
+  cmake --build "$BUILD_DIR" -- $JOBS "$VERBOSE" "$KEEPGOING"
 
   ctest --output-on-failure || ctest --rerun-failed -V -VV
 
-  # and now check that it installs where told and only there.
-  cmake --build "$BUILD_DIR" --target install -- $MAKEFLAGS || cmake --build "$BUILD_DIR" --target install -- -j1 "$VERBOSE" "$KEEPGOING"
+  cmake --build "$BUILD_DIR" --target install -- $JOBS "$VERBOSE" "$KEEPGOING"
 }
 
 target_notest()
 {
-  # to get as much of the issues into the log as possible
-  cmake --build "$BUILD_DIR" -- $MAKEFLAGS || cmake --build "$BUILD_DIR" -- -j1 "$VERBOSE" "$KEEPGOING"
-
-  # and now check that it installs where told and only there.
-  cmake --build "$BUILD_DIR" --target install -- $MAKEFLAGS || cmake --build "$BUILD_DIR" --target install -- -j1 "$VERBOSE" "$KEEPGOING"
-}
-
-target_usermanual()
-{
-  cmake --build "$BUILD_DIR" -- -j1 -v -k0 validate_usermanual_xml
+  cmake --build "$BUILD_DIR" -- $JOBS "$VERBOSE" "$KEEPGOING"
 
-  # # to get as much of the issues into the log as possible
-  # cmake --build "$BUILD_DIR" -- $PARALLEL -v darktable-usermanual || cmake --build "$BUILD_DIR" -- -j1 -v -k0 darktable-usermanual
-  # test -r doc/usermanual/darktable-usermanual.pdf
-  # ls -lah doc/usermanual/darktable-usermanual.pdf
+  cmake --build "$BUILD_DIR" --target install -- $JOBS "$VERBOSE" "$KEEPGOING"
 }
 
 diskspace()
@@ -91,11 +78,20 @@ cd "$BUILD_DIR"
 
 case "$TARGET" in
   "build")
-    cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" -G"$GENERATOR" -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" "$ECO" -DVALIDATE_APPDATA_FILE=ON -DBUILD_TESTING=ON -DTESTBUILD_OPENCL_PROGRAMS=ON "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
+    cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
+      -G"$GENERATOR" \
+      -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
+      -DVALIDATE_APPDATA_FILE=ON \
+      -DBUILD_TESTING=ON \
+      -DTESTBUILD_OPENCL_PROGRAMS=ON \
+      $ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
     target_build
     ;;
   "skiptest")
-    cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" -G"$GENERATOR" -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" $ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
+    cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
+      -G"$GENERATOR" \
+      -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
+      $ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
     target_notest
     ;;
   "nofeatures")
@@ -119,7 +115,6 @@ case "$TARGET" in
       -DUSE_OPENEXR=OFF \
       -DBUILD_PRINT=OFF \
       -DBUILD_RS_IDENTIFY=OFF \
-      -DUSE_LENSFUN=OFF \
       -DUSE_GMIC=OFF \
       -DUSE_LIBSECRET=OFF \
       $ECO "$SRC_DIR" || (cat "$BUILD_DIR"/CMakeFiles/CMakeOutput.log; cat "$BUILD_DIR"/CMakeFiles/CMakeError.log)
@@ -146,7 +141,6 @@ case "$TARGET" in
       -DUSE_OPENEXR=OFF \
       -DBUILD_PRINT=OFF \
       -DBUILD_RS_IDENTIFY=OFF \
-      -DUSE_LENSFUN=OFF \
       -DUSE_GMIC=OFF \
       -DUSE_LIBSECRET=OFF \
       -DBUILD_SSE2_CODEPATHS=OFF \

.ci/obs-workflows.yml

@@ -0,0 +1,10 @@
+master:
+  steps:
+    - trigger_services:
+        project: graphics:darktable:master
+        package: darktable
+  filters:
+    event: push
+    branches:
+      only:
+        - master