Attachment #209125 for bug #241938

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




# $FreeBSD$

PORTNAME=	photoflow
DISTVERSION=	0.2.8-1398
PORTREVISION=	2
CATEGORIES=	graphics

MAINTAINER=	yuri@FreeBSD.org

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

BROKEN=		no matching function for call to 'vips_image_get_blob'
BROKEN_i386=	see https://github.com/aferrero2707/PhotoFlow/issues/192

LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \

USE_GITHUB=	yes
GH_ACCOUNT=	aferrero2707
GH_PROJECT=	PhotoFlow
GH_TAGNAME=	d92c3989
USE_GNOME=	atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm

CMAKE_OFF=	BUNDLED_LENSFUN

Lines 1-6 Link Here

(-)photoflow/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1560191008	1	TIMESTAMP = 1573631919
2	SHA256 (aferrero2707-PhotoFlow-0.2.8-1260-da84a071_GH0.tar.gz) = 6553848199f1a57f67e64c3414cdd61e74e497ef4476ea4d3df637f1e1304d32	2	SHA256 (aferrero2707-PhotoFlow-0.2.8-1398-d92c3989_GH0.tar.gz) = 0cf5aa91d1e08ebcfe4db79c20750fdfa53fbb13142996b66db42682a6f16918
3	SIZE (aferrero2707-PhotoFlow-0.2.8-1260-da84a071_GH0.tar.gz) = 10119031	3	SIZE (aferrero2707-PhotoFlow-0.2.8-1398-d92c3989_GH0.tar.gz) = 11827728
4	SHA256 (sobotka-filmic-blender-1.1.1_GH0.tar.gz) = 87efcadfac0edbcdd6e4612ff8451dee12e42699830d17505de0d8593788ee95	4	SHA256 (sobotka-filmic-blender-1.1.1_GH0.tar.gz) = 87efcadfac0edbcdd6e4612ff8451dee12e42699830d17505de0d8593788ee95
5	SIZE (sobotka-filmic-blender-1.1.1_GH0.tar.gz) = 3071707	5	SIZE (sobotka-filmic-blender-1.1.1_GH0.tar.gz) = 3071707
6	SHA256 (imageworks-OpenColorIO-Configs-0bb079c08be410030669cbf5f19ff869b88af953_GH0.tar.gz) = 26dcda1bf6b871b74e67de8046eb78061f167e5d41c23cb151a120818feeb70d	6	SHA256 (imageworks-OpenColorIO-Configs-0bb079c08be410030669cbf5f19ff869b88af953_GH0.tar.gz) = 26dcda1bf6b871b74e67de8046eb78061f167e5d41c23cb151a120818feeb70d

Lines 1-6 Link Here

(-)photoflow/files/patch-data_CMakeLists.txt (-2 / +2 lines)
1	--- data/CMakeLists.txt.orig 2019-06-10 18:18:22 UTC	1	--- data/CMakeLists.txt.orig 2019-11-10 21:19:31 UTC
2	+++ data/CMakeLists.txt	2	+++ data/CMakeLists.txt
3	@@ -9,30 +9,30 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/photoflow.de	3	@@ -10,30 +10,30 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/photoflow.ap
4	if (OpenColorIO_FOUND)	4	if (OpenColorIO_FOUND)
5	include(ExternalProject)	5	include(ExternalProject)
6		6




--- src/CMakeLists.txt.orig	2019-11-10 21:19:31 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++14 -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++14 -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}\"' ")
@@ -542,7 +542,7 @@ ENDIF(APPLE)
 #
 # photoflow executable
 #




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

Lines 12-17 Link Here

(-)photoflow/pkg-plist (+1 lines)
12	share/locale/de/LC_MESSAGES/photoflow.mo	12	share/locale/de/LC_MESSAGES/photoflow.mo
13	share/locale/fr/LC_MESSAGES/photoflow.mo	13	share/locale/fr/LC_MESSAGES/photoflow.mo
14	share/locale/pl/LC_MESSAGES/photoflow.mo	14	share/locale/pl/LC_MESSAGES/photoflow.mo
		15	share/metainfo/photoflow.appdata.xml
15	%%DATADIR%%/gmic_def.gmic	16	%%DATADIR%%/gmic_def.gmic
16	%%DATADIR%%/gmic_film_cluts.gmz	17	%%DATADIR%%/gmic_film_cluts.gmz
17	%%DATADIR%%/help/en/clone_stamp.hlp	18	%%DATADIR%%/help/en/clone_stamp.hlp

Return to bug 241938

Lines 1-8 Link Here

(-)photoflow/Makefile (-4 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= photoflow	3	PORTNAME= photoflow
4	DISTVERSION= 0.2.8-1260	4	DISTVERSION= 0.2.8-1398
5	PORTREVISION= 2
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7		6
8	MAINTAINER= yuri@FreeBSD.org	7	MAINTAINER= yuri@FreeBSD.org
Lines 11-17 Link Here
11	LICENSE= GPLv3	10	LICENSE= GPLv3
12	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
13		12
14	BROKEN= no matching function for call to 'vips_image_get_blob'
15	BROKEN_i386= see https://github.com/aferrero2707/PhotoFlow/issues/192	13	BROKEN_i386= see https://github.com/aferrero2707/PhotoFlow/issues/192
16		14
17	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \	15	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
Lines 26-32 Link Here
26	USE_GITHUB= yes	24	USE_GITHUB= yes
27	GH_ACCOUNT= aferrero2707	25	GH_ACCOUNT= aferrero2707
28	GH_PROJECT= PhotoFlow	26	GH_PROJECT= PhotoFlow
29	GH_TAGNAME= da84a071	27	GH_TAGNAME= d92c3989
30	USE_GNOME= atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm	28	USE_GNOME= atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm
31		29
32	CMAKE_OFF= BUNDLED_LENSFUN	30	CMAKE_OFF= BUNDLED_LENSFUN

Lines 1-15 Link Here

(-)photoflow/files/patch-src_CMakeLists.txt (-4 / +4 lines)
1	--- src/CMakeLists.txt.orig 2019-06-07 16:05:32 UTC	1	--- src/CMakeLists.txt.orig 2019-11-10 21:19:31 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -5,7 +5,7 @@ ELSEIF(APPLE)	3	@@ -5,7 +5,7 @@ ELSEIF(APPLE)
4	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")	4	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")
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++14 -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 -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++14 -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}\"' ")
12	@@ -482,7 +482,7 @@ ENDIF(APPLE)	12	@@ -542,7 +542,7 @@ ENDIF(APPLE)
13	#	13	#
14	# photoflow executable	14	# photoflow executable
15	#	15	#

Lines 1-17 Link Here

(-)photoflow/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