Index: head/graphics/photoflow/Makefile
===================================================================
--- head/graphics/photoflow/Makefile	(revision 510093)
+++ head/graphics/photoflow/Makefile	(revision 510094)
@@ -1,47 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	photoflow
 DISTVERSION=	0.2.8-1260
 PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Non-destructive photo retouching program
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	see https://github.com/aferrero2707/PhotoFlow/issues/192
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libfftw3.so:math/fftw3 \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		libtiff.so:graphics/tiff \
 		libpugixml.so:textproc/pugixml \
 		libvips.so:graphics/vips
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext gnome jpeg pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	aferrero2707
 GH_PROJECT=	PhotoFlow
 GH_TAGNAME=	da84a071
 USE_GNOME=	atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm
 
 CMAKE_OFF=	BUNDLED_LENSFUN
+#Disable optimization for the builder CPU when building official packages
+.if defined(PACKAGE_BUILDING)
+CMAKE_ON=	BINARY_PACKAGE_BUILD
+.endif
 
 LDFLAGS+=	-lexecinfo
 
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		OCIO
 OPTIONS_DEFAULT=	OCIO
 OPTIONS_SUB=		yes
 
 OCIO_DESC=		Enable the integration of OpenColorIO
 OCIO_CMAKE_BOOL=	OCIO_ENABLED
 OCIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
 OCIO_VARS=		GH_TUPLE+=sobotka:filmic-blender:1.1.1:fb/../.build/data/filmic-blender \
 			GH_TUPLE+=imageworks:OpenColorIO-Configs:0bb079c08be410030669cbf5f19ff869b88af953:c/../.build/data/ocio-configs
 
 .include <bsd.port.mk>
Index: head/graphics/photoflow/files/patch-src_CMakeLists.txt
===================================================================
--- head/graphics/photoflow/files/patch-src_CMakeLists.txt	(revision 510093)
+++ head/graphics/photoflow/files/patch-src_CMakeLists.txt	(revision 510094)
@@ -1,20 +1,20 @@
 --- src/CMakeLists.txt.orig	2019-06-07 16:05:32 UTC
 +++ src/CMakeLists.txt
 @@ -5,7 +5,7 @@ ELSEIF(APPLE)
    SET(GMIC_FLAGS "-march=nocona -mno-sse3 -mtune=generic -Dgmic_build -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive")
    #SET(GMIC_FLAGS "-Wno-error=c++11-narrowing -Dgmic_build -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive")
  ELSE(MINGW)
 -  SET(GMIC_FLAGS "-std=gnu++11 -march=nocona -mno-sse3 -mtune=generic -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fno-ipa-sra -fpermissive")
-+  SET(GMIC_FLAGS "-std=gnu++11 -march=nocona -mno-sse3 -mtune=generic -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fpermissive")
++  SET(GMIC_FLAGS "-std=gnu++11 -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fpermissive")
  ENDIF(MINGW)
  
  set(COMPILE_FLAGS " ${GMIC_FLAGS} -I${CMAKE_SOURCE_DIR}/src/dt -DLIBRAW_NODLL -DINSTALL_PREFIX='\"${INSTALL_PREFIX}\"' ")
 @@ -482,7 +482,7 @@ ENDIF(APPLE)
  #
  # photoflow executable
  #
 -add_executable(photoflow main.cc ${RESOURCE_OBJECT})
 +add_executable(photoflow main.cc version.cc ${RESOURCE_OBJECT}) # https://github.com/aferrero2707/PhotoFlow/issues/190
  IF(APPLE)
    set_target_properties(photoflow PROPERTIES LINK_FLAGS " -framework ApplicationServices ")
  ENDIF(APPLE)
Index: head/graphics/photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h
===================================================================
--- head/graphics/photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h	(nonexistent)
+++ head/graphics/photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h	(revision 510094)
@@ -0,0 +1,17 @@
+--- src/external/rawspeed/src/librawspeed/common/Mutex.h.orig	2019-08-13 19:14:10 UTC
++++ src/external/rawspeed/src/librawspeed/common/Mutex.h
+@@ -77,12 +77,12 @@ class CAPABILITY("mutex") Mutex final { (public)
+   // Acquire/lock this mutex exclusively.  Only one thread can have exclusive
+   // access at any one time.  Write operations to guarded data require an
+   // exclusive lock.
+-  void __attribute__((const)) Lock() const ACQUIRE() {
++  void Lock() ACQUIRE() {
+     // NOP, since there is no mutex. only here to still check for proper locking
+   }
+ 
+   // Release/unlock an exclusive mutex.
+-  void __attribute__((const)) Unlock() const RELEASE() {
++  void Unlock() RELEASE() {
+     // NOP, since there is no mutex. only here to still check for proper locking
+   }
+ 

Property changes on: head/graphics/photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property