[mpg123] Support system dependency CFLAGS better (#36100)

* https://sourceforge.net/p/mpg123/bugs/366/
This commit is contained in:
gerard-ryan-immersaview 2024-01-12 09:46:53 +10:00 committed by GitHub
parent a45fe2ce60
commit 3938ee38c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 2 deletions

View File

@ -0,0 +1,19 @@
diff --git a/ports/cmake/src/libout123/modules/CMakeLists.txt b/ports/cmake/src/libout123/modules/CMakeLists.txt
index 21810c6..51c673d 100644
--- a/ports/cmake/src/libout123/modules/CMakeLists.txt
+++ b/ports/cmake/src/libout123/modules/CMakeLists.txt
@@ -17,11 +17,11 @@ if(NOT USE_MODULES)
$<$<STREQUAL:${DEFAULT_OUTPUT_MODULE},win32>:${WIN32_LIBRARIES}>
$<$<STREQUAL:${DEFAULT_OUTPUT_MODULE},win32_wasapi>:${WIN32_WASAPI_LIBRARIES}>)
if(DEFAULT_OUTPUT_MODULE STREQUAL "pulse")
- target_compile_definitions(defaultmodule PRIVATE ${PULSE_CFLAGS})
+ target_compile_options(defaultmodule PRIVATE ${PULSE_CFLAGS})
elseif(DEFAULT_OUTPUT_MODULE STREQUAL "jack")
- target_compile_definitions(defaultmodule PRIVATE ${JACK_CFLAGS})
+ target_compile_options(defaultmodule PRIVATE ${JACK_CFLAGS})
elseif(DEFAULT_OUTPUT_MODULE STREQUAL "tinyalsa")
- target_compile_definitions(defaultmodule PRIVATE ${TINYALSA_CFLAGS})
+ target_compile_options(defaultmodule PRIVATE ${TINYALSA_CFLAGS})
endif()
if(BUILD_SHARED_LIBS)
set_target_properties(defaultmodule PROPERTIES POSITION_INDEPENDENT_CODE ON)

View File

@ -8,6 +8,7 @@ vcpkg_from_sourceforge(
fix-checktypesize.patch
fix-modulejack.patch
fix-m1-build.patch
fix-modules-cmake-cflags.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

View File

@ -1,7 +1,7 @@
{
"name": "mpg123",
"version": "1.31.3",
"port-version": 3,
"port-version": 4,
"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",

View File

@ -5738,7 +5738,7 @@
},
"mpg123": {
"baseline": "1.31.3",
"port-version": 3
"port-version": 4
},
"mpi": {
"baseline": "1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "37566a41dbc98698c2fb1236e378f181a965b0d3",
"version": "1.31.3",
"port-version": 4
},
{
"git-tree": "6e990602e7caa6965db94c4ef01e3f1b44fb4f67",
"version": "1.31.3",