On Sun, December 27, 2015 16:55, Daniel Jakots wrote:
> Hi,
>
Hi,
> 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.
> tried to comment CXXFLAGS in the Makefile but it failed so I guess it's
> still needed.
>
> I edited a couple of raw with it without problem.
>
> Cheers,
> Daniel
>
>
> 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 Dec 2015 13:40:14 -0000
> @@ -5,8 +5,7 @@ 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 Dec 2015 13:40:14 -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 Dec 2015 13:40:14 -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 21:03:26 2014
> ++++ CMakeLists.txt Sun Dec 27 13:45:24 2015
> +@@ -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 Dec 2015 13:40:14 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-rtengine_CMakeLists_txt,
>
> Fix dependencies to please Ninja.
>
> ---- 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 21:03:26 2014
> ++++ rtengine/CMakeLists.txt Sun Dec 27 13:37:02 2015
> +@@ -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-rtengine_dcraw_cc
> ===================================================================
> RCS file: /cvs/ports/graphics/rawtherapee/patches/patch-rtengine_dcraw_cc,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-rtengine_dcraw_cc
> --- patches/patch-rtengine_dcraw_cc 29 Sep 2015 09:02:21 -0000 1.3
> +++ patches/patch-rtengine_dcraw_cc 27 Dec 2015 13:40:14 -0000
> @@ -5,8 +5,8 @@ Fix build with libsigc++ >= 2.6
> dcraw input sanitization errors, CVE-2015-3885
> Commit ID 0440e663ae7f44a63420460dcb07cfbe0ba8ea42
>
> ---- rtengine/dcraw.cc.orig Wed May 21 15:06:28 2014
> -+++ rtengine/dcraw.cc Tue Sep 29 10:21:32 2015
> +--- rtengine/dcraw.cc.orig Fri Oct 24 21:03:26 2014
> ++++ rtengine/dcraw.cc Sun Dec 27 13:37:02 2015
> @@ -134,13 +134,13 @@ const float d65_white[3] = { 0.950456, 1, 1.088754 };
> #define FORC4 FORC(4)
> #define FORCC FORC(colors)
> @@ -27,7 +27,7 @@ Commit ID 0440e663ae7f44a63420460dcb07cf
> #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }
>
> /*
> -@@ -789,7 +789,8 @@ struct jhead {
> +@@ -787,7 +787,8 @@ struct jhead {
>
> int CLASS ljpeg_start (struct jhead *jh, int info_only)
> {
> 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 Dec 2015 13:40:14 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-rtgui_CMakeLists_txt,v 1
>
> Fix dependencies to please Ninja.
>
> ---- 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 21:03:26 2014
> ++++ rtgui/CMakeLists.txt Sun Dec 27 13:37:02 2015
> +@@ -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 Dec 2015 13:40:15 -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
>
