From 98002a50b368f6498df28a0d155314705d8e35ee Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Tue, 14 Dec 2021 22:35:01 -0800 Subject: [PATCH 1/4] [baseline] Fix mpg123 build failed on Linux --- ports/mpg123/fix-moudlejack.patch | 13 +++++++++++++ ports/mpg123/portfile.cmake | 10 ++++++---- ports/mpg123/vcpkg.json | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 ports/mpg123/fix-moudlejack.patch diff --git a/ports/mpg123/fix-moudlejack.patch b/ports/mpg123/fix-moudlejack.patch new file mode 100644 index 00000000000000..fd4113270990c3 --- /dev/null +++ b/ports/mpg123/fix-moudlejack.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index 7147174..76e1743 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -238,7 +238,7 @@ if(BUILD_LIBOUT123) + endif() + endif() + +- if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) ++ if(0) + pkg_search_module(JACK jack) + if(JACK_FOUND) + list(APPEND OUTPUT_MODULES jack) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 6af3d50f0436d4..08b756bf344bd2 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -7,14 +7,16 @@ vcpkg_from_sourceforge( REF ${MPG123_VERSION} FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" SHA512 ${MPG123_HASH} - PATCHES no-executables.patch + PATCHES + no-executables.patch + fix-moudlejack.patch ) -include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) +include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") yasm_tool_helper(APPEND_TO_PATH) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/ports/cmake + SOURCE_PATH "${SOURCE_PATH}/ports/cmake" OPTIONS -DUSE_MODULES=OFF ) vcpkg_cmake_install() @@ -24,4 +26,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index e293e914496ba4..dba644357495be 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpg123", "version": "1.29.2", + "port-version": 1, "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/", "dependencies": [ From 02318362b76033054fa96a7b0e541cfe7e757a01 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Tue, 14 Dec 2021 22:36:43 -0800 Subject: [PATCH 2/4] update version --- versions/baseline.json | 2 +- versions/m-/mpg123.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 84f02eb71b38cc..ae2490f502c363 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4518,7 +4518,7 @@ }, "mpg123": { "baseline": "1.29.2", - "port-version": 0 + "port-version": 1 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index e87a5956cd99d4..57a97673c619a2 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be83f819dff02c1a5b6a4af3ea83e7722f088219", + "version": "1.29.2", + "port-version": 1 + }, { "git-tree": "a0b39904e9eec57506653dc7252ea7e808914b8c", "version": "1.29.2", From 9087ff17e1e6929d132520aa6063ab8fbc8dfdf8 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 15 Dec 2021 10:19:31 -0800 Subject: [PATCH 3/4] Fix misspelled "module". --- ports/mpg123/{fix-moudlejack.patch => fix-modulejack.patch} | 0 ports/mpg123/portfile.cmake | 2 +- versions/m-/mpg123.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename ports/mpg123/{fix-moudlejack.patch => fix-modulejack.patch} (100%) diff --git a/ports/mpg123/fix-moudlejack.patch b/ports/mpg123/fix-modulejack.patch similarity index 100% rename from ports/mpg123/fix-moudlejack.patch rename to ports/mpg123/fix-modulejack.patch diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 08b756bf344bd2..287ace652052ed 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_sourceforge( SHA512 ${MPG123_HASH} PATCHES no-executables.patch - fix-moudlejack.patch + fix-moudulejack.patch ) include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 57a97673c619a2..6875d59249eaa6 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "be83f819dff02c1a5b6a4af3ea83e7722f088219", + "git-tree": "f1d24b52df28ac7f8331d6eaa03ca646f1046c0e", "version": "1.29.2", "port-version": 1 }, From 3aa60eab9d42ba841df587c914c84e951d0fa82f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 15 Dec 2021 10:25:33 -0800 Subject: [PATCH 4/4] Actually fix the misspelling this time Bill. --- ports/mpg123/portfile.cmake | 2 +- versions/m-/mpg123.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 287ace652052ed..ceca50482f06d1 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_sourceforge( SHA512 ${MPG123_HASH} PATCHES no-executables.patch - fix-moudulejack.patch + fix-modulejack.patch ) include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 6875d59249eaa6..8e7e9b411e140c 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f1d24b52df28ac7f8331d6eaa03ca646f1046c0e", + "git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e", "version": "1.29.2", "port-version": 1 },