From nobody Wed Sep 07 17:23:12 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 4MN8Gm2yc1z4bh66; Wed, 7 Sep 2022 17:23:12 +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 4MN8Gm2Jjsz45Qm; Wed, 7 Sep 2022 17:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662571392; 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=bvjqvjgIQVuAIDhau4BK8mavVSoxCVr+QlnGQhOub5o=; b=IuN2xZ2iWJRlGHgxnqgW4c9CMf5uydYzBWTA/78sGhGquwElrTl9jLhDfqC7uQ0HGdn6yT QGjppLTwBv2joTEb9hlCx/tcPNpfkASYp4zk/m/J28KbWsyb/2L6x1uGNk0gtwnkLigWL4 t4X06ogD4RQ7AnA3ryYlOZ2OcA6xqa9Mt3EDVkLu1265kHU7FAy3hVhgQaym5YpksKt7JX L9HJYNrqAQLoUj1TA2gHwMFQeGTuBWnzH4oRsKSH+TEl9KM+sLZdpeiLTJ6/0V2l01xym3 zEphyfg9DeCUwDEhiKisBUwxOEsmQpB92uMhP1Ap22dGsS/XJQ9TLksZ1fk38A== 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 4MN8Gm1HJDzc0c; Wed, 7 Sep 2022 17:23:12 +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 287HNCMl091060; Wed, 7 Sep 2022 17:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287HNCmI091059; Wed, 7 Sep 2022 17:23:12 GMT (envelope-from git) Date: Wed, 7 Sep 2022 17:23:12 GMT Message-Id: <202209071723.287HNCmI091059@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: 1aecf2db7cc2 - main - games/devilutionX: fix build with SDL2 2.24.0 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: 1aecf2db7cc2630fa4a550a3e48368d597264bc9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662571392; 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=bvjqvjgIQVuAIDhau4BK8mavVSoxCVr+QlnGQhOub5o=; b=AIlXgZ6XWCAYGwu/5teQYxNpDKKnNgvuqVTRxWTVzYBd563rHs3WinYV3vg8xXX8dNiiN6 qGJ6IRn4v0M4xEev93Xu5PzmEqoVhIRyMY4xOHX78/1o1i0t20Dmbddc+NCCwHmhALunOP ZyVSIZ5e2qPYZvIgQztMZoQkPCA63YWMtsiQCxLdY18GJYcYW/dbPvl9RjD+7imKzbqUHr Em/xCvNluOvv+kYSttmX+CRlIyZK9bursAnmiQOOXGEoz+ivScgucDGdkL+uleeTQ6/AAq Aj2/Tv5EmxXloR3mlDyKJ8f9N1wND+i0pn+sLS3k99upa3JBoP/x6ZewX2T0Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662571392; a=rsa-sha256; cv=none; b=E2Jcf2WjC7ALQ0L2KGQOL7xqlyxiqWgswmb6orfj5juVpoU32xzaNt3dhayiMSiJBVjjvG jk43XavJ2C7yYUjQCHYeXkgzsmE+B7+RLMyQnoxQfiuhjHVB4MHjTCTyh2TdfCYZZIwz0G u2OgeH/6ZA9zAimTD7U4/cKPFm4Dhq8zpO3W08y5HDU7MhX8RagUU+wuZ4gzUD2SsjGaGz f+DFXx9p/SuUjUl5npf4X+cBYV+mCA6voBL/dDJ4T0aH4zEMYcF89ioFn95N+obofaL+ru 43MOwSP23HA3o/8eW9nKGKpcYtxSVHGJcgByv29/KXTwsNBVtmHqfvFli+HOPQ== 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=1aecf2db7cc2630fa4a550a3e48368d597264bc9 commit 1aecf2db7cc2630fa4a550a3e48368d597264bc9 Author: Dmitry Marakasov AuthorDate: 2022-09-07 15:43:33 +0000 Commit: Dmitry Marakasov CommitDate: 2022-09-07 17:22:39 +0000 games/devilutionX: fix build with SDL2 2.24.0 --- games/devilutionX/Makefile | 2 +- games/devilutionX/files/patch-CMake_Dependencies.cmake | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/games/devilutionX/Makefile b/games/devilutionX/Makefile index 34dbef6b5bc7..afc2bf60c7fd 100644 --- a/games/devilutionX/Makefile +++ b/games/devilutionX/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libfmt.so:devel/libfmt BUILD_DEPENDS= ${LOCALBASE}/include/SimpleIni.h:devel/simpleini USES= cmake compiler:c++11-lang dos2unix gettext-tools pkgconfig sdl -DOS2UNIX_GLOB= *.cpp *.h CMakeLists.txt +DOS2UNIX_GLOB= *.cpp *.h CMakeLists.txt Dependencies.cmake USE_GITHUB= yes GH_ACCOUNT= diasurgical GH_TUPLE= diasurgical:libsmackerdec:2997ee0e41e91bb723003bc09234be553b190e38:libsmackerdec/_deps/libsmackerdec-src \ diff --git a/games/devilutionX/files/patch-CMake_Dependencies.cmake b/games/devilutionX/files/patch-CMake_Dependencies.cmake new file mode 100644 index 000000000000..b5916c37a486 --- /dev/null +++ b/games/devilutionX/files/patch-CMake_Dependencies.cmake @@ -0,0 +1,13 @@ +--- CMake/Dependencies.cmake.orig 2022-07-25 04:41:06 UTC ++++ CMake/Dependencies.cmake +@@ -31,7 +31,9 @@ else() + if(DEVILUTIONX_SYSTEM_SDL2) + find_package(SDL2 REQUIRED) + if(TARGET SDL2::SDL2) +- set(SDL2_MAIN SDL2::SDL2main) ++ if(TARGET SDL2::SDL2main) ++ set(SDL2_MAIN SDL2::SDL2main) ++ endif() + elseif(TARGET SDL2::SDL2-static) + # On some distros, such as vitasdk, only the SDL2::SDL2-static target is available. + # Alias to SDL2::SDL2 because some finder scripts may refer to SDL2::SDL2.