diff --git a/ports/mpg123/fix-m1-build.patch b/ports/mpg123/fix-m1-build.patch index f8367d3ef93b9f..d198d953b3aa15 100644 --- a/ports/mpg123/fix-m1-build.patch +++ b/ports/mpg123/fix-m1-build.patch @@ -5,9 +5,9 @@ index ee9a1ba..81d23f8 100644 @@ -185,7 +185,7 @@ if(NO_MESSAGES) set(NO_ERETURN ON) endif() - + -if(WIN32) -+if(WIN32 OR APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm) ++if(WIN32 OR APPLE) set(HAVE_FPU 1) else() cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) diff --git a/ports/mpg123/no-executables.patch b/ports/mpg123/no-executables.patch deleted file mode 100644 index a7a62ec1d961d2..00000000000000 --- a/ports/mpg123/no-executables.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt -index c7ba36f..7147174 100644 ---- a/ports/cmake/src/CMakeLists.txt -+++ b/ports/cmake/src/CMakeLists.txt -@@ -372,7 +372,7 @@ if(BUILD_LIBOUT123) - endif() - add_subdirectory("libsyn123") - --if(UNIX) -+if(0) - add_subdirectory("tests") - - if(BUILD_LIBOUT123) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 080ec09e4ec599..4efadfc92125cb 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,14 +1,12 @@ -set(MPG123_VERSION 1.29.2) -set(MPG123_HASH ffb82ffbebedeb12783338b5159bf055afd25cb77e1b705bef29f04fa50bcb2ceaf2a6418d0e111fab1151ea956fe48ba3576d978e6b0c8f4ca72c3883608ec0) +set(MPG123_VERSION 1.29.3) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO mpg123/mpg123 REF ${MPG123_VERSION} FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" - SHA512 ${MPG123_HASH} + SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6 PATCHES - no-executables.patch fix-modulejack.patch fix-m1-build.patch ) @@ -20,7 +18,9 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" - OPTIONS -DUSE_MODULES=OFF + OPTIONS + -DUSE_MODULES=OFF + -DBUILD_PROGRAMS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 50daa81591905d..018bac57e7b3e1 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mpg123", - "version": "1.29.2", - "port-version": 3, + "version": "1.29.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", diff --git a/versions/baseline.json b/versions/baseline.json index cb04d73b13774e..67e8f110e9f9c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4649,8 +4649,8 @@ "port-version": 4 }, "mpg123": { - "baseline": "1.29.2", - "port-version": 3 + "baseline": "1.29.3", + "port-version": 0 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 6f87618c878669..82c90e4bc82d47 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b99f7a71d1996dc6a61c81a11a9a98805eba1c4", + "version": "1.29.3", + "port-version": 0 + }, { "git-tree": "d3b079fc036d9384ae34ead0db7c689499937039", "version": "1.29.2",