git: ddbfaf9b8ff2 - main - graphics/rawtherapee: Update 5.12 => 5.13
Yusuf Yaman <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddbfaf9b8ff239e2b7f5d37d5ab2cfa474a11077 commit ddbfaf9b8ff239e2b7f5d37d5ab2cfa474a11077 Author: Matthias Andree <[email protected]> AuthorDate: 2026-08-13 23:38:25 +0000 Commit: Yusuf Yaman <[email protected]> CommitDate: 2026-08-14 09:18:00 +0000 graphics/rawtherapee: Update 5.12 => 5.13 Extend patch for rtengine/LibRaw.cmake to properly forward our local CXXFLAGS (available through ${CMAKE_CXX_FLAGS} inside cmake) to the libraw build, else it will build against GCC's default Standard C++ Library, which might be libstdc++, which then breaks when doing the final link against the common libc++ based system (GNU libstdc++ and LLVM's libc++ have incompatible ABIs). Switch to using the system libfmt, which is version 12 and good. Changelog: https://rawtherapee.com/downloads/5.13/ PR: 297513 Reported by: mandree (maintainer) Approved by: osa, vvd (Mentors, implicit) Pull Request: https://github.com/freebsd/freebsd-ports/pull/581 --- graphics/rawtherapee/Makefile | 11 +++++++---- graphics/rawtherapee/distinfo | 6 +++--- graphics/rawtherapee/files/patch-CMakeLists.txt | 13 ------------- .../rawtherapee/files/patch-rtengine_LibRaw.cmake | 20 +++++++++++++++----- graphics/rawtherapee/pkg-plist | 6 ++---- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index aa8e4f87cf40..fbd1305a02df 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -1,6 +1,6 @@ PORTNAME= rawtherapee -PORTVERSION= 5.12 -PORTREVISION= 3 +PORTVERSION= 5.13 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= https://github.com/RawTherapee/RawTherapee/releases/download/${PORTVERSION}/ \ https://rawtherapee.com/shared/source/ \ @@ -18,6 +18,7 @@ LIB_DEPENDS= \ libexpat.so:textproc/expat2 \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ + libfmt.so:devel/libfmt \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libiptcdata.so:graphics/libiptcdata \ @@ -43,10 +44,11 @@ CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DDATADIR="${DATADIR}" \ -DCACHE_NAME_SUFFIX="" \ -Wno-dev \ + -DWITH_SYSTEM_FMT="ON" \ -DCMAKE_AR:FILEPATH=${_AR} \ -DCMAKE_RANLIB:FILEPATH=${_RANLIB} \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW -CONFIGURE_ENV+= AR=${_AR} RANLIB=${_RANLIB} # for embedded LibRaw +CONFIGURE_ENV+= AR=${_AR} RANLIB=${_RANLIB} # for embedded LibRaw # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default # any more. The CMP0056 policy must be explicitly set to NEW to ensure # linker flags are passed. Else -lomp is not found with clang. @@ -135,9 +137,9 @@ _OPT_FLAGS= -O3 -funroll-loops # x86_64/amd64 includes -msse2 by default .if ${ARCH} == i386 -# -mstackrealign: workaround for values passed on the stack that cause SIGBUS on SSE2 # -msse2: SSE2 has been around since the year 2003 latest _OPT_FLAGS+= -msse2 +# -mstackrealign: workaround for values passed on the stack that cause SIGBUS on SSE2 _OPT_FLAGS+= -mstackrealign .endif @@ -145,6 +147,7 @@ _OPT_FLAGS+= -mstackrealign .include <bsd.port.pre.mk> +# align Standard C++ Library with what every other port uses, to match ABI .if ${COMPILER_FEATURES:Mlibc++} CXXFLAGS+= -stdlib=libc++ .endif diff --git a/graphics/rawtherapee/distinfo b/graphics/rawtherapee/distinfo index 9ff354378ff8..4bcace2d303a 100644 --- a/graphics/rawtherapee/distinfo +++ b/graphics/rawtherapee/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749030819 -SHA256 (rawtherapee-5.12.tar.xz) = d9a6c10537d64a285bc465675fe59aaa94ce3223823dfbecf0ae2c9599082d57 -SIZE (rawtherapee-5.12.tar.xz) = 18306944 +TIMESTAMP = 1786659985 +SHA256 (rawtherapee-5.13.tar.xz) = 23bdff4b1817e1274c11a94b11d21cac59e9c1b1d209795d3194710ee73e77bf +SIZE (rawtherapee-5.13.tar.xz) = 19063124 diff --git a/graphics/rawtherapee/files/patch-CMakeLists.txt b/graphics/rawtherapee/files/patch-CMakeLists.txt deleted file mode 100644 index fa3770cb9380..000000000000 --- a/graphics/rawtherapee/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -Strip warnings we don't need to see as packagers: - ---- CMakeLists.txt.orig 2025-05-28 01:02:22 UTC -+++ CMakeLists.txt -@@ -662,7 +662,7 @@ set(CMAKE_CXX_FLAGS - endif() - - set(CMAKE_CXX_FLAGS -- "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wcast-qual -Wno-deprecated-declarations -Wno-unused-result -Wunused-macros" -+ "${CMAKE_CXX_FLAGS} -Wuninitialized -Wcast-qual -Wno-deprecated-declarations -Wno-unused-result" - ) - if(OPTION_OMP) - find_package(OpenMP) diff --git a/graphics/rawtherapee/files/patch-rtengine_LibRaw.cmake b/graphics/rawtherapee/files/patch-rtengine_LibRaw.cmake index 37bf0c66f12d..28e341b1630c 100644 --- a/graphics/rawtherapee/files/patch-rtengine_LibRaw.cmake +++ b/graphics/rawtherapee/files/patch-rtengine_LibRaw.cmake @@ -1,9 +1,20 @@ ---- rtengine/LibRaw.cmake.orig 2025-05-28 01:02:22 UTC +--- rtengine/LibRaw.cmake.orig 2026-07-25 22:58:00 UTC +++ rtengine/LibRaw.cmake -@@ -33,6 +33,27 @@ execute_process( +@@ -28,7 +28,8 @@ set(CONFIGURE_FLAGS "--disable-examples") + + # Configuration flags. + set(CONFIGURE_FLAGS "--disable-examples") +-set(LIBRAW_CXX_FLAGS "${CXX_FLAGS} -std=gnu++11 -Wno-error=unknown-pragmas") ++set(LIBRAW_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS} -std=gnu++11 -Wno-error=unknown-pragmas") ++message("LIBRAW_CXX_FLAGS: ${LIBRAW_CXX_FLAGS}, ENV: $ENV{CXXFLAGS}") + # Let the configure script handle OpenMP flags. + string(REPLACE "${OpenMP_CXX_FLAGS}" "" LIBRAW_CXX_FLAGS "${LIBRAW_CXX_FLAGS}") + if(OPTION_OMP) +@@ -42,6 +43,27 @@ message(STATUS "Configuring LibRaw") + # Configuration commands. message(STATUS "Configuring LibRaw") - execute_process( ++execute_process( + COMMAND pkg-config --cflags-only-I libjpeg + RESULT_VARIABLE PROCESS_RESULT + OUTPUT_VARIABLE JPEG_BIGI_FLAGS @@ -24,7 +35,6 @@ +message(STATUS "libjpeg flags (from pkg-config): CFLAGS=\"${JPEG_BIGI_FLAGS}\" LIBS=\"${JPEG_BIGL_FLAGS}\"") +set(CONFIGURE_FLAGS "${CONFIGURE_FLAGS} CFLAGS=\"${CFLAGS} ${JPEG_BIGI_FLAGS}\"") +set(CONFIGURE_FLAGS "${CONFIGURE_FLAGS} LIBS=\"${LIBS} ${JPEG_BIGL_FLAGS}\"") -+execute_process( + execute_process( COMMAND cp -p -R "${CMAKE_CURRENT_SOURCE_DIR}/libraw" . WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - RESULT_VARIABLE PROCESS_RESULT diff --git a/graphics/rawtherapee/pkg-plist b/graphics/rawtherapee/pkg-plist index f535e30e1386..dc1286a7ee2c 100644 --- a/graphics/rawtherapee/pkg-plist +++ b/graphics/rawtherapee/pkg-plist @@ -495,13 +495,9 @@ share/metainfo/com.rawtherapee.RawTherapee.appdata.xml %%DATADIR%%/icons/rawtherapee/scalable/apps/square-toggle-theme-on-narrow.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/square-toggle-white-off-narrow.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/square-toggle-white-on-narrow.svg -%%DATADIR%%/icons/rawtherapee/scalable/apps/star-gold-hollow-narrow.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/star-gold-hollow-small.svg -%%DATADIR%%/icons/rawtherapee/scalable/apps/star-gold-narrow.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/star-gold-small.svg -%%DATADIR%%/icons/rawtherapee/scalable/apps/star-hollow-narrow.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/star-hollow-small.svg -%%DATADIR%%/icons/rawtherapee/scalable/apps/star-narrow.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/star-small.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/star.svg %%DATADIR%%/icons/rawtherapee/scalable/apps/template-16.svg @@ -572,8 +568,10 @@ share/metainfo/com.rawtherapee.RawTherapee.appdata.xml %%DATADIR%%/languages/Espanol (Castellano) %%DATADIR%%/languages/Espanol (Latin America) %%DATADIR%%/languages/Francais +%%DATADIR%%/languages/Hebrew %%DATADIR%%/languages/Italiano %%DATADIR%%/languages/Japanese +%%DATADIR%%/languages/Korean %%DATADIR%%/languages/LICENSE %%DATADIR%%/languages/Magyar %%DATADIR%%/languages/Nederlands