diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index 5f447fe8a..787b2822c 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -15,7 +15,7 @@ on:
workflow_dispatch:
env:
- publish_pre_dev_labels: '["Beep6581:wbrefinement"]'
+ publish_pre_dev_labels: '[]'
jobs:
build:
@@ -26,7 +26,7 @@ jobs:
build_type: [release, debug]
steps:
- name: Checkout source
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
@@ -35,11 +35,24 @@ jobs:
echo "Running apt update."
sudo apt update
echo "Installing dependencies with apt."
- DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexpat1-dev libbrotli-dev zlib1g-dev libinih-dev
+ DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexpat1-dev libbrotli-dev zlib1g-dev libinih-dev adwaita-icon-theme-full gettext libarchive-tools zstd libgif-dev libwebp-dev libwebpdemux2
+
+ - name: Install makedeb
+ run: |
+ echo "Installing makedeb..."
+ curl -Ss -qgb "" -fLC - --retry 3 --retry-delay 3 -o makedeb.deb \
+ "https://github.com/makedeb/makedeb/releases/download/v16.1.0-beta1/makedeb-beta_16.1.0-beta1_amd64_focal.deb"
+ DEBIAN_FRONTEND=noninteractive sudo dpkg -i makedeb.deb
+
+ - name: Install libjxl
+ working-directory: tools/makedeb
+ run: |
+ echo "Building and installing libjxl..."
+ makedeb -si --no-confirm -p PKGBUILD.libjxl
- name: Install Exiv2
run: |
- EXIV2_VERSION='v0.28.1'
+ EXIV2_VERSION='v0.28.3'
echo "Cloning Exiv2 $EXIV2_VERSION."
git clone --depth 1 --branch "$EXIV2_VERSION" https://github.com/Exiv2/exiv2.git ext/exiv2
@@ -51,6 +64,26 @@ jobs:
echo "Building and installing."
sudo make -j$(nproc) install
+ - name: Install Librsvg required min. version
+ # Required min. version is not available for Ubuntu 20.04 LTS (but is for 22.04 LTS) so needs to be built manually
+ run: |
+ LIBRSVG2_VERSION='2.52.2'
+ echo "Cloning Librsvg2 $LIBRSVG2_VERSION."
+ git clone --depth 1 --branch "$LIBRSVG2_VERSION" https://gitlab.gnome.org/GNOME/librsvg.git ext/librsvg2
+
+ echo "Installing required dependencies with apt."
+ DEBIAN_FRONTEND=noninteractive sudo apt install -y rustc cargo gtk-doc-tools libgirepository1.0-dev
+
+ echo "Updating PATH."
+ export PATH="$PATH:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0"
+
+ echo "Configuring build."
+ cd ext/librsvg2
+ sh autogen.sh
+
+ echo "Building and installing."
+ sudo make install
+
- name: Configure build
run: |
export REF_NAME_FILTERED="$(echo '${{github.ref_name}}' | sed 's/[^A-z0-9_.-]//g')"
@@ -107,9 +140,30 @@ jobs:
echo "Copying Lensfun database to the build directory."
cp -R ~/.local/share/lensfun/updates/* build/AppDir/usr/share/lensfun/
+ - name: Include Adwaita icon theme (partial)
+ run: |
+ mkdir build/AppDir/usr/bin/icons/Adwaita
+ icons_dir=('actions' 'devices' 'mimetypes' 'places' 'status' 'ui' 'devices')
+ for dir in "${icons_dir[@]}"; do
+ find_res=$(find /usr/share/icons/Adwaita -name "${dir}" -type d)
+ if [ -z "$find_res" ]
+ then
+ echo "-Warning: Icons folder '"${dir}"' not found in Adwaita theme."
+ else
+ new_dir=($(echo "$find_res" | awk -F/ '{print $(NF-1)"/"$NF}'))
+ for d in "${new_dir[@]}"; do
+ echo "-Copying '"${d}"' into 'AppDir/usr/bin/icons/Adwaita'."
+ mkdir -p "build/AppDir/usr/bin/icons/Adwaita/${d}"
+ cp -R "/usr/share/icons/Adwaita/${d}/." "build/AppDir/usr/bin/icons/Adwaita/${d}"
+ done
+ fi
+ done
+ echo "-Copying 'index.theme' into 'AppDir/usr/bin/icons/Adwaita'."
+ cp /usr/share/icons/Adwaita/index.theme build/AppDir/usr/bin/icons/Adwaita
+
- name: Restore AppImage tools from cache
id: appimage-tools-cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
key: appimage-tools-1
path: |
@@ -162,7 +216,7 @@ jobs:
echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
- name: Upload artifacts
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ${{env.ARTIFACT_NAME}}.AppImage
path: ${{github.workspace}}/build/${{env.ARTIFACT_NAME}}.AppImage
@@ -184,7 +238,7 @@ jobs:
echo "PUBLISH_NAME=$PUBLISH_NAME" >> $GITHUB_ENV
- name: Publish artifacts
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
with:
tag_name: nightly-github-actions
@@ -214,10 +268,11 @@ jobs:
echo "PUBLISH_NAME=$PUBLISH_NAME" >> $GITHUB_ENV
- name: Publish pre-dev artifacts
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
if: ${{steps.prepare-publish-pre-dev.outcome == 'success'}}
with:
tag_name: pre-dev-github-actions
+ repository: Beep6581/RawTherapee
files: |
${{env.PUBLISH_NAME}}.AppImage
${{env.PUBLISH_NAME}}-AppImage-AboutThisBuild.txt
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f57786098..38b66cb96 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -32,7 +32,7 @@ jobs:
steps:
- name: Checkout source
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
fetch-depth: 0
@@ -41,7 +41,17 @@ jobs:
echo "Running apt update."
sudo apt update
echo "Installing dependencies with apt."
- DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexiv2-dev
+ DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexiv2-dev libtcmalloc-minimal4 libhwy0 libhwy-dev
+
+ - name: Install libjxl
+ run: |
+ echo "Downloading and installing libjxl..."
+ VERSION_UBUNTU=22.04
+ VERSION_JXL=0.10.3
+ curl -Ss -qgb "" -fLC - --retry 3 --retry-delay 3 -o libjxl-debs.tar.gz \
+ "https://github.com/libjxl/libjxl/releases/download/v${VERSION_JXL}/jxl-debs-amd64-ubuntu-${VERSION_UBUNTU}-v${VERSION_JXL}.tar.gz"
+ tar xf libjxl-debs.tar.gz
+ DEBIAN_FRONTEND=noninteractive sudo dpkg -i jxl_${VERSION_JXL}_amd64.deb libjxl-dev_${VERSION_JXL}_amd64.deb libjxl_${VERSION_JXL}_amd64.deb
- name: Configure build
run: |
@@ -77,7 +87,7 @@ jobs:
echo "REF_NAME_FILTERED=$REF_NAME_FILTERED" >> $GITHUB_ENV
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
@@ -90,6 +100,6 @@ jobs:
mv AppDir/usr/bin/share AppDir/usr/
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 8755f7c66..6f601d4e8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -18,42 +18,46 @@ jobs:
build:
runs-on: macos-12
steps:
- - uses: actions/checkout@v3
+ - name: Checkout Repository
+ uses: actions/checkout@v4
+ with:
+ fetch-tags: '0'
+ fetch-depth: '0'
- name: Install dependencies
run: |
date -u
mkdir build
date +%s > build/stamp
brew uninstall --ignore-dependencies libtiff
- brew install libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info exiv2 | tee -a depslog
+ brew install imagemagick create-dmg libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info exiv2 jpeg-xl libomp automake libtool | tee -a depslog
date -u
echo "----====Pourage====----"
cat depslog | grep Pouring
- zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+ zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
- name: Configure build system
env:
+ IDENT: '-'
CMAKE_CXX_STANDARD: 11
PKG_CONFIG_PATH: /usr/local/opt/libtiff/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
- RAW_THERAPEE_MAJOR: '5'
- RAW_THERAPEE_MINOR: '8'
C_FLAGS: >
- -arch x86_64 -mtune=generic -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/libtiff/include
+ -arch x86_64 -mtune=generic -Xpreprocessor -fopenmp /usr/local/opt/libomp/lib/libomp.dylib -I/usr/local/opt/libomp/include -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/libtiff/include
run: |
# GITHUB_REF is the ref that triggered the build, like
# refs/heads/new-feature - the next line parses that to REF: the branch
# name only (new-feature)
+ export RAW_THERAPEE_VERSION=$(git describe --tags | cut -f1,2 -d'.')
export REF=${GITHUB_REF##*/}
export C_FLAGS=$(echo -e $C_FLAGS | tr -d '\n')
cd build && date -u && date +%s > configstamp
cmake \
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DCMAKE_EXE_LINKER_FLAGS="-L. -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/opt/gdk-pixbuf/lib -L/usr/local/opt/libiconv/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libxml2/lib -L/usr/local/opt/expat/lib" \
- -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_MAJOR}.${RAW_THERAPEE_MINOR}-${REF}" \
+ -DCMAKE_EXE_LINKER_FLAGS="-L. -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/opt/gdk-pixbuf/lib -L/usr/local/opt/libomp/lib -L/usr/local/opt/expat/lib" \
+ -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_VERSION}-${REF}" \
-DPROC_TARGET_NUMBER="1" \
-DPROC_LABEL="generic processor" \
-DCMAKE_OSX_ARCHITECTURES=$(uname -m) \
- -DWITH_LTO="OFF" \
+ -DWITH_LTO="ON" \
-DLENSFUNDBDIR="/Applications/RawTherapee.app/Contents/Resources/share/lensfun" \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
@@ -63,33 +67,35 @@ jobs:
-DOpenMP_CXX_FLAGS="${C_FLAGS}" \
-DOpenMP_C_LIB_NAMES=libomp \
-DOpenMP_CXX_LIB_NAMES=libomp \
- -DOpenMP_libomp_LIBRARY=/usr/local/lib/libomp.dylib \
+ -DOpenMP_libomp_LIBRARY=/usr/local/opt/libomp/lib/libomp.dylib \
-DCMAKE_AR=/usr/bin/ar \
-DCMAKE_RANLIB=/usr/bin/ranlib \
- -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
- -DOSX_CONTINUOUS=ON \
+ -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 \
+ -DCONTINUOUS=ON \
+ -DCODESIGNID:STRING="$IDENT" \
+ -DFANCY_DMG="ON" \
..
- curl -L https://github.com/Homebrew/homebrew-core/raw/679923b4eb48a8dc7ecc1f05d06063cd79b3fc00/Formula/libomp.rb -o libomp.rb && brew install --formula libomp.rb
- zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"'
+ zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
- name: Compile RawTherapee
run: |
date -u && date +%s > build/compilestamp
cd build
export REF=${GITHUB_REF##*/}
make -j$(sysctl -a | grep machdep.cpu.thread_count | tail -c 2) install
- zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"'
+ zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
- name: Create application bundle
run: |
zsh
date +%s > build/bundlestamp && date -u && cd build
- export REF=${GITHUB_REF##*/} && export LOCAL_PREFIX=/usr && sudo make macosx_bundle
+ echo "Automated Build! WARNING:\nNot intended for end-user testing." > message
+ export REF=${GITHUB_REF##*/} && sudo make macosx_bundle
export ARTIFACT=(RawTherapee*${CMAKE_BUILD_TYPE}.zip)
echo "=== artifact: ${ARTIFACT}"
# defining environment variables for next step as per
# https://github.com/actions/starter-workflows/issues/68
echo "ARTIFACT_PATH=${GITHUB_WORKSPACE}/build/${ARTIFACT}" >> $GITHUB_ENV
echo "ARTIFACT_FILE=${ARTIFACT}" >> $GITHUB_ENV
- zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"'
+ zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
printf '%s\n' \
"REF: ${REF}" \
"ARTIFACT: ${ARTIFACT}" \
@@ -97,17 +103,153 @@ jobs:
"ARTIFACT_FILE: ${ARTIFACT_FILE}" \
"PUBLISH_NAME: ${PUBLISH_NAME}"
exit
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: ${{env.ARTIFACT_FILE}}
path: ${{env.ARTIFACT_PATH}}
- name: Finish build
run: |
date -u
- zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+ zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+
+ - name: Test-launch the app
+ run: |
+ cd build
+ sudo cp -R RawTherapee.app /Applications
+ open -a /Applications/RawTherapee.app
+ sleep 5
+ echo "Applications running: $(osascript -e 'tell application "Finder" to get the name of every process whose visible is true')" >> $GITHUB_STEP_SUMMARY
+ osascript -e 'if application "RawTherapee" is not running then do shell script "exit 1"'
+ osascript -e 'tell application "RawTherapee" to if it is running then quit'
+
+ - name: Test the -cli
+ run: |
+ cd build
+ echo "$(RawTherapee*folder/rawtherapee-cli --version)" >> $GITHUB_STEP_SUMMARY
- name: Publish artifacts
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
+ if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
+ with:
+ tag_name: nightly-github-actions
+ files: |
+ ${{env.ARTIFACT_PATH}}
+
+
+ armbuild:
+ runs-on: macos-14
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ fetch-tags: '0'
+ fetch-depth: '0'
+ - name: Install dependencies
+ run: |
+ date -u
+ mkdir build
+ date +%s > build/stamp
+ brew uninstall --ignore-dependencies libtiff
+ brew install imagemagick create-dmg libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info exiv2 jpeg-xl libomp automake libtool | tee -a depslog
+ date -u
+ echo "----====Pourage====----"
+ cat depslog | grep Pouring
+ zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+ - name: Configure build system
+ env:
+ IDENT: '-'
+ CMAKE_CXX_STANDARD: 11
+ PKG_CONFIG_PATH: /opt/homebrew/opt/libtiff/lib/pkgconfig:opt/homebrew/opt/libffi/lib/pkgconfig:/ope/homebrew/opt/expat/lib/pkgconfig
+ C_FLAGS: >
+ -arch arm64 -Xpreprocessor -fopenmp /opt/homebrew/opt/libomp/lib/libomp.dylib -I/opt/homebrew/opt/libomp/include -I/opt/homebrew/include -I/opt/homebrew/opt/gdk-pixbuf/include -I/opt/homebrew/opt/libiconv/include -I/opt/homebrew/opt/libxml2/include -I/opt/homebrew/opt/expat/include -I/opt/homebrew/opt/libtiff/include
+ run: |
+ # GITHUB_REF is the ref that triggered the build, like
+ # refs/heads/new-feature - the next line parses that to REF: the branch
+ # name only (new-feature)
+ export RAW_THERAPEE_VERSION=$(git describe --tags | cut -f1,2 -d'.')
+ export REF=${GITHUB_REF##*/}
+ export C_FLAGS=$(echo -e $C_FLAGS | tr -d '\n')
+ cd build && date -u && date +%s > configstamp
+ cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DCMAKE_EXE_LINKER_FLAGS="-L. -L/opt/homebrew/lib -Wl,-rpath -Wl,/opt/homebrew/lib -L/opt/homebrew/opt/gdk-pixbuf/lib -L/opt/homebrew/opt/libomp/lib -L/opt/homebrew/opt/expat/lib" \
+ -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_VERSION}-${REF}" \
+ -DCMAKE_OSX_ARCHITECTURES=arm64 \
+ -DWITH_LTO="ON" \
+ -DLENSFUNDBDIR="/Applications/RawTherapee.app/Contents/Resources/share/lensfun" \
+ -DCMAKE_C_COMPILER=clang \
+ -DCMAKE_CXX_COMPILER=clang++ \
+ -DCMAKE_C_FLAGS="-arch arm64 -Wno-pass-failed -Wno-deprecated-register -Wno-unused-command-line-argument" \
+ -DCMAKE_CXX_FLAGS="-arch arm64 -Wno-pass-failed -Wno-deprecated-register -Wno-unused-command-line-argument" \
+ -DOpenMP_C_FLAGS="${C_FLAGS}" \
+ -DOpenMP_CXX_FLAGS="${C_FLAGS}" \
+ -DOpenMP_C_LIB_NAMES=libomp \
+ -DOpenMP_CXX_LIB_NAMES=libomp \
+ -DOpenMP_libomp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
+ -DCMAKE_AR=/usr/bin/ar \
+ -DCMAKE_RANLIB=/usr/bin/ranlib \
+ -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
+ -DCONTINUOUS=ON \
+ -DCODESIGNID:STRING="$IDENT" \
+ -DLOCAL_PREFIX=/opt/homebrew \
+ -DFANCY_DMG="ON" \
+ ..
+ zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+ - name: Compile RawTherapee
+ run: |
+ date -u && date +%s > build/compilestamp
+ cd build
+ export REF=${GITHUB_REF##*/}
+ make -j$(sysctl -a | grep machdep.cpu.thread_count | tail -c 2) install
+ zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+ - name: Create application bundle
+ run: |
+ zsh
+ date +%s > build/bundlestamp && date -u && cd build
+ echo "Automated Build! WARNING:\nNot intended for end-user testing." > message
+ export REF=${GITHUB_REF##*/} && sudo make macosx_bundle
+ export ARTIFACT=(RawTherapee*${CMAKE_BUILD_TYPE}.zip)
+ echo "=== artifact: ${ARTIFACT}"
+ # defining environment variables for next step as per
+ # https://github.com/actions/starter-workflows/issues/68
+ echo "ARTIFACT_PATH=${GITHUB_WORKSPACE}/build/${ARTIFACT}" >> $GITHUB_ENV
+ echo "ARTIFACT_FILE=${ARTIFACT}" >> $GITHUB_ENV
+ zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+ printf '%s\n' \
+ "REF: ${REF}" \
+ "ARTIFACT: ${ARTIFACT}" \
+ "ARTIFACT_PATH: ${ARTIFACT_PATH}" \
+ "ARTIFACT_FILE: ${ARTIFACT_FILE}" \
+ "PUBLISH_NAME: ${PUBLISH_NAME}"
+ exit
+
+ - uses: actions/upload-artifact@v4
+ with:
+ name: ${{env.ARTIFACT_FILE}}
+ path: ${{env.ARTIFACT_PATH}}
+ - name: Finish build
+ run: |
+ date -u
+ zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+
+ - name: Test-launch the app
+ run: |
+ cd build
+ sudo cp -R RawTherapee.app /Applications
+ open -a /Applications/RawTherapee.app
+ sleep 5
+ echo "Applications running: $(osascript -e 'tell application "Finder" to get the name of every process whose visible is true')" >> $GITHUB_STEP_SUMMARY
+ osascript -e 'if application "RawTherapee" is not running then do shell script "exit 1"'
+ osascript -e 'tell application "RawTherapee" to if it is running then quit'
+
+ - name: Test the -cli
+ run: |
+ cd build
+ echo "$(RawTherapee*folder/rawtherapee-cli --version)" >> $GITHUB_STEP_SUMMARY
+
+ - name: Publish artifacts
+ uses: softprops/action-gh-release@v2
if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
with:
tag_name: nightly-github-actions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2e1d3bc69..6e36f3b5e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,7 +15,8 @@ on:
workflow_dispatch:
env:
- publish_pre_dev_labels: '["Beep6581:wbrefinement"]'
+ publish_pre_dev_labels: '[]'
+
jobs:
build:
@@ -29,7 +30,7 @@ jobs:
build_type: [release, debug]
steps:
- name: Checkout source
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
@@ -46,12 +47,14 @@ jobs:
cc:p
pkgconf:p
cmake:p
+ autotools:p
ninja:p
gtkmm3:p
lcms2:p
fftw:p
lensfun:p
libiptcdata:p
+ libjxl:p
exiv2:p
- name: Configure build
@@ -129,14 +132,6 @@ jobs:
"symbolic/ui" \
"$BUILD_DIR/share/icons/Adwaita/symbolic"
cp 'index.theme' "$BUILD_DIR/share/icons/Adwaita"
- mkdir -p "$BUILD_DIR/share/icons/Adwaita/cursors"
- cp -r \
- "cursors/plus.cur" \
- "cursors/sb_h_double_arrow.cur" \
- "cursors/sb_left_arrow.cur" \
- "cursors/sb_right_arrow.cur" \
- "cursors/sb_v_double_arrow.cur" \
- "$BUILD_DIR/share/icons/Adwaita/cursors"
cd -
echo "Copying GDK pixbuf."
@@ -196,14 +191,14 @@ jobs:
7z a -tzip "%ARTIFACT_NAME%.zip" "./%ARTIFACT_NAME%"
- name: Upload artifacts
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ${{env.ARTIFACT_NAME}}
path: build\${{env.ARTIFACT_NAME}}
- name: Upload installer
if: ${{matrix.build_type == 'release' && (github.ref_type == 'tag' || github.ref_name == 'dev')}}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ${{env.ARTIFACT_NAME}}.exe
path: build\${{env.ARTIFACT_NAME}}.exe
@@ -229,7 +224,7 @@ jobs:
echo "PUBLISH_NAME=$PUBLISH_NAME" >> "$(cygpath -u $GITHUB_ENV)"
- name: Publish artifacts
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
with:
tag_name: nightly-github-actions
@@ -238,7 +233,7 @@ jobs:
build/${{env.PUBLISH_NAME}}-AboutThisBuild.txt
- name: Publish installer
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
if: ${{matrix.build_type == 'release' && (github.ref_type == 'tag' || github.ref_name == 'dev')}}
with:
tag_name: nightly-github-actions
@@ -270,17 +265,19 @@ jobs:
echo "PUBLISH_NAME=$PUBLISH_NAME" >> "$(cygpath -u $GITHUB_ENV)"
- name: Publish pre-dev artifacts
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
if: ${{steps.prepare-publish-pre-dev.outcome == 'success'}}
with:
tag_name: pre-dev-github-actions
+ repository: Beep6581/RawTherapee
files: |
build/${{env.PUBLISH_NAME}}.zip
build/${{env.PUBLISH_NAME}}-AboutThisBuild.txt
- name: Publish pre-dev installer
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
if: ${{steps.prepare-publish-pre-dev.outcome == 'success' && matrix.build_type == 'release'}}
with:
tag_name: pre-dev-github-actions
+ repository: Beep6581/RawTherapee
files: build/${{env.PUBLISH_NAME}}.exe
diff --git a/.gitignore b/.gitignore
index e67dc3511..dbb6d72ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ cmake_install.cmake
install_manifest.txt
build*
+cmake-build*
Build*
Debug
RelWithDebInfo
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 0d5f9db64..f9aafd927 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -21,6 +21,7 @@ Development contributors, in last name alphabetical order:
Rüdiger Franke
Jean-Christophe Frisch
Ilias Giarimis
+ Scott Gilbertson
Alberto Griggio
Steve Herrell
Philippe Hupé
diff --git a/AboutThisBuild.txt.in b/AboutThisBuild.txt.in
index 4d8f4f3fe..7c42f244e 100644
--- a/AboutThisBuild.txt.in
+++ b/AboutThisBuild.txt.in
@@ -6,8 +6,9 @@ Compiler: ${COMPILER_INFO}
Processor: ${PROC_LABEL}
System: ${SYSTEM}
Bit depth: ${PROC_BIT_DEPTH}
-Gtkmm: V${GTKMM_VERSION}
-Lensfun: V${LENSFUN_VERSION}
+Gtkmm: ${GTKMM_VERSION}
+Lensfun: ${LENSFUN_VERSION}
+libjxl: ${JXL_VERSION}
Build type: ${BUILD_TYPE}
Build flags: ${CXX_FLAGS}
Link flags: ${LFLAGS}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b7c797d9..fdfe60968 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,7 @@ option(WITH_LTO "Build with link-time optimizations" OFF)
option(WITH_SAN "Build with run-time sanitizer" OFF)
option(WITH_PROF "Build with profiling instrumentation" OFF)
option(WITH_SYSTEM_KLT "Build using system KLT library." OFF)
+option(WITH_SYSTEM_LIBRAW "Build using system LibRaw library." OFF)
option(OPTION_OMP "Build with OpenMP support" ON)
option(
STRICT_MUTEX
@@ -247,6 +248,9 @@ set(TCMALLOC_LIB_DIR
""
CACHE PATH "Custom path for the tcmalloc library")
+set(WITH_JXL "AUTO" CACHE STRING "Build with JPEG XL support")
+set_property(CACHE WITH_JXL PROPERTY STRINGS AUTO ON OFF)
+
# Set installation directories:
if(WIN32 OR APPLE)
if(BUILD_BUNDLE)
@@ -462,13 +466,9 @@ endif()
# Check for libraries:
find_package(PkgConfig)
-if(WIN32)
- pkg_check_modules(GTK REQUIRED gtk+-3.0>=3.22.24)
- pkg_check_modules(GTKMM REQUIRED gtkmm-3.0>=3.22)
-else()
- pkg_check_modules(GTK REQUIRED gtk+-3.0>=3.16)
- pkg_check_modules(GTKMM REQUIRED gtkmm-3.0>=3.16)
-endif()
+# Gtk version shall be greater than 3.24.3 for fixed Hi-DPI support
+pkg_check_modules(GTK REQUIRED gtk+-3.0>=3.24.3)
+pkg_check_modules(GTKMM REQUIRED gtkmm-3.0>=3.24)
if(GTK_VERSION VERSION_GREATER "3.24.1" AND GTK_VERSION VERSION_LESS "3.24.7")
if(GTK_VERSION VERSION_EQUAL "3.24.5")
@@ -495,7 +495,7 @@ pkg_check_modules(GTHREAD REQUIRED gthread-2.0>=2.48)
pkg_check_modules(GOBJECT REQUIRED gobject-2.0>=2.48)
pkg_check_modules(SIGC REQUIRED sigc++-2.0>=2.3.1)
pkg_check_modules(LENSFUN REQUIRED lensfun>=0.2)
-pkg_check_modules(RSVG REQUIRED librsvg-2.0>=2.40)
+pkg_check_modules(RSVG REQUIRED librsvg-2.0>=2.52)
# Require exiv2 >= 0.24 to make sure everything we need is available
#find_package(Exiv2 0.24 REQUIRED)
@@ -522,6 +522,13 @@ foreach(l ${_exiv2_libs})
set(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${_el})
endforeach()
+if(NOT WITH_SYSTEM_LIBRAW)
+ set(LIBRAW_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/rtengine/libraw/lib/.libs/libraw_r.a")
+ if(WIN32)
+ set(LIBRAW_LIBRARIES ${LIBRAW_LIBRARIES} -lws2_32)
+ endif()
+endif()
+
if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32)
@@ -555,6 +562,35 @@ find_package(ZLIB REQUIRED)
if(WITH_SYSTEM_KLT)
find_package(KLT REQUIRED)
endif()
+if(WITH_SYSTEM_LIBRAW)
+ pkg_check_modules(LIBRAW REQUIRED libraw_r>=0.21)
+endif()
+
+if(WITH_JXL AND NOT WITH_JXL STREQUAL "AUTO")
+ set(JXL_REQUIRED "REQUIRED")
+else()
+ set(JXL_REQUIRED "")
+endif()
+pkg_check_modules(JXL ${JXL_REQUIRED} IMPORTED_TARGET libjxl)
+pkg_check_modules(JXLTHREADS ${JXL_REQUIRED} IMPORTED_TARGET libjxl_threads)
+if(JXL_FOUND)
+ if(WITH_JXL OR WITH_JXL STREQUAL "AUTO")
+ add_definitions(-DLIBJXL)
+ list(APPEND JXL_INCLUDE_DIRS ${JXLTHREADS_INCLUDE_DIRS})
+ list(APPEND JXL_LIBRARIES ${JXLTHREADS_LIBRARIES})
+ else()
+ message(STATUS " JXL support disabled by WITH_JXL = ${WITH_JXL}")
+ string(APPEND JXL_VERSION " - Disabled")
+ set(JXL_INCLUDE_DIRS "")
+ set(JXL_LIBRARIES "")
+ set(JXLTHREADS_INCLUDE_DIRS "")
+ set(JXLTHREADS_LIBRARIES "")
+ endif()
+elseif(WITH_JXL STREQUAL "AUTO")
+ set(JXL_VERSION "Disabled, Auto")
+else()
+ set(JXL_VERSION "Disabled")
+endif()
# Check for libcanberra-gtk3 (sound events on Linux):
if(UNIX AND (NOT APPLE))
@@ -736,6 +772,7 @@ if(NOT APPLE)
-DGTKMM_VERSION:STRING=${GTKMM_VERSION}
-DOPTION_OMP:STRING=${OPTION_OMP}
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
+ -DJXL_VERSION:STRING=${JXL_VERSION}
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION})
endif()
@@ -765,6 +802,7 @@ elseif(APPLE)
-DGTKMM_VERSION:STRING=${GTKMM_VERSION}
-DOPTION_OMP:STRING=${OPTION_OMP}
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
+ -DJXL_VERSION:STRING=${JXL_VERSION}
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION}
-P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake)
else()
diff --git a/ProcessorTargets.cmake b/ProcessorTargets.cmake
index 60fd1e35f..fdd4bc40a 100644
--- a/ProcessorTargets.cmake
+++ b/ProcessorTargets.cmake
@@ -10,6 +10,8 @@ set(PROC_TARGET_2_LABEL native CACHE STRING "Processor-2 label - use it for your
# The flag is different on x86 and Arm based processors
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64)
set(PROC_TARGET_2_FLAGS "-mcpu=native" CACHE STRING "Processor-2 flags")
+elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ppc|powerpc")
+ set(PROC_TARGET_2_FLAGS "-mtune=native" CACHE STRING "Processor-2 flags")
else()
set(PROC_TARGET_2_FLAGS "-march=native" CACHE STRING "Processor-2 flags")
endif()
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 0ef0b255b..ca4beb576 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,6 +1,6 @@
-RAWTHERAPEE 5.10 RELEASE NOTES
+RAWTHERAPEE 5.11-rc1 RELEASE NOTES
-This is RawTherapee 5.10, released on 2024-02-16.
+This is Release Candidate 1 of RawTherapee 5.11, released on 2025-08-11. This is not the final release yet.
@@ -22,104 +22,62 @@ In order to use RawTherapee efficiently you should know that:
-NEW FEATURES SINCE 5.9
+NEW FEATURES SINCE 5.10
-- Multiple custom external editors can be added and the external editor can be chosen in the Editor tab.
-- The Favorites tab can be configured in Preferences. An option to display Favorite tools in their original location has been added.
-- Metadata is now handled by Exiv2. CR3 metadata is supported.
-- When saving images in the TIFF file format, there is a new option to use the BigTIFF format.
-- The DCP and LCP file paths saved to processing profiles have better interoperability between Windows and Linux, and between different computers.
-- The Tone Equalizer in Local Adjustments is now also available in the Exposure tab. They have a new Pivot adjuster to shift the range of affected tones. The Tone Equalizer in the Exposure tab can display a tonal map for visualizing the tones.
-- The ICC profiles in the user configuration directory are recognized.
-- The language selection in Preferences now show all language names in their own language.
-- The Lensfun database directory can be changed in Preferences.
-- The color pickers in Film Negative (Color tab) now have adjustable size.
-- Dynamic Profile Rules now has a File path filter.
-- The context menu for images (File Browser tab) received a new option to sort images by name, date, rank, color label, or EXIF.
-- The Flat-Field tool (Raw tab) has a new From Metadata option for applying DNG gain maps.
-- Temporary files generated by the external editor feature now have more private file permissions.
-- The Color Appearance & Lighting tool (Advanced tab) received various improvements.
-- The Abstract Profile in the Color Management tool (Color tab) received a Gamut control option.
-- The L*a*b* Adjustments (Exposure tab) and Local Adjustments (Local tab) tools received improvements to the Avoid color shift option.
-- The Highlight reconstruction in the Exposure tool (Exposure tab) has a new Inpaint Opposed method that usually offers better reconstructed details than the Blend method and higher reliability compared to the Color Propagation method.
-- The Temperature correlation automatic white balance method in the White Balance tool (Color tab) received various improvements.
-- The Denoise section of the Blur/Grain & Denoise tool in Local Adjustments (Local tab) has an improved interface.
-- Raw files from OM Digital Solutions cameras are supported.
-- The Dynamic Range Compression tool in the Exposure tab and in Local Adjustments (Local tab) has improved behavior. The tool in Local Adjustments received a Saturation control option.
-- The default value for the Show additional settings option for new spots in Local Adjustments (Local tab) is now linked to the Default complexity for Local Adjustments set in Preferences.
-- Added or improved support for cameras, raw formats and color profiles:
- - Canon EOS 250D (DCP)
- - Canon EOS 7D Mark II
- - Canon EOS 800D (DCP)
- - Canon EOS 90D
- - Canon EOS Kiss X10
- - Canon EOS M100
- - Canon EOS M50 (DCP)
- - Canon EOS M50m2
- - Canon EOS M6 Mark II
- - Canon EOS R
- - Canon EOS R10
- - Canon EOS R3
- - Canon EOS R5
- - Canon EOS R6
- - Canon EOS R6m2
- - Canon EOS R7
- - Canon EOS R8
- - Canon EOS RP
- - Canon EOS Rebel SL3
- - Canon EOS-1D X Mark II
- - Canon PowerShot G7 X Mark II
- - Canon Powershot G5 X MARK II (DCP)
- - FUJIFILM DBP for GX680 (DCP)
- - FUJIFILM GFX 100
- - FUJIFILM GFX100S
- - FUJIFILM X-A7 (DCP)
- - FUJIFILM X-E3 (DCP)
- - FUJIFILM X-H2
- - FUJIFILM X-PRO3
- - FUJIFILM X-S10 (DCP)
- - FUJIFILM X-T3
- - FUJIFILM X-T30
- - FUJIFILM X-T30 II
- - FUJIFILM X-T4
- - FUJIFILM X-T5
- - FUJIFILM X100V
- - LEICA D-LUX 7
- - NIKON D3300 (DCP)
- - NIKON Z 5 (DCP)
- - NIKON Z 6_2 (DCP)
- - NIKON Z 9
- - OLYMPUS E-M1 (DCP)
- - OLYMPUS E-M10MarkIV
- - OM Digital Solutions OM-1
- - OM Digital Solutions OM-5
- - PANASONIC DC-GX880
- - PANASONIC DMC-LX100 (DCP)
- - Panasonic DC-G100
- - Panasonic DC-G110
- - Panasonic DC-LX100M2
- - Sony DSC-RX100M6 (DCP)
- - Sony DSC-RX1RM2
- - Sony ILCE-7 (DCP)
- - Sony ILCE-7C (DCP)
- - Sony ILCE-7M4
- - Sony ILCE-7RM2
- - Sony ILCE-7S
- - Sony ILCE-7SM2
- - Sony ILCE-7SM3 (DCP)
- - Sony ZV-1
+- The path template for queue export supports more format specifiers, including dates and new path types. Additionally, there is a preview to show the path for the selected image.
+- The maximum zoom for the editor is now configurable.
+- Pseudo HiDPI is replaced by real HiDPI.
+- The file browser has an option to show all images within subfolders too.
+- The Use embedded option for the Input Profile is available for DNGs that have an embedded DCP.
+- The Color appearance sub-tool in Selective Editing (formerly Local Adjustments) received various improvements, including simplification of the basic mode, addition of new tone mappers for Cam16, a black and white mode, and a highlight attenuation feature.
+- The White balance Tint range is expanded.
+- It is now possible to use Contrast by Detail Levels in Before Black-and-White mode while Color Appearance & Lighting is activated with CAM16.
+- Ratings and color labels can be synchronized with XMPs.
+- The Selective Editing tool received various improvements, such as a global mode for applying edits to the entire image uniformly, ΔE preview buttons for most sub-tools, and adjustable graduated filter feathering for each sub-tool.
+- The EXIF modified date-time is now added to saved images.
+- RawTherapee can now read 12-bit Panasonic raw files encoded in the v6 format, such as those from the DC-GH5M2.
+- RawTherapee can now read Panasonic raw files encoded in the v8 format, such as those from the DC-GH6, DC-S5M2, and DC-S5M2X.
+- RawTherapee can now read Fujifilm lossy-compressed raw files.
+- JPEG XL images can now be opened.
+- There is a new option to use lens corrections from the file metadata. It works for compatible raw images from Fujifilm, Olympus / OM Digital Solutions (distortion and chromatic aberration corrections only), and Sony. Corrections embedded in DNGs can also be used.
+- RawTherapee can leverage LibRaw (enabled by default) to read raw images. It adds the ability to read additional raw formats, such as Sony lossless compression, and improved support for some cameras.
+- Added or improved support for cameras, raw formats and color profiles (not including LibRaw and color matrices for dcraw):
+ - FUJIFILM GFX 100 (PDAF lines filter)
+ - FUJIFILM GFX 100S (DCP, PDAF lines filter)
+ - FUJIFILM GFX 100 II (PDAF lines filter)
+ - Fujifilm X-H2S
+ - Nikon Z 8 (DCP)
+ - Nikon Z 9 (DCP)
+ - Nikon Z f (DCP)
+ - OM Digital Solutions TG-7
+ - Panasonic DC-G9M2
+ - Panasonic DC-GH5M2
+ - Panasonic DC-GH6
+ - Panasonic DC-S5M2
+ - Panasonic DC-S5M2X
+ - Sony ILCE-1 (Pixel shift)
+ - Sony ILCE-6700
+ - Sony ILCE-7CR (PDAF lines filter)
+ - Sony ILCE-7RM4 (PDAF lines filter)
+ - Sony ILCE-7RM5 (PDAF lines filter)
+ - SONY ILCE-9M3
NEWS RELEVANT TO PACKAGE MAINTAINERS
-New since 5.9:
-- Dependency on Exiv2 >= 0.24.
+New since 5.10:
+- Requires GTK+ >= 3.24.3 (was >= 3.22.24 in Windows, or >= 3.16 in other operating systems).
+- Requires librsvg-2.0 >= 2.52 (was >= 2.40).
+- Optional dependency on libjxl.
+- Optional dependency on LibRaw >= 0.21.
In general:
-- To get the source code, either clone from git or use the tarball from https://rawtherapee.com/shared/source/ . Do not use the auto-generated GitHub release tarballs.
-- Requires GTK+ version >=3.22.24 in Windows, else >=3.16 (though >=3.22.24 is recommended).
-- GTK+ versions 3.24.2 - 3.24.6 have an issue where combobox menu scroll-arrows are missing when the combobox list does not fit vertically on the screen. As a result, users would not be able to scroll in the following comboboxes: Processing Profiles, Film Simulation, and the camera and lens profiles in Profiled Lens Correction.
+- To get the source code, either clone from git or use the tarball from https://rawtherapee.com/shared/source/. Do not use the auto-generated GitHub release tarballs.
+- Requires GTK+ version >= 3.24.3.
+- GTK+ versions 3.24.3 - 3.24.6 have an issue where combobox menu scroll-arrows are missing when the combobox list does not fit vertically on the screen. As a result, users would not be able to scroll in the following comboboxes: Processing Profiles, Film Simulation, and the camera and lens profiles in Profiled Lens Correction.
+- JPEG XL read support depends on libjxl. By default, RawTherapee builds with JPEG XL support if and only if libjxl is present. Use -DWITH_JXL="ON" or DWITH_JXL="OFF" to explicitly enable or disable, respectively, JPEG XL support.
+- RawTherapee builds with a custom version of LibRaw by default. To use the system LibRaw, use -DWITH_SYSTEM_LIBRAW="ON". Requires LibRaw >= 0.21.
- RawTherapee 5 requires GCC-4.9 or higher, or Clang.
- Do not use -ffast-math, it will not make RawTherapee faster but will introduce artifacts.
- Use -O3, it will make RawTherapee faster with no known side-effects.
diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake
index b0c2bdff6..350adc071 100644
--- a/UpdateInfo.cmake
+++ b/UpdateInfo.cmake
@@ -100,15 +100,15 @@ if(WIN32)
if(BIT_DEPTH EQUAL 4)
set(BUILD_BIT_DEPTH 32)
# 32 bits builds has to be installable on 64 bits system, to support WinXP/64.
- set(ARCHITECTURE_ALLOWED "x86 x64 ia64")
+ set(ARCHITECTURE_ALLOWED "x86 x64")
# installing in 32 bits mode even on 64 bits OS and architecture
set(INSTALL_MODE "")
elseif(BIT_DEPTH EQUAL 8)
set(BUILD_BIT_DEPTH 64)
# Restricting the 64 bits builds to 64 bits systems only
- set(ARCHITECTURE_ALLOWED "x64 ia64 arm64")
+ set(ARCHITECTURE_ALLOWED "x64 arm64")
# installing in 64 bits mode for all 64 bits processors, even for itanium architecture
- set(INSTALL_MODE "x64 ia64 arm64")
+ set(INSTALL_MODE "x64 arm64")
endif()
# set part of the output archive name
set(SYSTEM_NAME "WinVista")
diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
index 7e30dc2f8..585d265ff 100644
--- a/com.rawtherapee.RawTherapee.appdata.xml
+++ b/com.rawtherapee.RawTherapee.appdata.xml
@@ -22,6 +22,7 @@
https://rawpedia.rawtherapee.com/Main_Page#Localization
rawtherapee.desktop
+
diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt
index eb4b5e934..7ed0d95c7 100644
--- a/rtdata/CMakeLists.txt
+++ b/rtdata/CMakeLists.txt
@@ -3,14 +3,11 @@ file(GLOB SOUNDFILES "sounds/*")
file(GLOB INPUTICCFILES "iccprofiles/input/*")
file(GLOB OUTPUTICCFILES "iccprofiles/output/*")
file(GLOB DCPFILES "dcpprofiles/*")
-file(GLOB FONTS "fonts/*")
set(PROFILESDIR "profiles")
set(THEMEDIR "themes")
-
-file(GLOB IMG_SVG LIST_DIRECTORIES false "images/svg/*")
-file(GLOB IMG_PNG LIST_DIRECTORIES false "images/png/*")
-file(GLOB IMG_ICO LIST_DIRECTORIES false "images/*")
+set(ICONTHEMEDIR "icons")
+set(IMAGESDIR "images")
if(WIN32)
set(OPTIONSFILE "options/options.win")
@@ -27,14 +24,13 @@ endif()
if(UNIX)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop" DESTINATION ${DESKTOPDIR})
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-16.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-24.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-32.png" DESTINATION "${ICONSDIR}/hicolor/32x32/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-48.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-64.png" DESTINATION "${ICONSDIR}/hicolor/64x64/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-128.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/rawtherapee-logo-256.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/rt-logo.svg" DESTINATION "${ICONSDIR}/hicolor/scalable/apps" RENAME rawtherapee.svg)
+ if(BUILD_BUNDLE)
+ install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}")
+ else()
+ # For theme 'hicolor' (containing app icon), 'index.theme' shall not be installed for Linux build with 'BUILD_BUNDLE=OFF' option
+ # (to avoid conflict with existing 'index.theme' distro file)
+ install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}" PATTERN "index.theme" EXCLUDE)
+ endif()
endif()
install(FILES ${LANGUAGEFILES} DESTINATION "${DATADIR}/languages")
@@ -43,16 +39,11 @@ install(FILES ${INPUTICCFILES} DESTINATION "${DATADIR}/iccprofiles/input")
install(FILES ${OUTPUTICCFILES} DESTINATION "${DATADIR}/iccprofiles/output")
install(FILES ${DCPFILES} DESTINATION "${DATADIR}/dcpprofiles")
install(FILES ${OPTIONSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME options)
-if(WIN32)
- install(FILES ${FONTS} DESTINATION "${DATADIR}/fonts")
-endif()
install(DIRECTORY "${PROFILESDIR}" DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.pp3")
install(DIRECTORY "${THEMEDIR}" DESTINATION "${DATADIR}")
-
-install(FILES ${IMG_SVG} DESTINATION "${DATADIR}/images")
-install(FILES ${IMG_PNG} DESTINATION "${DATADIR}/images")
-install(FILES ${IMG_ICO} DESTINATION "${DATADIR}/images")
+install(DIRECTORY "${ICONTHEMEDIR}/rawtherapee" DESTINATION "${DATADIR}/${ICONTHEMEDIR}")
+install(DIRECTORY "${IMAGESDIR}" DESTINATION "${DATADIR}")
if(APPLE)
# CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE='
diff --git a/rtdata/dcpprofiles/NIKON Z 8.dcp b/rtdata/dcpprofiles/NIKON Z 8.dcp
new file mode 100644
index 000000000..cbd59f051
Binary files /dev/null and b/rtdata/dcpprofiles/NIKON Z 8.dcp differ
diff --git a/rtdata/dcpprofiles/NIKON Z 9.dcp b/rtdata/dcpprofiles/NIKON Z 9.dcp
new file mode 100644
index 000000000..9f644ae41
Binary files /dev/null and b/rtdata/dcpprofiles/NIKON Z 9.dcp differ
diff --git a/rtdata/dcpprofiles/NIKON Z F.dcp b/rtdata/dcpprofiles/NIKON Z F.dcp
new file mode 100644
index 000000000..f8f5c4bad
Binary files /dev/null and b/rtdata/dcpprofiles/NIKON Z F.dcp differ
diff --git a/rtdata/dcpprofiles/camera_model_aliases.json b/rtdata/dcpprofiles/camera_model_aliases.json
index 49e981121..20b0592a6 100644
--- a/rtdata/dcpprofiles/camera_model_aliases.json
+++ b/rtdata/dcpprofiles/camera_model_aliases.json
@@ -20,6 +20,8 @@
"Canon EOS 2000D": ["Canon EOS 1500D", "Canon EOS Kiss X90", "Canon EOS Rebel T7"],
"Canon EOS 4000D": ["Canon EOS 3000D", "Canon EOS Rebel T100"],
+ "FUJIFILM GFX 100": ["FUJIFILM GFX 100S", "FUJIFILM GFX100S"],
+
"MINOLTA DYNAX 5D": ["Minolta Maxxum 5D", "Minolta Alpha 5D", "Minolta Alpha Sweet"],
"MINOLTA DYNAX 7D": ["Minolta Maxxum 7D", "Minolta Alpha 7D"],
diff --git a/rtdata/fonts/DroidSansMonoSlashed.ttf b/rtdata/fonts/DroidSansMonoSlashed.ttf
deleted file mode 100644
index 8c44b47ed..000000000
Binary files a/rtdata/fonts/DroidSansMonoSlashed.ttf and /dev/null differ
diff --git a/rtdata/images/png/rawtherapee-logo-128.png b/rtdata/icons/hicolor/128x128/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-128.png
rename to rtdata/icons/hicolor/128x128/apps/rawtherapee.png
diff --git a/rtdata/images/png/rawtherapee-logo-16.png b/rtdata/icons/hicolor/16x16/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-16.png
rename to rtdata/icons/hicolor/16x16/apps/rawtherapee.png
diff --git a/rtdata/images/png/rawtherapee-logo-24.png b/rtdata/icons/hicolor/24x24/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-24.png
rename to rtdata/icons/hicolor/24x24/apps/rawtherapee.png
diff --git a/rtdata/images/png/rawtherapee-logo-256.png b/rtdata/icons/hicolor/256x256/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-256.png
rename to rtdata/icons/hicolor/256x256/apps/rawtherapee.png
diff --git a/rtdata/images/png/rawtherapee-logo-32.png b/rtdata/icons/hicolor/32x32/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-32.png
rename to rtdata/icons/hicolor/32x32/apps/rawtherapee.png
diff --git a/rtdata/images/png/rawtherapee-logo-48.png b/rtdata/icons/hicolor/48x48/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-48.png
rename to rtdata/icons/hicolor/48x48/apps/rawtherapee.png
diff --git a/rtdata/images/png/rawtherapee-logo-64.png b/rtdata/icons/hicolor/64x64/apps/rawtherapee.png
similarity index 100%
rename from rtdata/images/png/rawtherapee-logo-64.png
rename to rtdata/icons/hicolor/64x64/apps/rawtherapee.png
diff --git a/rtdata/icons/hicolor/index.theme b/rtdata/icons/hicolor/index.theme
new file mode 100644
index 000000000..1215a9989
--- /dev/null
+++ b/rtdata/icons/hicolor/index.theme
@@ -0,0 +1,48 @@
+[Icon Theme]
+Name=Hicolor
+Comment=RawTherapee app icon
+Hidden=true
+Directories=16x16/apps,24x24/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,256x256/apps,scalable/apps
+
+
+[16x16/apps]
+Size=16
+Context=ApplicationIcons
+Type=Threshold
+
+[24x24/apps]
+Size=24
+Context=ApplicationIcons
+Type=Threshold
+
+[32x32/apps]
+Size=32
+Context=ApplicationIcons
+Type=Threshold
+
+[48x48/apps]
+Size=48
+Context=ApplicationIcons
+Type=Threshold
+
+[64x64/apps]
+Size=64
+Context=ApplicationIcons
+Type=Threshold
+
+[128x128/apps]
+Size=128
+Context=ApplicationIcons
+Type=Threshold
+
+[256x256/apps]
+Size=256
+Context=ApplicationIcons
+Type=Threshold
+
+[scalable/apps]
+MinSize=16
+Size=128
+MaxSize=256
+Context=ApplicationIcons
+Type=Scalable
diff --git a/rtdata/images/rt-logo.svg b/rtdata/icons/hicolor/scalable/apps/rawtherapee.svg
similarity index 100%
rename from rtdata/images/rt-logo.svg
rename to rtdata/icons/hicolor/scalable/apps/rawtherapee.svg
diff --git a/rtdata/images/png/empty.png b/rtdata/icons/rawtherapee/24x24/apps/empty.png
similarity index 100%
rename from rtdata/images/png/empty.png
rename to rtdata/icons/rawtherapee/24x24/apps/empty.png
diff --git a/rtdata/icons/rawtherapee/index.theme b/rtdata/icons/rawtherapee/index.theme
new file mode 100644
index 000000000..1095b2219
--- /dev/null
+++ b/rtdata/icons/rawtherapee/index.theme
@@ -0,0 +1,18 @@
+[Icon Theme]
+Name=RawTherapee
+Comment=RawTherapee icon theme
+Inherits=Adwaita
+Directories=24x24/apps,scalable/apps
+
+
+[24x24/apps]
+Size=24
+Context=Applications
+Type=Threshold
+
+[scalable/apps]
+MinSize=16
+Size=128
+MaxSize=256
+Context=Applications
+Type=Scalable
diff --git a/rtdata/icons/rawtherapee/scalable/apps/add-small.svg b/rtdata/icons/rawtherapee/scalable/apps/add-small.svg
new file mode 100644
index 000000000..9d5cb01c6
--- /dev/null
+++ b/rtdata/icons/rawtherapee/scalable/apps/add-small.svg
@@ -0,0 +1,77 @@
+
+
+
+
diff --git a/rtdata/icons/rawtherapee/scalable/apps/add.svg b/rtdata/icons/rawtherapee/scalable/apps/add.svg
new file mode 100644
index 000000000..b8c21fdae
--- /dev/null
+++ b/rtdata/icons/rawtherapee/scalable/apps/add.svg
@@ -0,0 +1,74 @@
+
+
+
+
diff --git a/rtdata/images/svg/aperture.svg b/rtdata/icons/rawtherapee/scalable/apps/aperture.svg
similarity index 55%
rename from rtdata/images/svg/aperture.svg
rename to rtdata/icons/rawtherapee/scalable/apps/aperture.svg
index 5820ee283..c08244c62 100644
--- a/rtdata/images/svg/aperture.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/aperture.svg
@@ -2,68 +2,16 @@
diff --git a/rtdata/images/svg/arrow-down-small.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg
similarity index 62%
rename from rtdata/images/svg/arrow-down-small.svg
rename to rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg
index d17ba4329..2911187fc 100644
--- a/rtdata/images/svg/arrow-down-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg
@@ -2,181 +2,122 @@
diff --git a/rtdata/images/svg/save-small.svg b/rtdata/icons/rawtherapee/scalable/apps/save-small.svg
similarity index 61%
rename from rtdata/images/svg/save-small.svg
rename to rtdata/icons/rawtherapee/scalable/apps/save-small.svg
index 3398e27c8..94de504b8 100644
--- a/rtdata/images/svg/save-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/save-small.svg
@@ -2,58 +2,16 @@
diff --git a/rtdata/images/svg/save.svg b/rtdata/icons/rawtherapee/scalable/apps/save.svg
similarity index 59%
rename from rtdata/images/svg/save.svg
rename to rtdata/icons/rawtherapee/scalable/apps/save.svg
index eae40ed09..818b8d52d 100644
--- a/rtdata/images/svg/save.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/save.svg
@@ -2,60 +2,16 @@
diff --git a/rtdata/images/svg/saved-no-small.svg b/rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg
similarity index 67%
rename from rtdata/images/svg/saved-no-small.svg
rename to rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg
index 02b245aa1..20b6dfb43 100644
--- a/rtdata/images/svg/saved-no-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg
@@ -2,58 +2,16 @@
diff --git a/rtdata/images/svg/saved-yes-small.svg b/rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg
similarity index 64%
rename from rtdata/images/svg/saved-yes-small.svg
rename to rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg
index f545e9b18..3dee64650 100644
--- a/rtdata/images/svg/saved-yes-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg
@@ -2,58 +2,16 @@
diff --git a/rtdata/images/svg/trash-delete.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg
similarity index 63%
rename from rtdata/images/svg/trash-delete.svg
rename to rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg
index 7593e6001..941db86c8 100644
--- a/rtdata/images/svg/trash-delete.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg
@@ -2,228 +2,146 @@
diff --git a/rtdata/images/svg/trash-empty-show.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg
similarity index 73%
rename from rtdata/images/svg/trash-empty-show.svg
rename to rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg
index 366b15bd6..2d618c7ac 100644
--- a/rtdata/images/svg/trash-empty-show.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg
@@ -2,210 +2,146 @@
diff --git a/rtdata/images/svg/trash-empty.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg
similarity index 67%
rename from rtdata/images/svg/trash-empty.svg
rename to rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg
index 47ceae609..c943d8934 100644
--- a/rtdata/images/svg/trash-empty.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg
@@ -2,210 +2,146 @@
diff --git a/rtdata/images/svg/trash-full-show.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg
similarity index 74%
rename from rtdata/images/svg/trash-full-show.svg
rename to rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg
index 8ec3f9092..215e41a11 100644
--- a/rtdata/images/svg/trash-full-show.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg
@@ -2,211 +2,146 @@
diff --git a/rtdata/images/svg/trash-full.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-full.svg
similarity index 62%
rename from rtdata/images/svg/trash-full.svg
rename to rtdata/icons/rawtherapee/scalable/apps/trash-full.svg
index eae5920e3..07a4a1e3e 100644
--- a/rtdata/images/svg/trash-full.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-full.svg
@@ -2,211 +2,146 @@