From nobody Tue Jul 26 21:10:02 2022 X-Original-To: dev-commits-ports-all@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 4LsqLL2QRZz4XCr4; Tue, 26 Jul 2022 21:10:02 +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 4LsqLL1yKgz3S6Y; Tue, 26 Jul 2022 21:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658869802; 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=/jOXLI2HuelLUbeY2GWBrwzGBkLRMDK1b1gRtwe9l3M=; b=XjR6txTe+nbxFWZSHnILAc1sjV9asPPltFYLuCGR5unpPpTnf2qBITchh6yPEvCNObz2G5 kKtMgt3KJpguxkp1m1nGS96IBn5KFzcyjrvDfBYD7GleCA8JqcZCkM/Mz4pJGlbkxq5oZc yboqjy838O7C2SiwDNCqGkDnJIS3pxP9uTcyU0nfTSn3MR4RkWAtVq1kR5/vDdNrAgvj1a ea6LTfCjr5FuC2Syf6g6IB0HaQQ5JWdSGKLMvmwANAPp1lk92QEsU6NzeRKK4Y54U9NPma TFh5LhXDB22JjJYUmnCY7Ztk98jQ7ylW/V6GVGjE6ZcSodAEbEItNhFhqDyeaQ== 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 4LsqLL11k5zrhZ; Tue, 26 Jul 2022 21:10:02 +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 26QLA2Db059201; Tue, 26 Jul 2022 21:10:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QLA2T6059198; Tue, 26 Jul 2022 21:10:02 GMT (envelope-from git) Date: Tue, 26 Jul 2022 21:10:02 GMT Message-Id: <202207262110.26QLA2T6059198@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: 7a6166a05e8c - main - graphics/openmvs: fix build on non-x86 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 7a6166a05e8cac9a614eb97f0ae26475aee2e592 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658869802; 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=/jOXLI2HuelLUbeY2GWBrwzGBkLRMDK1b1gRtwe9l3M=; b=MZmPQbXJeGfnaSYzlYuPsSFkD+G72tUy62efpL6UmrS6a49/LxKTWscvTQQ/PpEikkFKyO gHGCYclg7V/w40Bo2huNGPqlb4thBBOdZf6ogcq/A1HjVkC64TTPT17KmhYmiE5omUUOjI lTE6kYQRUj63QUtBY4saRNX0DkEP1yvO6c9t6JxQ8B9za3ps1QY3eqh6iKNPMqqZ5vSRwD Vxj49EgeqhfIW3Frj/fbpUafxLCBMOxSUEWC5z8Lklj7ztrg4qnj1X9vRCQQo6dGH0MViD BbRi8MWLBozLhP855PiLcOMmL/SeL6Cku5zBXAuZBzFr2+qrOCr4WXWZhDvuDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658869802; a=rsa-sha256; cv=none; b=LgEMRRdptGw6iOI+sDBhnS/pEUAVcFRcAUiCEzzjS+jmRB7FATDyltnB3W8DmAf7Ogkt9c ZWjZb8Vr/BOqSyJA15XSqL3Qbjm+9CFCMZGGiGMP74DD9uf6B67M2LzjvVY+UOp4fo4o6W 2lepiwRu5liPlExoA/3HfVmz/zK4m8abFwSWZbQxap/1fAgF7FE2VHfN8JdmdBLy0DvXt2 jXJyMLHE+v8zhRrVx9tCHWWvnkiWVR++97rHasWDX1pvSgWul1QBj2dytsOoPLn/dSBPMv 3gcIinobRX4tV0ZLAcliUTiU08YFDwHM0j2V3UgzdAbs20SSMz+QMQeZApn4RA== 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=7a6166a05e8cac9a614eb97f0ae26475aee2e592 commit 7a6166a05e8cac9a614eb97f0ae26475aee2e592 Author: Piotr Kubaj AuthorDate: 2022-07-26 09:42:59 +0000 Commit: Piotr Kubaj CommitDate: 2022-07-26 21:09:56 +0000 graphics/openmvs: fix build on non-x86 Disable SSE on non-x86 and add powerpc* support. --- graphics/openmvs/Makefile | 6 ++++++ graphics/openmvs/files/patch-libs_Common_Config.h | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/graphics/openmvs/Makefile b/graphics/openmvs/Makefile index e54143024018..fa9ca9a2fbaf 100644 --- a/graphics/openmvs/Makefile +++ b/graphics/openmvs/Makefile @@ -32,4 +32,10 @@ CMAKE_ON= BUILD_SHARED_LIBS OpenMVS_USE_CERES CMAKE_OFF= OpenMVS_BUILD_TOOLS # tools can't be built because of https://github.com/cdcseacave/openMVS/issues/846 CMAKE_ARGS= -DVCG_ROOT=${LOCALBASE}/include/vcglib +.include + +.if ${ARCH} != amd64 && ${ARCH} != i386 +CMAKE_ARGS+= -DOpenMVS_USE_SSE:BOOL=OFF +.endif + .include diff --git a/graphics/openmvs/files/patch-libs_Common_Config.h b/graphics/openmvs/files/patch-libs_Common_Config.h new file mode 100644 index 000000000000..571b88947aad --- /dev/null +++ b/graphics/openmvs/files/patch-libs_Common_Config.h @@ -0,0 +1,13 @@ +--- libs/Common/Config.h.orig 2022-07-26 08:34:06 UTC ++++ libs/Common/Config.h +@@ -144,7 +144,9 @@ + #endif + + +-#if defined(__arm__) || defined (__arm64__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARMT) ++#if defined(__powerpc__) ++#define _PLATFFORM_PPC 1 ++#elif defined(__arm__) || defined (__arm64__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARMT) + #define _PLATFORM_ARM 1 + #else + #define _PLATFORM_X86 1