Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg baseline] Fix mpg123 build failed on Linux #22028

Merged
merged 5 commits into from
Dec 16, 2021
Merged

[vcpkg baseline] Fix mpg123 build failed on Linux #22028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98002a5
[baseline] Fix mpg123 build failed on Linux
Dec 15, 2021
0231836
update version
Dec 15, 2021
9087ff1
Fix misspelled "module".
BillyONeal Dec 15, 2021
cab4609
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 15, 2021
3aa60ea
Actually fix the misspelling this time Bill.
BillyONeal Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/mpg123/fix-modulejack.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
10 changes: 6 additions & 4 deletions ports/mpg123/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-modulejack.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()
Expand All @@ -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)
1 change: 1 addition & 0 deletions ports/mpg123/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4518,7 +4518,7 @@
},
"mpg123": {
"baseline": "1.29.2",
"port-version": 0
"port-version": 1
},
"mpi": {
"baseline": "1",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mpg123.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e",
"version": "1.29.2",
"port-version": 1
},
{
"git-tree": "a0b39904e9eec57506653dc7252ea7e808914b8c",
"version": "1.29.2",
Expand Down