mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 02:29:00 +08:00
[mpg123] Update, cleanup (#40741)
This commit is contained in:
parent
f7a181aa36
commit
a1f4ba49f7
@ -1,14 +0,0 @@
|
||||
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
|
||||
index 79e1f9b..e057567 100644
|
||||
--- a/ports/cmake/src/CMakeLists.txt
|
||||
+++ b/ports/cmake/src/CMakeLists.txt
|
||||
@@ -5,6 +5,7 @@ include(CheckFunctionExists)
|
||||
include(CheckIncludeFile)
|
||||
include(CheckIncludeFiles)
|
||||
include(CheckSymbolExists)
|
||||
+include(CheckTypeSize)
|
||||
include(CMakeDependentOption)
|
||||
include(TestBigEndian)
|
||||
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
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)
|
@ -1,19 +0,0 @@
|
||||
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)
|
@ -1,13 +1,13 @@
|
||||
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
|
||||
index ee9a1ba..81d23f8 100644
|
||||
index 32bc03c..acd420f 100644
|
||||
--- a/ports/cmake/src/CMakeLists.txt
|
||||
+++ b/ports/cmake/src/CMakeLists.txt
|
||||
@@ -185,7 +185,7 @@ if(NO_MESSAGES)
|
||||
set(NO_ERETURN ON)
|
||||
endif()
|
||||
|
||||
-if(WIN32)
|
||||
+if(WIN32 OR APPLE)
|
||||
@@ -188,6 +188,8 @@ check_cpu_arch_arm64(ARCH_IS_ARM64)
|
||||
|
||||
if(WIN32 OR (ARCH_IS_ARM64 AND APPLE))
|
||||
set(HAVE_FPU 1)
|
||||
+elseif(CMAKE_CROSSCOMPILING OR DEFINED HAVE_FPU)
|
||||
+ set(HAVE_FPU 1 CACHE STRING "Override in triplet if needed")
|
||||
else()
|
||||
cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU)
|
||||
endif()
|
@ -3,12 +3,9 @@ vcpkg_from_sourceforge(
|
||||
REPO mpg123/mpg123
|
||||
REF "${VERSION}"
|
||||
FILENAME "mpg123-${VERSION}.tar.bz2"
|
||||
SHA512 5dd550e06f5d0d432cac1b7e546215e56378b44588c1a98031498473211e08bc4228de45be41f7ba764f7f6c0eb752a6501235bcc3712c9a8d8852ae3c607d98
|
||||
SHA512 71f7cf6035c489934400528d0eaf0c1104417867990dd0abcc99c682818ef1f3e99dbee9dcdd888d88ed172a8950d5df515b755a5c1c1b54fc56a28584ceef8c
|
||||
PATCHES
|
||||
fix-checktypesize.patch
|
||||
fix-modulejack.patch
|
||||
fix-m1-build.patch
|
||||
fix-modules-cmake-cflags.patch
|
||||
have-fpu.diff
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
@ -25,6 +22,8 @@ vcpkg_cmake_configure(
|
||||
OPTIONS
|
||||
-DUSE_MODULES=OFF
|
||||
-DBUILD_PROGRAMS=OFF
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON
|
||||
${options}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
BUILD_PROGRAMS
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "mpg123",
|
||||
"version": "1.31.3",
|
||||
"port-version": 4,
|
||||
"version": "1.32.7",
|
||||
"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",
|
||||
|
@ -5985,8 +5985,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"mpg123": {
|
||||
"baseline": "1.31.3",
|
||||
"port-version": 4
|
||||
"baseline": "1.32.7",
|
||||
"port-version": 0
|
||||
},
|
||||
"mpi": {
|
||||
"baseline": "1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c4b6f23176f2808874961920b3cbec5016e4c963",
|
||||
"version": "1.32.7",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "37566a41dbc98698c2fb1236e378f181a965b0d3",
|
||||
"version": "1.31.3",
|
||||
|
Loading…
Reference in New Issue
Block a user