Page MenuHomeFreeBSD
Files F160805952

D21285.id61421.diff
No OneTemporary
Actions

D21285.id61421.diff
View Options

Index: head/graphics/photoflow/Makefile
===================================================================
--- head/graphics/photoflow/Makefile
+++ head/graphics/photoflow/Makefile
@@ -29,6 +29,10 @@
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
Index: head/graphics/photoflow/files/patch-src_CMakeLists.txt
===================================================================
--- head/graphics/photoflow/files/patch-src_CMakeLists.txt
+++ head/graphics/photoflow/files/patch-src_CMakeLists.txt
@@ -5,7 +5,7 @@
#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}\"' ")
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
+++ head/graphics/photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h
@@ -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
+ }
+

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 29, 2:06 AM (8 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34448854
Default Alt Text
D21285.id61421.diff (2 KB)

Event Timeline