From nobody Thu Jul 21 12:41:09 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 4LpXHT5CF6z4WWwK; Thu, 21 Jul 2022 12:41:09 +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 4LpXHT4St2z3sj8; Thu, 21 Jul 2022 12:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658407269; 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=WZmhxe1uy4IVJ8s8tnuxtVIDJL/VE+ZinOXo8NMZTRs=; b=iileaRXsmp90qxxx2auevlZDjJKaPAl+pdcgMKfKD/4nMvds5cwXL/jZfkaW4/EVpvQBx9 9hv9sDZPwBogXyuVRCTo/9QlloZQQaZlCrKys+OCxkDy1c7r0nzuO4jdTCzL9W6HRya0S4 YkRCMAjOBXAXRiFKXsEjkJLADnkbdGm9T6vn73AocQJu4aJFL18tF4g9gLZZMqWDjGIAab yUkF/Lz1wVKjMWtutwj5CdvSR0qSmh33x/U+iWFTKi4CgWIoyY13BE2vktepLbFIZagIFe Nb4eymcCW7J5tbj0yO63wQqfTIPgBXot1USeNUyUD2Id04a9bpc6jBg7OcoljA== 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 4LpXHT3Yp4zM1k; Thu, 21 Jul 2022 12:41:09 +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 26LCf92h017662; Thu, 21 Jul 2022 12:41:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LCf9EH017650; Thu, 21 Jul 2022 12:41:09 GMT (envelope-from git) Date: Thu, 21 Jul 2022 12:41:09 GMT Message-Id: <202207211241.26LCf9EH017650@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: 69ed3f5935bc - main - games/SpaceCadetPinball: fix build after audio/sdl2_mixer update 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: 69ed3f5935bc2170c2f3cbf39736109c1d602d19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658407269; 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=WZmhxe1uy4IVJ8s8tnuxtVIDJL/VE+ZinOXo8NMZTRs=; b=Xgxiuyw5mJSj9i6Zr8g2s7u4N4qrPpk/8Msuq+w3XdAHX9fgt/eXkf9fLdwyoe/Jlwd1BJ F/RDfiqzlWylqmFoimFxHL5Mp/Sh7RDswdF5Gh3rB8m44+Nj0BQAweNebO11nrr8Vwc6Aj usrYtMnbfqamV93BeLE3cnkGC/HhDvrg14NsD+2sBOMw0KQk/i8RtLrxm2sM5o3I6ujGOs T7DUbxA4qcN+uCt90VOxMepmKCFmgdNK56AJx+8/N4KRsNRzmvP2BpBn90VOwNVveScEgH g4L/0Cu3YucXMVq9Rw0RZcJWRDApMnfLvhwIEx5n/B/wMN6LrQ2Ag2sT2mAcbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658407269; a=rsa-sha256; cv=none; b=EzFD0yUzyGZA0Wk+PpNNIgnYCI4+FOsvOd9Xkc0/IyDAb0zAyPvDm4O64wcszv4e49zi7+ evmOW8fTxmGnH3q+rG2Ve/Do9i/0cRG9d32LAo8nWfqO0PRIqaCoDTFik5GRpyXUcsbTnZ aRUF7C6WwN+TcFcRwNUAk5AchpIDGLCkEROORaH+D/ZVk6ahDZ1ngnwqJctojh+lJ1TnWJ Rl0azmRFcvhdPFSzblww4QKFZWUImpVG4L7TSD6gAogrdFc+nsO93BcfzWy5jUhWnyD93N tctADTRmXHBqHXrHHrEAXbsBovvvLRMeLXcCA0G3nt8s2r9AB/ce5OCv4CRRMw== 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=69ed3f5935bc2170c2f3cbf39736109c1d602d19 commit 69ed3f5935bc2170c2f3cbf39736109c1d602d19 Author: Dmitry Marakasov AuthorDate: 2022-07-21 11:03:58 +0000 Commit: Dmitry Marakasov CommitDate: 2022-07-21 12:41:00 +0000 games/SpaceCadetPinball: fix build after audio/sdl2_mixer update --- .../files/patch-SpaceCadetPinball_pch.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/games/SpaceCadetPinball/files/patch-SpaceCadetPinball_pch.h b/games/SpaceCadetPinball/files/patch-SpaceCadetPinball_pch.h new file mode 100644 index 000000000000..13976847fe4e --- /dev/null +++ b/games/SpaceCadetPinball/files/patch-SpaceCadetPinball_pch.h @@ -0,0 +1,16 @@ +Fix SDL_Mixer version detection broken after SDL_mixer 2.6.1. +This is already fixed in SpaceCadetPinball master after 2.0.1. +--- SpaceCadetPinball/pch.h.orig 2021-12-29 06:46:09 UTC ++++ SpaceCadetPinball/pch.h +@@ -37,11 +37,7 @@ + + // MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID in SDL_mixer v2.0.2 + constexpr int MIX_INIT_MID_Proxy = +-#if SDL_MIXER_PATCHLEVEL >= 2 + MIX_INIT_MID; +-#else +- MIX_INIT_FLUIDSYNTH; +-#endif + + //https://github.com/ocornut/imgui 7b913db1ce9dd2fd98e5790aa59974dd4496be3b + #include "imgui.h"