From nobody Wed Sep 07 17:23:13 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 4MN8Gn3jjDz4bhB3; Wed, 7 Sep 2022 17:23:13 +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 4MN8Gn3Hq0z459n; Wed, 7 Sep 2022 17:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662571393; 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=c6YMEmzFoudJbi6FrxM0MHuYzdnkFaYSG6BTlXQm3I8=; b=aNmHE7+hywirSl+FM+0a/rmUh39EKtpzcntnxpmQvSn0yaZMDn6ZSz0vth2HxZaUo4ugep T3imS5fZXtb2VT00pu1+PnyxjPg3okNUXu3DVKIrsSbSRN/0ytR50Gn/EIIhpwfe7Xhs1d 0n8eycSs3DQIyfAphwG9XDWUoBvCP+qnqDZTyOPfgISdmygIoMyKf7ugmAq8Va/fKkk54a 6/deEpjjRbDUKvJ7CVltAYe/tC7IauIdRgNfeafPtF7NaaHtc5zjwoCsZOs7nAM16m2442 wKqTPUELASF7dz2OtT9Vn0vNszjbpvy/iLAwTKccmCDWoK3MAHUOdJJh3Gsxgw== 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 4MN8Gn2Jfvzc4T; Wed, 7 Sep 2022 17:23:13 +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 287HNDY4091084; Wed, 7 Sep 2022 17:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287HNDrO091083; Wed, 7 Sep 2022 17:23:13 GMT (envelope-from git) Date: Wed, 7 Sep 2022 17:23:13 GMT Message-Id: <202209071723.287HNDrO091083@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: 3590e12de4c8 - main - games/shockolate: 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: 3590e12de4c8864150118af73dac211cd58cf521 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662571393; 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=c6YMEmzFoudJbi6FrxM0MHuYzdnkFaYSG6BTlXQm3I8=; b=m4Gme1zo+n9viW0y16dHFYEYHkJ25mg6g0RnWIih+K6RxQEzbBLuRSCmRfnNW73iuJmOV5 kl0boIiYkCWsgpYVSZJwOKjlY/qRt1ZQwybA8t2yAfphDRXWvC9oAZd7zEsG/Y6fjsEgqd WsmGYlyL2t+16nvaAcsZ15JMZeakNEDJ+CglcmGQAoOAiNppk0RjRl+dXRQdDggu+EkK/N Znei3n9kfLbQLJefmpGu6XD1G78kHkDyMmVfmkv9wXy8UezKA+BKqyygDxDpcOGVK94lAE 915iMhnXamvwmJiMh2ssBPNNwekpN091gnmj4MzA9l/DpafMdjFsSGGiIYww8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662571393; a=rsa-sha256; cv=none; b=AhGSrNldGxsfmT/Zy352/9uGrWKrbSDGJtJOeQEyptxGmEmLTgU0oQRUplqJypRdwd++cM 3LLejx/eK96c0VJCjBo/izFnaSj/NyV6wBsTbW4q7noP5VDUXHSBF+OP1cIhOBkTbxpVtQ NEFs3V1ZDHESOm8E7a49gue9gbvEbIBi6v8oBBhbqkhwzSqVpZORUJmh7YECKsLj8aAwLv 4UEnIiNrNWkWjFIyHKuW3+JQLE746x1uOrRzHkDTlTm6XYZXiiWD73Id3HNIIwtlYEp+JZ 4sW3vzFVh6l5LaQExnQaspIcWRqyx6go963H8veoJHKG9WZBAZc9rZ6zwchQ0g== 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=3590e12de4c8864150118af73dac211cd58cf521 commit 3590e12de4c8864150118af73dac211cd58cf521 Author: Dmitry Marakasov AuthorDate: 2022-09-07 15:45:25 +0000 Commit: Dmitry Marakasov CommitDate: 2022-09-07 17:22:40 +0000 games/shockolate: fix build with SDL2 2.24.0 --- games/shockolate/files/patch-CMakeLists.txt | 73 +++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/games/shockolate/files/patch-CMakeLists.txt b/games/shockolate/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..3e5990f18269 --- /dev/null +++ b/games/shockolate/files/patch-CMakeLists.txt @@ -0,0 +1,73 @@ +--- CMakeLists.txt.orig 2020-05-26 19:25:37 UTC ++++ CMakeLists.txt +@@ -72,8 +72,7 @@ endif(ENABLE_SDL2 MATCHES "BUNDLED") + + if(ENABLE_SOUND MATCHES "ON") + # FIXME applies only for *nix systems +- find_package(PkgConfig) +- pkg_check_modules(SDL2_MIXER REQUIRED SDL2_mixer>=2.0.4) ++ find_package(SDL2_mixer REQUIRED) + add_definitions(-DUSE_SDL_MIXER=1) + endif(ENABLE_SOUND MATCHES "ON") + if(ENABLE_SOUND MATCHES "BUNDLED") +@@ -86,8 +85,10 @@ endif(ENABLE_SOUND MATCHES "BUNDLED") + + if(ENABLE_FLUIDSYNTH MATCHES "ON") + find_package(PkgConfig) +- pkg_check_modules(FLUIDSYNTH REQUIRED fluidsynth) ++ pkg_check_modules(PC_FLUIDSYNTH REQUIRED fluidsynth) + add_definitions("-DUSE_FLUIDSYNTH=1") ++ find_path(FLUIDSYNTH_INCLUDE_DIRS fluidsynth.h HINTS ${PC_FLUIDSYNTH_INCLUDE_DIRS} REQUIRED) ++ find_library(FLUIDSYNTH_LIBRARIES fluidsynth HINTS ${PC_FLUIDSYNTH_LIBRARY_DIRS} REQUIRED) + endif(ENABLE_FLUIDSYNTH MATCHES "ON") + if(ENABLE_FLUIDSYNTH MATCHES "BUNDLED") + find_library(FLUIDSYNTH_LIBRARY fluidsynth PATHS ${CMAKE_SOURCE_DIR}/build_ext/fluidsynth-lite/src) +@@ -312,8 +313,8 @@ add_executable(movinfo + target_link_libraries(playmov + AFILE_LIB + FIX_LIB +- ${SDL2_LIBRARIES} +- ${SDL2_MIXER_LIBRARIES} ++ SDL2::SDL2 ++ SDL2_mixer::SDL2_mixer + ) + + target_link_libraries(movinfo +@@ -332,7 +333,7 @@ target_link_libraries(TestSimpleMain + RES_LIB + FIX_LIB + LG_LIB +- ${SDL2_LIBRARIES} ++ SDL2::SDL2 + ) + + add_executable(BoxTest +@@ -346,7 +347,7 @@ target_link_libraries(BoxTest + RES_LIB + FIX_LIB + LG_LIB +- ${SDL2_LIBRARIES} ++ SDL2::SDL2 + ) + + add_executable(BitmapTest +@@ -360,7 +361,7 @@ target_link_libraries(BitmapTest + RES_LIB + FIX_LIB + LG_LIB +- ${SDL2_LIBRARIES} ++ SDL2::SDL2 + ) + + add_executable(FixTest +@@ -410,8 +411,8 @@ target_link_libraries(systemshock + EDMS_LIB + FIXPP_LIB + ADLMIDI_LIB +- ${SDL2_LIBRARIES} +- ${SDL2_MIXER_LIBRARIES} ++ SDL2::SDL2 ++ SDL2_mixer::SDL2_mixer + ${FLUIDSYNTH_LIBRARIES} + ${OPENGL_LIBRARIES} + ${ALSA_LIBRARIES}