[mpg123] fix M1 build (#24161)

This commit is contained in:
autoantwort 2022-04-19 01:43:04 +02:00 committed by GitHub
parent eaf727e250
commit 793422a002
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
index ee9a1ba..81d23f8 100644
--- a/ports/cmake/src/CMakeLists.txt
+++ b/ports/cmake/src/CMakeLists.txt
@@ -185,7 +185,7 @@ if(NO_MESSAGES)
set(NO_ERETURN ON)
endif()
-if(WIN32)
+if(WIN32 OR APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm)
set(HAVE_FPU 1)
else()
cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU)

View File

@ -10,6 +10,7 @@ vcpkg_from_sourceforge(
PATCHES
no-executables.patch
fix-modulejack.patch
fix-m1-build.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@ -28,4 +29,9 @@ vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_TARGET_IS_OSX)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,7 @@
{
"name": "mpg123",
"version": "1.29.2",
"port-version": 2,
"port-version": 3,
"description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).",
"homepage": "https://sourceforge.net/projects/mpg123/",
"license": "LGPL-2.1-or-later",

View File

@ -4634,7 +4634,7 @@
},
"mpg123": {
"baseline": "1.29.2",
"port-version": 2
"port-version": 3
},
"mpi": {
"baseline": "1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d3b079fc036d9384ae34ead0db7c689499937039",
"version": "1.29.2",
"port-version": 3
},
{
"git-tree": "f03fbe2d20adf858700d4c90204ff808d00c34b2",
"version": "1.29.2",