diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index 934e281e..f9d61af7 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -334,9 +334,9 @@ class Mpg123Target(CMakeStaticDependencyTarget): def prepare_source(self, state: BuildState): state.download_source( - 'https://www.mpg123.de/download/mpg123-1.27.2.tar.bz2', - '52f6ceb962c05db0c043bb27acf5a721381f5f356ac4610e5221f50293891b04', - patches='mpg123-xcompile-fpu') + 'https://www.mpg123.de/download/mpg123-1.28.0.tar.bz2', + 'e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5', + patches='mpg123-fix-cmake') def detect(self, state: BuildState) -> bool: return os.path.exists(state.source + 'libmpg123.pc.in') diff --git a/patch/mpg123-fix-cmake.diff b/patch/mpg123-fix-cmake.diff new file mode 100644 index 00000000..433ea267 --- /dev/null +++ b/patch/mpg123-fix-cmake.diff @@ -0,0 +1,22 @@ +--- a/ports/cmake/cmake/CheckCPUArch.cmake ++++ b/ports/cmake/cmake/CheckCPUArch.cmake +@@ -2,7 +2,7 @@ + if(NOT DEFINED HAVE_${VARIABLE}) + message(STATUS "Check CPU architecture is ${ARCH}") + set(CHECK_CPU_ARCH_DEFINES ${ARCH_DEFINES}) +- configure_file(${PROJECT_SOURCE_DIR}/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY) ++ configure_file(${PROJECT_SOURCE_DIR}/cmake/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY) + try_compile(HAVE_${VARIABLE} "${PROJECT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c") + if(HAVE_${VARIABLE}) +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -186,7 +186,7 @@ + set(NO_ERETURN ON) + endif() + +-cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) ++set(HAVE_FPU ON) + + if(NOT HAVE_FPU) + set(NO_SYNTH32 ON) diff --git a/patch/mpg123-xcompile-fpu.diff b/patch/mpg123-xcompile-fpu.diff deleted file mode 100644 index 9db12ab2..00000000 --- a/patch/mpg123-xcompile-fpu.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ports/cmake/src/CMakeLists.txt -+++ b/ports/cmake/src/CMakeLists.txt -@@ -175,7 +175,7 @@ - set(NO_ERETURN ON) - endif() - --cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) -+set(HAVE_FPU ON) - - if(NOT HAVE_FPU) - set(NO_SYNTH32 ON)