From nobody Thu Nov 03 18:26:52 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 4N3Bzw6CT6z4gMxQ; Thu, 3 Nov 2022 18:26:52 +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 4N3Bzw5FBgz44wc; Thu, 3 Nov 2022 18:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667500012; 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=Swsn6SeXMwu+Ai3WrtJBvQ2t6bwucNSDZxGhGPfJ+/I=; b=pqH2p1XUcHtx4ZbQ2beUyYrhKzHv+Tcn43xZbTOY4/FpzKxAibt2hb0N5ASaouWnUw3msT wDEQ6lc1PaISwW0osjfDmWKiszjdCaK06OC3sKoskAaYYjX+mIDqK+e9EqHzIgc2f7Uyq7 FK+/4Jm3ESFhwbggT4eVSZTkKGk+rC5dyXKONRY30EDsoMwYho9akixLg2w4Gs6DfDHdEO JS2aqvqB3Tz2bYYFrffmpEFJnpfOvw5NUki29jm9PqDoa1jC3ahhRzXiIkWvRgYqXuwWNv BTXNEsmXeLX1GBNYogiwXsHeq+X1aqT7r10IEzW5B9c77lVjeBea6JnTIAlFFA== 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 4N3Bzw4B4zzmFS; Thu, 3 Nov 2022 18:26:52 +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 2A3IQqiQ013357; Thu, 3 Nov 2022 18:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3IQqTw013356; Thu, 3 Nov 2022 18:26:52 GMT (envelope-from git) Date: Thu, 3 Nov 2022 18:26:52 GMT Message-Id: <202211031826.2A3IQqTw013356@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: b0e38b17abbe - main - games/warzone2100: fix build 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0e38b17abbebfd75ba6747f7d6b65a7fa388621 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667500012; 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=Swsn6SeXMwu+Ai3WrtJBvQ2t6bwucNSDZxGhGPfJ+/I=; b=aUJyW6jTA2WgobsjEGVN4OQqdwlbjnkhVb9fja/1KTEZaVEG2eO3CC6FhbDiA16f57IHcb 9b07EQKhoRsW8mXTzX8uWmO+GU8UGIVm2lyDq9R26y2N36cx57r2obhDkqecj+XCfvAQET 49PrZAG/R2LLJ504ztMv1imb+xRMxspHQbQMWxDWqV+bpVWs09zecNLdmFJ8UCQW0fvHH8 ewDyJdSRrxRyiK4M7n1A5kK3+GSKDU6nKdsKuD4M1aXdmVF0XH/3njZPFUJtSIrBPS05Cv Yy1hIU6zmIe+TDjoVFxMUGCg489IizplsFSOp3EkrP7B0TztPQB8oJhE41GOjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667500012; a=rsa-sha256; cv=none; b=ZFvl5JeFC0+fOZYWwtuyF3dzfywIt0SiubRgEBJQYB6RrPNESbrHNqTG3yGe4Xj+v0FgAm Lu3+6Vz9sJxNv8AdHhfEjQmA/HyltrnZqXQYTkTP7OvUwQ/LhK804UsTVTUxUCDaWvd2oZ +3ToPrG+h1O+GJgX9jPMetlFPpptMP7oMEuUh/sLgoCE6C2wwBXXeBJhbaiQYQTx5RNUKq hdX4nGQrLf1a2ONeIjseu96eA77mYFYTELdZQH8w3kO0HhlvrPBaEeXIzPfyJHtwAgpB4E vLEFINecrHe/aTP8X8uR9+qBun3DDnZnYCfby4oFo8L9YHFMJ3SvGDkABBWv7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0e38b17abbebfd75ba6747f7d6b65a7fa388621 commit b0e38b17abbebfd75ba6747f7d6b65a7fa388621 Author: Dmitry Marakasov AuthorDate: 2022-11-03 18:11:49 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-03 18:26:46 +0000 games/warzone2100: fix build Fix build by linking with dynamic SDL2 library instead of the static one, which pulls transitive dependencies in a broken way. Reported by: pkg-fallout, fluffy --- games/warzone2100/files/patch-lib_sdl_CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt new file mode 100644 index 000000000000..466265d6a4df --- /dev/null +++ b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt @@ -0,0 +1,17 @@ +--- lib/sdl/CMakeLists.txt.orig 2022-11-03 17:44:55 UTC ++++ lib/sdl/CMakeLists.txt +@@ -49,14 +49,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2 + find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET) + endif() + if(SDL2_FOUND) +- if (TARGET SDL2::SDL2-static) +- # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates +- get_target_property(_sdl2_include_dir SDL2::SDL2-static INTERFACE_INCLUDE_DIRECTORIES) +- test_link_to_sdl_target(SDL2::SDL2-static LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) +- if (_sdl2_include_dir AND LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) +- set(_sdl2_library SDL2::SDL2-static) +- endif() +- endif() + if (NOT _sdl2_library AND TARGET SDL2::SDL2) + # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates + get_target_property(_sdl2_include_dir SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)