Attachment #206505 for bug #239833

View | Details | Raw Unified | Return to bug 239833
Collapse All | Expand All

Lines 29-34 Link Here

(-)Makefile (+3 lines)
29	USE_GNOME= atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm	29	USE_GNOME= atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm
30		30
31	CMAKE_OFF= BUNDLED_LENSFUN	31	CMAKE_OFF= BUNDLED_LENSFUN
		32	.if defined(PACKAGE_BUILDING)
		33	CMAKE_ON= BINARY_PACKAGE_BUILD
		34	.endif
32		35
33	LDFLAGS+= -lexecinfo	36	LDFLAGS+= -lexecinfo
34		37

Lines 5-11 Link Here

(-)files/patch-src_CMakeLists.txt (-1 / +1 lines)
5	#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")	5	#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")
6	ELSE(MINGW)	6	ELSE(MINGW)
7	- 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")	7	- 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")
8	+ 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")	8	+ 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")
9	ENDIF(MINGW)	9	ENDIF(MINGW)
10		10
11	set(COMPILE_FLAGS " ${GMIC_FLAGS} -I${CMAKE_SOURCE_DIR}/src/dt -DLIBRAW_NODLL -DINSTALL_PREFIX='\"${INSTALL_PREFIX}\"' ")	11	set(COMPILE_FLAGS " ${GMIC_FLAGS} -I${CMAKE_SOURCE_DIR}/src/dt -DLIBRAW_NODLL -DINSTALL_PREFIX='\"${INSTALL_PREFIX}\"' ")




--- 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
   }
 

Return to bug 239833

Line 0 Link Here

(-)files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h (+17 lines)
	1	--- src/external/rawspeed/src/librawspeed/common/Mutex.h.orig 2019-08-13 19:14:10 UTC
	2	+++ src/external/rawspeed/src/librawspeed/common/Mutex.h
	3	@@ -77,12 +77,12 @@ class CAPABILITY("mutex") Mutex final { (public)
	4	// Acquire/lock this mutex exclusively. Only one thread can have exclusive
	5	// access at any one time. Write operations to guarded data require an
	6	// exclusive lock.
	7	- void __attribute__((const)) Lock() const ACQUIRE() {
	8	+ void Lock() ACQUIRE() {
	9	// NOP, since there is no mutex. only here to still check for proper locking
	10	}
	11
	12	// Release/unlock an exclusive mutex.
	13	- void __attribute__((const)) Unlock() const RELEASE() {
	14	+ void Unlock() RELEASE() {
	15	// NOP, since there is no mutex. only here to still check for proper locking
	16	}
	17