From 2421a39e161d72ace1dd8c1073fc5e9d0c91bf1f Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 15 Mar 2021 20:15:09 +0000
Subject: [PATCH] darktable: drop -O3, from Brad

---
 graphics/darktable/Makefile                   |  3 ++-
 .../patches/patch-src_CMakeLists_txt          | 20 +++++++++++++++++--
 ...ternal_rawspeed_cmake_compiler-flags_cmake | 11 ++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 graphics/darktable/patches/patch-src_external_rawspeed_cmake_compiler-flags_cmake

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 0b37a7ed1cf..7a5593ba584 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.108 2021/02/13 16:55:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.109 2021/03/15 20:15:09 sthen Exp $
 
 ONLY_FOR_ARCHS=	amd64 aarch64
 
@@ -6,6 +6,7 @@ COMMENT=	virtual lighttable and darkroom for photographers
 
 V=		3.4.1
 DISTNAME=	darktable-$V
+REVISION=	0
 PORTROACH=	limitw:1,even skipv:release-$V
 EXTRACT_SUFX=	.tar.xz
 
diff --git a/graphics/darktable/patches/patch-src_CMakeLists_txt b/graphics/darktable/patches/patch-src_CMakeLists_txt
index 80a663295e1..d83cb347d9d 100644
--- a/graphics/darktable/patches/patch-src_CMakeLists_txt
+++ b/graphics/darktable/patches/patch-src_CMakeLists_txt
@@ -1,9 +1,25 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.5 2021/02/07 22:13:21 sthen Exp $
+$OpenBSD: patch-src_CMakeLists_txt,v 1.6 2021/03/15 20:15:10 sthen Exp $
 
 Index: src/CMakeLists.txt
 --- src/CMakeLists.txt.orig
 +++ src/CMakeLists.txt
-@@ -882,7 +882,6 @@ endif()
+@@ -579,7 +579,6 @@ if(NOT CUSTOM_CFLAGS)
+   # also, in IOPs, in-loops branches could be forced to be compiled as different loops variants
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
+   set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2")
+-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
+   if(CMAKE_COMPILER_IS_GNUCC)
+     if(BUILD_SSE2_CODEPATHS)
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
+@@ -593,7 +592,6 @@ if(NOT CUSTOM_CFLAGS)
+ 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2")
+-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     if(BUILD_SSE2_CODEPATHS)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
+@@ -882,7 +880,6 @@ endif()
  
  target_link_libraries(lib_darktable PUBLIC ${STATIC_LIBS})
  target_link_libraries(lib_darktable PRIVATE rawspeed)
diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_cmake_compiler-flags_cmake b/graphics/darktable/patches/patch-src_external_rawspeed_cmake_compiler-flags_cmake
new file mode 100644
index 00000000000..fc64c7d4ab2
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_cmake_compiler-flags_cmake
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_external_rawspeed_cmake_compiler-flags_cmake,v 1.1 2021/03/15 20:15:10 sthen Exp $
+
+Index: src/external/rawspeed/cmake/compiler-flags.cmake
+--- src/external/rawspeed/cmake/compiler-flags.cmake.orig
++++ src/external/rawspeed/cmake/compiler-flags.cmake
+@@ -223,5 +223,3 @@ MARK_AS_ADVANCED(
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2")
+ 
+-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
+-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")