aedi: update mpg123 to 1.32.7

ZDoom · Aug 9, 2024 · f2d038c · f2d038c
1 parent 30148ac
commit f2d038c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py
@@ -306,9 +306,9 @@ def __init__(self, name='mpg123'):
 
     def prepare_source(self, state: BuildState):
         state.download_source(
-            'https://www.mpg123.de/download/mpg123-1.32.6.tar.bz2',
-            'ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6',
-            patches=('mpg123-arm64-fpu', 'mpg123-no-syn123'))
+            'https://www.mpg123.de/download/mpg123-1.32.7.tar.bz2',
+            '3c8919243707951cac0e3c39bbf28653bcaffc43c98ff16801a27350db8f0f21',
+            patches=('mpg123-have-fpu', 'mpg123-no-syn123'))
 
     def configure(self, state: BuildState):
         opts = state.options

diff --git a/patch/mpg123-arm64-fpu.diff → patch/mpg123-have-fpu.diff b/patch/mpg123-arm64-fpu.diff → patch/mpg123-have-fpu.diff
@@ -1,10 +1,10 @@
 --- a/ports/cmake/src/CMakeLists.txt
 +++ b/ports/cmake/src/CMakeLists.txt
-@@ -190,7 +190,7 @@
-     set(NO_ERETURN ON)
- endif()
- 
--if(WIN32)
+@@ -186,7 +186,7 @@
+ check_cpu_arch_arm32(ARCH_IS_ARM32)
+ check_cpu_arch_arm64(ARCH_IS_ARM64)
+
+-if(WIN32 OR (ARCH_IS_ARM64 AND APPLE))
 +if(WIN32 OR APPLE)
      set(HAVE_FPU 1)
  else()