From nobody Tue Oct 31 15:07:36 2023 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 4SKYQw3b91z4yV8x; Tue, 31 Oct 2023 15:07:36 +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 4SKYQw341Rz3V2T; Tue, 31 Oct 2023 15:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764856; 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=914LUMdDwX7ZETWdkBxz8x84rANX60ZiHJ3evbevdd4=; b=Y0X1zXLK2baz70E7PMXUhWBd6CS+aTl/CCSe+Imnj74e77i/5Mt3njypxI23rFfpSypw7W cNC2aj/2PdAjZrCedLxkFM0+xNLSXwJptGBmG7WIdFdObBlfO0zINr+IxTkjVi69DCl6rz 7rbT+mRcj1HoE2bo+gZLdHbr7vXnKpBaecPXOi2O4mx1MA1Fsk8yUPX8gMTrMREFbfxjVI YowUmzFQfDYUvfgMskltfAPfrd7L/WcyLD3ra+9creQL6z7RpIBK6l7bGnNGSLeQfeAdNW 9LfrKSdzKkNXmFvFLNF+Z4UOKKwa11I5RaVGlAR0K1J7V43CnV8MJS28C6JdIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764856; 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=914LUMdDwX7ZETWdkBxz8x84rANX60ZiHJ3evbevdd4=; b=awwKDCBT2421OhBt5R7AMN94eK/rV1Mq7rP0rsTwEBN0sG+TtV3ykkXq6x2/dzY8GPbIVd M1mTRAbXfDMta1ozVg7O/qsoMh75NVWF5FhYSjvEwiXAbLyFMCuIXwC6wFWbHrPznsLj0t 8RqHnkc2TjfK0qdR3HXGzi8YZdHIZZtMmqhaTdQqb4h/Gw3//YHvCEL1h1bigjG/kIDxht R2prgmEFKnfqP9En6jaoc6EdHP1jr5tbMS0CeEK5WF3obTYDFA5+YUWj9ZILJ0GdXDjtrb cFl7pPCv3IBk2k+mU2kYI8UF5CovdkZxjvxFsYA7jfseN29GKP9oBsFbcCAxVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698764856; a=rsa-sha256; cv=none; b=TOo/V+c4E0uhW8ppI0Zr2cQuhfFdcj29JgE+M5xQcCJzFXb7HfrZ1k4vpntvqXC9TfInco ZR6XiR9FNtv6T7F8hUaP+Uysk8bZA+4xYiAUHvJMGthfNEo/86q9JTBaz7h9zBXVSdNc9d /Xl+2WCSDj+1fMhQobFrIXqCNsaKUisW8aPIJfsnxmCK62Kq1WuuF77zkCde+xAGd8sBXd r2OZ/8cFjapYGorMAm7VY2OKEmCN7Vn8zyPmMM7xErxWEsBXlKdUMTzIMgpNJjvuAYJ9Rt CoAnQSpTTtJHK79al5vlhmTXLY8kr4Mo79ITIrm09sdEuTTyRTwbuMKAOuJrWg== 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 4SKYQw27fKz16qt; Tue, 31 Oct 2023 15:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VF7aar049039; Tue, 31 Oct 2023 15:07:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VF7atX049036; Tue, 31 Oct 2023 15:07:36 GMT (envelope-from git) Date: Tue, 31 Oct 2023 15:07:36 GMT Message-Id: <202310311507.39VF7atX049036@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: be50f576fa15 - main - multimedia/assimp: don't build the bundled zlib but use the system one 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: be50f576fa15dc96dc4594804fa3c154a5954185 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=be50f576fa15dc96dc4594804fa3c154a5954185 commit be50f576fa15dc96dc4594804fa3c154a5954185 Author: Piotr Kubaj AuthorDate: 2023-10-31 14:17:03 +0000 Commit: Piotr Kubaj CommitDate: 2023-10-31 14:52:59 +0000 multimedia/assimp: don't build the bundled zlib but use the system one Building the bundled zlib causes zlibstatic references in a provided cmake file, causing breakage for reverse dependencies. Reported by: fluffy --- multimedia/assimp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index f0f5f20e0c76..94effa08e657 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,7 +1,7 @@ PORTNAME= assimp DISTVERSIONPREFIX= v DISTVERSION= 5.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -18,7 +18,7 @@ USES= cmake:testing compiler:c++17-lang cpe localbase:ldflags pkgconfig # miniz USE_GITHUB= yes USE_LDCONFIG= yes -CMAKE_OFF= ASSIMP_BUILD_TESTS BUILD_STATIC_LIBS +CMAKE_OFF= ASSIMP_BUILD_TESTS ASSIMP_BUILD_ZLIB BUILD_STATIC_LIBS CMAKE_ON= ASSIMP_BUILD_MINIZIP # workaround for https://github.com/assimp/assimp/issues/4374 CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack to avoid target