diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-02-06 12:55:52 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-02-06 12:55:52 +0000 |
| commit | 37c071eedc9bc1e840bd98d4bfa53c693a256ceb (patch) | |
| tree | a48bddc1b31e27dae87f81304de7706452c5567e /graphics/darktable | |
| parent | fb83758833e5e1d214ca8005403c04fd1bedd948 (diff) | |
| download | pkgsrc-37c071eedc9bc1e840bd98d4bfa53c693a256ceb.tar.gz | |
darktable: Various fixes for SunOS/clang.
Diffstat (limited to 'graphics/darktable')
| -rw-r--r-- | graphics/darktable/Makefile | 5 | ||||
| -rw-r--r-- | graphics/darktable/distinfo | 3 | ||||
| -rw-r--r-- | graphics/darktable/patches/patch-src_CMakeLists.txt | 16 |
3 files changed, 22 insertions, 2 deletions
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 26ca60e8f79..42651d55583 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2018/01/28 20:10:51 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2018/02/06 12:55:52 jperkin Exp $ DISTNAME= darktable-2.2.5 PKGREVISION= 7 @@ -46,6 +46,7 @@ CFLAGS+= -mstackrealign -msse2 -march=i686 .endif CFLAGS.NetBSD+= -D_NETBSD_SOURCE +CFLAGS.SunOS+= -D__SUNOS__=1 .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mgcc) @@ -65,7 +66,9 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1 .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.if ${OPSYS} != "SunOS" .include "../../devel/libinotify/buildlink3.mk" +.endif .include "../../devel/libgphoto2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/GraphicsMagick/buildlink3.mk" diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index 22fcf81f362..6549c653ecd 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.28 2017/07/14 10:02:28 hauke Exp $ +$NetBSD: distinfo,v 1.29 2018/02/06 12:55:52 jperkin Exp $ SHA1 (darktable-2.2.5.tar.xz) = f60ab3f9118e96c311f286a87102ad0d647cb111 RMD160 (darktable-2.2.5.tar.xz) = 1a66797ca24dc7ef06fc5bb2fbed98724d50c0f8 SHA512 (darktable-2.2.5.tar.xz) = fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b Size (darktable-2.2.5.tar.xz) = 3092540 bytes +SHA1 (patch-src_CMakeLists.txt) = 4535599cf1d0f6aae1909bd4dc09281311e23e0c SHA1 (patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp) = c1c7f8b03f63295361138ec1d6dbd1d323fa69ba SHA1 (patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp) = 435e99db5d512f6568048a8e6382f6def6e7430f SHA1 (patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp) = 3abfbca5078d1ed068199e96e16b8eaea4eb662d diff --git a/graphics/darktable/patches/patch-src_CMakeLists.txt b/graphics/darktable/patches/patch-src_CMakeLists.txt new file mode 100644 index 00000000000..43a2d6f2317 --- /dev/null +++ b/graphics/darktable/patches/patch-src_CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-src_CMakeLists.txt,v 1.8 2018/02/06 12:55:52 jperkin Exp $ + +Don't link with the C compiler, CMake's CXXABI detection may insert +C++ libraries into LIBS. + +--- src/CMakeLists.txt.orig 2017-05-28 14:22:21.000000000 +0000 ++++ src/CMakeLists.txt +@@ -684,7 +684,7 @@ if(APPLE) + set_target_properties(lib_darktable PROPERTIES MACOSX_RPATH TRUE) + endif(APPLE) + set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable) +-set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C) ++#set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C) + + # + # Link external libs |