mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 13:21:05 +00:00
aedi: update mpg123 to 1.28.2
This commit is contained in:
parent
508f50fbdd
commit
aa6f778f9d
2 changed files with 8 additions and 19 deletions
|
@ -315,8 +315,8 @@ class Mpg123Target(CMakeStaticDependencyTarget):
|
|||
|
||||
def prepare_source(self, state: BuildState):
|
||||
state.download_source(
|
||||
'https://www.mpg123.de/download/mpg123-1.28.0.tar.bz2',
|
||||
'e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5',
|
||||
'https://downloads.sourceforge.net/project/mpg123/mpg123/1.28.2/mpg123-1.28.2.tar.bz2',
|
||||
'7eefd4b68fdac7e138d04c37efe12155a8ebf25a5bccf0fb7e775af22d21db00',
|
||||
patches='mpg123-fix-cmake')
|
||||
|
||||
def detect(self, state: BuildState) -> bool:
|
||||
|
|
|
@ -1,22 +1,11 @@
|
|||
--- 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 @@
|
||||
@@ -185,7 +185,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)
|
||||
-if(WIN32)
|
||||
+if(WIN32 OR APPLE)
|
||||
set(HAVE_FPU 1)
|
||||
else()
|
||||
cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU)
|
||||
|
|
Loading…
Reference in a new issue