From nobody Sat Jan 15 17:49:06 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 4A1B7195E6A7; Sat, 15 Jan 2022 17:49:07 +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 4Jblz71SRbz3H2c; Sat, 15 Jan 2022 17:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642268947; 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=IqXvWkqhkrEUjiDBlAVpvMb1QLdh3PPaDCOIw6/Qs1s=; b=J64iol1wuCvmEOVhpb9lcVeQx8cUlDoGJ7aqCTpZ30Fci9mqD9e+tlQYooqhIqUTX+GMqn utIEi1oJUN4OelJPrW2RoGhS7hrZX/4baiTMQKMd+rHJMU7mOQFQlSzbh0PTbRukhRye51 QtffvYikNGsGHlJ6tDeb3Lp2/EK48wD0jlBQ/FaiSZrU2ktU5a34UGofbcz1GHxs+lkOSp EriPuXzlTekbb50Bw998QAqYPU6KLwkxt4ZZh45PoopgCG64uBTUw+Dyb/VafdT1kzjXBZ OxESTfB6oBUwwjHLhxYLW/llfQi4RUejmcFX1Fylu9UKlML/5JDVPsdfL92ahw== 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 11EE731EA; Sat, 15 Jan 2022 17:49:07 +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 20FHn6fS081904; Sat, 15 Jan 2022 17:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20FHn6PB081903; Sat, 15 Jan 2022 17:49:06 GMT (envelope-from git) Date: Sat, 15 Jan 2022 17:49:06 GMT Message-Id: <202201151749.20FHn6PB081903@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 59fb9b948f46 - main - cad/PrusaSlicer: Fix build when math/qhull is present. 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: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59fb9b948f46dc099ce54d623b69c809f0a75b98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642268947; 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=IqXvWkqhkrEUjiDBlAVpvMb1QLdh3PPaDCOIw6/Qs1s=; b=AshX5Qrq1oQMmIPwuZfa+AsD/BNjIeqPqbTW1DlufrV+MnSvVH3gmeRQVcRE9DtDiuLxXV J80uQsFKjMUiEt5GIXXCe7UolTxjOaG0X7/bZNQHUday6/wh5DSa762W7Hi/d9pHaLY8B6 GBbDhDAvHtAqSSQ0SmqAe9hxAFQlHyT9T21X10LcptuOYhSew8qM2adzqNrukIqGk4/8PQ o18e8eaaJgStzaD4PG0GaVzBgoGfUzw/ne8Zjfs5hJlJfULeTcSFTeBmyHrGQYT8iCG1eI sFPP6MsxZCLUfvqQ9bgHqqspHEU/c/+OkvMl+GiMqyyH+bCUX/Q3FYypYcDTMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642268947; a=rsa-sha256; cv=none; b=cr7mjxyvpQws352FsTNXvraB8EPWMUgosjSvJLch/h5TSE9vcA6uuJOcKnzVZUvjBsTEsj POmml1YRUe/QCBdw4uuN0D2roUNl96tYi1xFzL2HpDYv6uQ8rYlwXW+dGq7pxioU1TA0Hy HXlInfq2Rd7uCwRa3CoKlAms/uAl+UgwK0TdIolRBkcBJmbjlQ1vnSFdkBPRA52dQRW7cK xl9H6hHEl6Xjf+5+dcKtA7tqwF70EtNnDqXfyvNOcnWCXIQDjdC1ttvr/oqnxwgW8KbMra jNouPR6dQ7lRk8xwudYbXvM6/7nrCxFy5LfrUSj+WWnQVw7yU+z3HY+/g8w9nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=59fb9b948f46dc099ce54d623b69c809f0a75b98 commit 59fb9b948f46dc099ce54d623b69c809f0a75b98 Author: Stephen Montgomery-Smith AuthorDate: 2022-01-15 17:47:08 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-01-15 17:47:08 +0000 cad/PrusaSlicer: Fix build when math/qhull is present. Maintainer timeout. PR: 259941 Reported by: alt2600@icloud.com --- .../files/patch-src_qhull_CMakeLists.txt | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt new file mode 100644 index 000000000000..ce0b95dc9110 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt @@ -0,0 +1,29 @@ +--- src/qhull/CMakeLists.txt.orig 2021-11-19 21:23:46.166100000 -0500 ++++ src/qhull/CMakeLists.txt 2021-11-19 21:27:12.170235000 -0500 +@@ -14,19 +14,8 @@ + + add_library(qhull INTERFACE) + +-if(Qhull_FOUND) ++#force use of bundled qhull#else(Qhull_FOUND) + +-message(STATUS "Using qhull from system.") +-if(SLIC3R_STATIC) +- slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhullstatic_r" RelWithDebInfo Release) +- target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhullstatic_r) +-else() +- slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhull_r" RelWithDebInfo Release) +- target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhull_r) +-endif() +- +-else(Qhull_FOUND) +- + project(qhull) + cmake_minimum_required(VERSION 2.6) + +@@ -144,4 +133,4 @@ + target_include_directories(${qhull_STATIC} BEFORE PUBLIC ${LIBDIR}/qhull/src) + target_link_libraries(qhull INTERFACE ${qhull_STATIC}) + +-endif() ++#force use of bundled qhull##endif()