From nobody Fri Jun 17 14:35:44 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 088C68320BD; Fri, 17 Jun 2022 14:35:45 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPhRN6787z3lQm; Fri, 17 Jun 2022 14:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655476544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mVzC1gxyl7P5SoZxprYiC72LO71i480ecwxfIf03Sxg=; b=kl6zih/GLpduLlVjXlBFPnOPbAwuc/KN9weg+mfKngQn7qIdhmkal4bEdeDRdHBje+mhAg cr8klhp9x1QnJOb+EWeiy6TY96ZIYlWPY1buFDRTigGq00bQd721pejqeST4WPoL/STpC4 D1F7Re4N0XlT4H4kshxX4knYYKcBb6Mt7k7odgyzu2+xrJmC8j6h9RGPd8T+ei98TzsMC6 uun7NtdRQ8OB0IUI+9uIp9mWynWYNMI48rUMHkCRXxNAMc1U0fXO1u3DaoNdq2OHIOgldj mrmccqBjeDXsny39uU2yiiPjV7G3/hF609lAn05rkclsq16L8xUiYjjnHmsV/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8435211DB; Fri, 17 Jun 2022 14:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HEZiSp003524; Fri, 17 Jun 2022 14:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HEZiUD003523; Fri, 17 Jun 2022 14:35:44 GMT (envelope-from git) Date: Fri, 17 Jun 2022 14:35:44 GMT Message-Id: <202206171435.25HEZiUD003523@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: cf175b3c01db - main - graphics/krita: disable vc on non-x86 / non-arm64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf175b3c01db5aa05807d5e88c33ff3b5a1a28ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655476544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mVzC1gxyl7P5SoZxprYiC72LO71i480ecwxfIf03Sxg=; b=FhxO0zdXG3gjy8GJ5URSOj8FZTechjvAE7zqSwps/N8pdHYiXFi1GB9xuntCL2i2zJ0kw0 yRaubpQRGz0kJPgsrsBsVVAvqNaXmuOBRhlIdphVWGesWdrQKtHxfCJ/MHHg3BCz+VvdrS XFQ4gb/ZbvhrG+fW/KwcO6ab1xnHB8GR3ml/cQwCGih6VlB0EFU+DHEAUmAvTBz1ApPuCF ISGhiXMT42rwHFhRbeavPMf1ghvHGa4nNhLgoAKUz8tbEyVIPc69/2qS1N5TDhec/ZQEh9 Y/b6dOHZOBDylPU0fxfnXWFQ2BJloNEz+aWSb8jsS6GOK4SKjUY6P9/qlwBQKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655476544; a=rsa-sha256; cv=none; b=dw4PzDFvWUzQrQtKBO6edb3oOQ4LCVR1Zpc0sxPj1G9jyjZse3FThMUy6GFpxMNeOjlq8u fXfcW1BGc+RzN8GHtEU1cZA1GXhxkKFiSFToTeCH2HqpPF4k+LAYoOcabjQeC3BvETdS4K XcjlJXvpWIhbPlIjKg8kok1qcDYtQb/FXnbQ53sFt9zHStfMVCg95/3z/pMZBEQhrKkM5L 4xapvuABB9Q3PkyMcRGUldvfpiuxV2DZimIrlcIJPBJHoOMMwQiAkktCiqQFudEry51KcY zdc4TNGoIcxZTMzOdpafOjeFAMlkUuputBcgq8Do/mjOBMHQyYPuf1OWqx25BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf175b3c01db5aa05807d5e88c33ff3b5a1a28ae commit cf175b3c01db5aa05807d5e88c33ff3b5a1a28ae Author: Piotr Kubaj AuthorDate: 2022-06-17 13:44:57 +0000 Commit: Piotr Kubaj CommitDate: 2022-06-17 14:35:39 +0000 graphics/krita: disable vc on non-x86 / non-arm64 In file included from /wrkdirs/usr/ports/graphics/krita/work/.build/libs/pigment/KoOptimizedCompositeOpFactoryPerArch_AVX2+FMA+BMI2.cpp:11: In file included from /wrkdirs/usr/ports/graphics/krita/work/krita-5.0.8/libs/pigment/compositeops/KoOptimizedCompositeOpFactoryPerArch.h:11: In file included from /wrkdirs/usr/ports/graphics/krita/work/krita-5.0.8/libs/pigment/compositeops/KoVcMultiArchBuildSupport.h:28: In file included from /usr/local/include/Vc/Vc:30: In file included from /usr/local/include/Vc/vector.h:35: In file included from /usr/local/include/Vc/sse/vector.h:32: In file included from /usr/local/include/Vc/scalar/../common/../sse/intrinsics.h:34: In file included from /usr/lib/clang/13.0.0/include/x86intrin.h:13: /usr/lib/clang/13.0.0/include/ia32intrin.h:200:10: error: use of undeclared identifier '__builtin_ia32_readeflags_u32' return __builtin_ia32_readeflags_u32(); ^ --- graphics/krita/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index e89e682913f7..33465c4e2533 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -11,8 +11,7 @@ COMMENT= Sketching and painting program LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= vc>=1.1.0:devel/vc \ - libheif>=1.12.0:graphics/libheif +BUILD_DEPENDS= libheif>=1.12.0:graphics/libheif LIB_DEPENDS= libImath.so:math/Imath \ libOpenColorIO.so:graphics/opencolorio \ libX11.so:x11/libX11 \ @@ -62,4 +61,12 @@ OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR PLIST_SUB= SHLIB_VER=17.0.0 \ SHLIB_SHVER=17 +.include + +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 +BUILD_DEPENDS+= vc>=1.1.0:devel/vc +.else +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Vc=ON +.endif + .include