From owner-svn-ports-head@freebsd.org Wed Oct 28 21:23:20 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 698C8450D8B; Wed, 28 Oct 2020 21:23:20 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CM1lD261jz4c0Y; Wed, 28 Oct 2020 21:23:20 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CA032285A; Wed, 28 Oct 2020 21:23:20 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09SLNK4I049512; Wed, 28 Oct 2020 21:23:20 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09SLNKtt049511; Wed, 28 Oct 2020 21:23:20 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202010282123.09SLNKtt049511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 28 Oct 2020 21:23:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553566 - head/graphics/photoflow X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/graphics/photoflow X-SVN-Commit-Revision: 553566 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2020 21:23:20 -0000 Author: pkubaj Date: Wed Oct 28 21:23:19 2020 New Revision: 553566 URL: https://svnweb.freebsd.org/changeset/ports/553566 Log: graphics/photoflow: fix build on GCC architectures Clang doesn't work on GCC architectures. MFH: 2020Q4 (fix build blanket) Modified: head/graphics/photoflow/Makefile Modified: head/graphics/photoflow/Makefile ============================================================================== --- head/graphics/photoflow/Makefile Wed Oct 28 21:14:08 2020 (r553565) +++ head/graphics/photoflow/Makefile Wed Oct 28 21:23:19 2020 (r553566) @@ -25,7 +25,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libpugixml.so:textproc/pugixml \ libvips.so:graphics/vips -USES= cmake desktop-file-utils gettext gnome jpeg pkgconfig # compiler:c++11-lang +USES= cmake compiler desktop-file-utils gettext gnome jpeg pkgconfig USE_GITHUB= yes GH_ACCOUNT= aferrero2707 GH_PROJECT= PhotoFlow @@ -52,11 +52,17 @@ OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolor 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 + +.if ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes +.else # clang-10 fails to compile photoflow because it bundles an old version of GMIC that clang-10 doesn't like: https://github.com/aferrero2707/PhotoFlow/issues/220 LLVM_VERSION= 90 -BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} +BUILD_DEPENDS+= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} CPP= clang-cpp${LLVM_VERSION} +.endif -.include +.include