aedi: update mpg123 to 1.28.0

This commit is contained in:
alexey.lysiuk 2021-06-12 12:57:03 +03:00
parent 286b774dcc
commit f1ba61ebe0
3 changed files with 25 additions and 14 deletions

View file

@ -334,9 +334,9 @@ class Mpg123Target(CMakeStaticDependencyTarget):
def prepare_source(self, state: BuildState): def prepare_source(self, state: BuildState):
state.download_source( state.download_source(
'https://www.mpg123.de/download/mpg123-1.27.2.tar.bz2', 'https://www.mpg123.de/download/mpg123-1.28.0.tar.bz2',
'52f6ceb962c05db0c043bb27acf5a721381f5f356ac4610e5221f50293891b04', 'e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5',
patches='mpg123-xcompile-fpu') patches='mpg123-fix-cmake')
def detect(self, state: BuildState) -> bool: def detect(self, state: BuildState) -> bool:
return os.path.exists(state.source + 'libmpg123.pc.in') return os.path.exists(state.source + 'libmpg123.pc.in')

View file

@ -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)

View file

@ -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)