From 112c5d7b4609fe4b957156fbd41a686b95f314e5 Mon Sep 17 00:00:00 2001 From: Ankur Verma <31362771+ankurvdev@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:47:51 -0800 Subject: [PATCH] [libmodplug] Fix build failure with clang-19 (#41959) Co-authored-by: Ankur Co-authored-by: ankurv Co-authored-by: ankurv --- ports/libmodplug/portfile.cmake | 8 +------- ports/libmodplug/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmodplug.json | 5 +++++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index c792ca03d8..5afdcc4ede 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -17,13 +17,7 @@ vcpkg_from_github( 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 ) -set(EXTRA_OPTIONS "") - -if(VCPKG_TARGET_IS_EMSCRIPTEN) - list(APPEND EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11") -elseif(VCPKG_TARGET_IS_ANDROID) - list(APPEND EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11") -endif() +set(EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index c958350745..3263fff7f7 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version": "0.8.9.0", - "port-version": 13, + "port-version": 14, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 12271b285b..60249ed238 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4806,7 +4806,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 13 + "port-version": 14 }, "libmorton": { "baseline": "0.2.12", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index 87c6123f63..f7a76644bb 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff73830b584f9c52036cfa1d31b12cf936beabe8", + "version": "0.8.9.0", + "port-version": 14 + }, { "git-tree": "24e042bf1e6d517ef9bbb83229c541d3e1cdaf3c", "version": "0.8.9.0",