On Tue, January 12, 2016 01:42, Kirill Bychkov wrote: > On Mon, January 11, 2016 23:32, Daniel Jakots wrote: >> On Sun, 27 Dec 2015 21:02:55 +0300, "Kirill Bychkov" >> <ki...@linklevel.net> wrote: >> >>> > Here's an update to 4.2 (which was release more than a year ago). >>> > I >>> >>> I've a similar diff for a long time sitting in my tree. IIRC 4.2 is >>> broken on i386. >>> I'll check if this problem remains. >> >> So I finally built it on my i386 build machine and it built fine, I >> didn't try to run it though as I don't have any screen for it. > > > The problem was at the runtime. Sorry, didn't test it yet because I have some > problems with my i386. > >> >> Cheers, >> Daniel >>
I've made some tests on i386 and it's a PITA to use rawtherapee on it. Even if following upstream recommendations about 32-bit archs http://50.87.144.65/~rt/w/index.php?title=The_Floating_Point_Engine So I suggest to set ONLY_FOR_ARCHS=amd64. And yes, it still needs -std=c++11 and gcc4 module. Any objections? OKs? Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 29 Sep 2015 09:02:21 -0000 1.13 +++ Makefile 27 Jan 2016 09:12:38 -0000 @@ -1,12 +1,13 @@ # $OpenBSD: Makefile,v 1.13 2015/09/29 09:02:21 ajacoutot Exp $ +ONLY_FOR_ARCHS = amd64 + # XXX check if still needed at next update CXXFLAGS += -std=c++11 COMMENT = RAW image processing application -DISTNAME = rawtherapee-4.1 -REVISION = 2 +DISTNAME = rawtherapee-4.2 CATEGORIES = graphics Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 10 Jul 2014 08:27:49 -0000 1.2 +++ distinfo 27 Jan 2016 09:12:38 -0000 @@ -1,2 +1,2 @@ -SHA256 (rawtherapee-4.1.tar.xz) = Cjb+QH2sqVoG8tPuKOyRycDJXWKpEhS9Z6l/2FSTgwc= -SIZE (rawtherapee-4.1.tar.xz) = 7670916 +SHA256 (rawtherapee-4.2.tar.xz) = +kwT6IQt8JaxnS2rrtWmH1+dRUf3tPDca3f4C97BZHk= +SIZE (rawtherapee-4.2.tar.xz) = 7787664 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -p -r1.2 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 10 Jul 2014 08:27:49 -0000 1.2 +++ patches/patch-CMakeLists_txt 27 Jan 2016 09:12:38 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2014/07/10 08:27:49 kirby Exp $ ---- CMakeLists.txt.orig Wed Jul 9 03:04:12 2014 -+++ CMakeLists.txt Wed Jul 9 03:04:34 2014 -@@ -348,7 +348,7 @@ install (FILES LICENSE.txt DESTINATION "${LICENCEDIR}" - install (FILES "${CMAKE_BINARY_DIR}/AboutThisBuild.txt" DESTINATION "${CREDITSDIR}") - install (FILES RELEASE_NOTES.txt DESTINATION "${CREDITSDIR}" OPTIONAL) +--- CMakeLists.txt.orig Fri Oct 24 23:03:26 2014 ++++ CMakeLists.txt Sat Oct 25 13:43:00 2014 +@@ -357,7 +357,7 @@ if (WIN32) + install (DIRECTORY "licenses" DESTINATION "${LICENCEDIR}") + endif (WIN32) if (UNIX) - install (FILES "${PROJECT_SOURCE_DIR}/doc/manpage/rawtherapee.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1") + install (FILES "${PROJECT_SOURCE_DIR}/doc/manpage/rawtherapee.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") + install (FILES rawtherapee.appdata.xml DESTINATION "${APPDATADIR}") endif (UNIX) - add_subdirectory (rtexif) Index: patches/patch-rtengine_CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/patches/patch-rtengine_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -r1.2 patch-rtengine_CMakeLists_txt --- patches/patch-rtengine_CMakeLists_txt 10 Jul 2014 08:27:49 -0000 1.2 +++ patches/patch-rtengine_CMakeLists_txt 27 Jan 2016 09:12:38 -0000 @@ -1,10 +1,11 @@ $OpenBSD: patch-rtengine_CMakeLists_txt,v 1.2 2014/07/10 08:27:49 kirby Exp $ Fix dependencies to please Ninja. +commited rev 3341a2573a5e ---- rtengine/CMakeLists.txt.orig Wed May 21 17:06:28 2014 -+++ rtengine/CMakeLists.txt Tue May 27 11:05:02 2014 -@@ -27,6 +27,8 @@ set (RTENGINESOURCEFILES safegtk.cc colortemp.cc curve +--- rtengine/CMakeLists.txt.orig Fri Oct 24 23:03:26 2014 ++++ rtengine/CMakeLists.txt Sat Oct 25 13:41:39 2014 +@@ -28,6 +28,8 @@ set (RTENGINESOURCEFILES safegtk.cc colortemp.cc curve include_directories (BEFORE "${CMAKE_CURRENT_BINARY_DIR}") add_library (rtengine ${RTENGINESOURCEFILES}) Index: patches/patch-rtexif_CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/patches/patch-rtexif_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-rtexif_CMakeLists_txt --- patches/patch-rtexif_CMakeLists_txt 10 Jul 2014 08:27:49 -0000 1.1 +++ patches/patch-rtexif_CMakeLists_txt 27 Jan 2016 09:12:38 -0000 @@ -1,6 +1,7 @@ $OpenBSD: patch-rtexif_CMakeLists_txt,v 1.1 2014/07/10 08:27:49 kirby Exp $ Fix dependencies to please Ninja. +commited rev 3341a2573a5e --- rtexif/CMakeLists.txt.orig Tue Jul 8 19:39:13 2014 +++ rtexif/CMakeLists.txt Tue Jul 8 19:40:06 2014 Index: patches/patch-rtgui_CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/patches/patch-rtgui_CMakeLists_txt,v retrieving revision 1.3 diff -u -p -r1.3 patch-rtgui_CMakeLists_txt --- patches/patch-rtgui_CMakeLists_txt 10 Jul 2014 08:27:49 -0000 1.3 +++ patches/patch-rtgui_CMakeLists_txt 27 Jan 2016 09:12:38 -0000 @@ -1,10 +1,11 @@ $OpenBSD: patch-rtgui_CMakeLists_txt,v 1.3 2014/07/10 08:27:49 kirby Exp $ Fix dependencies to please Ninja. +commited rev 3341a2573a5e ---- rtgui/CMakeLists.txt.orig Wed May 21 17:06:28 2014 -+++ rtgui/CMakeLists.txt Wed May 28 14:38:11 2014 -@@ -59,11 +59,12 @@ endif (WIN32) +--- rtgui/CMakeLists.txt.orig Fri Oct 24 23:03:26 2014 ++++ rtgui/CMakeLists.txt Sat Oct 25 13:41:39 2014 +@@ -61,11 +61,12 @@ endif (WIN32) configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") add_executable (rth ${EXTRA_SRC} ${BASESOURCEFILES}) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/rawtherapee/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 10 Jul 2014 08:27:49 -0000 1.3 +++ pkg/PLIST 27 Jan 2016 09:12:38 -0000 @@ -1,6 +1,8 @@ @comment $OpenBSD: PLIST,v 1.3 2014/07/10 08:27:49 kirby Exp $ @bin bin/rawtherapee @man man/man1/rawtherapee.1 +share/appdata/ +share/appdata/rawtherapee.appdata.xml share/applications/rawtherapee.desktop share/doc/rawtherapee/ share/doc/rawtherapee/AUTHORS.txt @@ -110,6 +112,7 @@ share/rawtherapee/images/Chanmixer-B.png share/rawtherapee/images/Chanmixer-BB.png share/rawtherapee/images/Chanmixer-BG.png share/rawtherapee/images/Chanmixer-BR.png +share/rawtherapee/images/Chanmixer-BY.png share/rawtherapee/images/Chanmixer-C.png share/rawtherapee/images/Chanmixer-G.png share/rawtherapee/images/Chanmixer-GB.png
