mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 22:01:37 +08:00
[sdl2-mixer] Update to 2.8.0 and add dependency wavpack (#36629)
* update to 2.8.0 * update version * update version
This commit is contained in:
jim wang
GitHub
parent
6653330b70
commit
38fdc01459
@ -1,137 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 54317572..5f84dd22 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -366,7 +366,7 @@ if(SDL2MIXER_OPUS)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Using system opusfile")
|
||||
- find_package(opusfile REQUIRED)
|
||||
+ find_package(OpusFile CONFIG REQUIRED)
|
||||
if(NOT SDL2MIXER_OPUS_SHARED)
|
||||
list(APPEND PC_REQUIRES opusfile)
|
||||
endif()
|
||||
@@ -384,7 +384,7 @@ if(SDL2MIXER_OPUS)
|
||||
add_dependencies(SDL2_mixer opusfile::opusfile)
|
||||
endif()
|
||||
else()
|
||||
- target_link_libraries(SDL2_mixer PRIVATE opusfile::opusfile)
|
||||
+ target_link_libraries(SDL2_mixer PRIVATE OpusFile::opusfile)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -467,7 +467,7 @@ if(SDL2MIXER_VORBIS_VORBISFILE)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Using system vorbisfile")
|
||||
- find_package(vorbisfile REQUIRED)
|
||||
+ find_package(Vorbis CONFIG REQUIRED)
|
||||
if(NOT SDL2MIXER_VORBIS_VORBISFILE_SHARED)
|
||||
list(APPEND PC_REQUIRES vorbisfile)
|
||||
endif()
|
||||
@@ -485,7 +485,7 @@ if(SDL2MIXER_VORBIS_VORBISFILE)
|
||||
add_dependencies(SDL2_mixer vorbisfile::vorbisfile)
|
||||
endif()
|
||||
else()
|
||||
- target_link_libraries(SDL2_mixer PRIVATE vorbisfile::vorbisfile)
|
||||
+ target_link_libraries(SDL2_mixer PRIVATE Vorbis::vorbisfile)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -510,7 +510,7 @@ if(SDL2MIXER_FLAC_LIBFLAC)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Using system libflac")
|
||||
- find_package(FLAC REQUIRED)
|
||||
+ find_package(FLAC CONFIG REQUIRED)
|
||||
if(NOT SDL2MIXER_FLAC_LIBFLAC_SHARED)
|
||||
list(APPEND PC_REQUIRES flac)
|
||||
endif()
|
||||
@@ -528,7 +528,7 @@ if(SDL2MIXER_FLAC_LIBFLAC)
|
||||
add_dependencies(SDL2_mixer FLAC)
|
||||
endif()
|
||||
else()
|
||||
- target_link_libraries(SDL2_mixer PRIVATE FLAC)
|
||||
+ target_link_libraries(SDL2_mixer PRIVATE FLAC::FLAC)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -643,7 +643,7 @@ if(SDL2MIXER_MP3_MPG123)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Using system mpg123")
|
||||
- find_package(MPG123 REQUIRED)
|
||||
+ find_package(MPG123 CONFIG REQUIRED)
|
||||
if(NOT SDL2MIXER_MP3_MPG123_SHARED)
|
||||
list(APPEND PC_REQUIRES libmpg123)
|
||||
endif()
|
||||
@@ -661,7 +661,7 @@ if(SDL2MIXER_MP3_MPG123)
|
||||
add_dependencies(SDL2_mixer MPG123::mpg123)
|
||||
endif()
|
||||
else()
|
||||
- target_link_libraries(SDL2_mixer PRIVATE MPG123::mpg123)
|
||||
+ target_link_libraries(SDL2_mixer PRIVATE MPG123::libmpg123)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -672,7 +672,7 @@ if(SDL2MIXER_MIDI_FLUIDSYNTH)
|
||||
message(FATAL_ERROR "FluidSynth is not vendored.")
|
||||
else()
|
||||
message(STATUS "Using system FluidSynth")
|
||||
- find_package(FluidSynth REQUIRED)
|
||||
+ find_package(FluidSynth CONFIG REQUIRED)
|
||||
if(NOT SDL2MIXER_MIDI_FLUIDSYNTH_SHARED)
|
||||
list(APPEND PC_REQUIRES fluidsynth)
|
||||
endif()
|
||||
@@ -690,7 +690,7 @@ if(SDL2MIXER_MIDI_FLUIDSYNTH)
|
||||
add_dependencies(SDL2_mixer FluidSynth::FluidSynth)
|
||||
endif()
|
||||
else()
|
||||
- target_link_libraries(SDL2_mixer PRIVATE FluidSynth::FluidSynth)
|
||||
+ target_link_libraries(SDL2_mixer PRIVATE FluidSynth::libfluidsynth)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
diff --git a/SDL2_mixerConfig.cmake.in b/SDL2_mixerConfig.cmake.in
|
||||
index d65a43ce..29866349 100644
|
||||
--- a/SDL2_mixerConfig.cmake.in
|
||||
+++ b/SDL2_mixerConfig.cmake.in
|
||||
@@ -54,7 +54,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
if(SDL2MIXER_FLAC_LIBFLAC AND NOT SDL2MIXER_VENDORED AND NOT TARGET FLAC::FLAC)
|
||||
- find_dependency(FLAC)
|
||||
+ find_dependency(FLAC CONFIG)
|
||||
endif()
|
||||
|
||||
if(SDL2MIXER_MOD_MODPLUG AND NOT SDL2MIXER_VENDORED AND NOT TARGET modplug::modplug)
|
||||
@@ -69,20 +69,23 @@ include(CMakeFindDependencyMacro)
|
||||
find_dependency(libxmp-lite)
|
||||
endif()
|
||||
|
||||
- if(SDL2MIXER_MP3_MPG123 AND NOT SDL2MIXER_VENDORED AND NOT TARGET MPG123::mpg123)
|
||||
- find_dependency(MPG123)
|
||||
+ if(SDL2MIXER_MP3_MPG123 AND NOT SDL2MIXER_VENDORED AND NOT TARGET MPG123::libmpg123)
|
||||
+ find_dependency(MPG123 CONFIG)
|
||||
endif()
|
||||
|
||||
- if(SDL2MIXER_MIDI_FLUIDSYNTH AND NOT SDL2MIXER_VENDORED AND NOT TARGET FluidSynth::FluidSynth)
|
||||
- find_dependency(FluidSynth)
|
||||
+ if(SDL2MIXER_MIDI_FLUIDSYNTH AND NOT SDL2MIXER_VENDORED AND NOT TARGET FluidSynth::libfluidsynth)
|
||||
+ find_dependency(FluidSynth CONFIG)
|
||||
endif()
|
||||
|
||||
if(SDL2MIXER_VORBIS_TREMOR AND NOT SDL2MIXER_VENDORED AND NOT TARGET tremor::tremor)
|
||||
find_dependency(tremor)
|
||||
endif()
|
||||
|
||||
- if(SDL2MIXER_VORBIS_VORBISFILE AND NOT SDL2MIXER_VENDORED AND NOT TARGET vorbisfile::vorbisfile)
|
||||
- find_dependency(vorbisfile)
|
||||
+ if(SDL2MIXER_VORBIS_VORBISFILE AND NOT SDL2MIXER_VENDORED AND NOT TARGET Vorbis::vorbisfile)
|
||||
+ find_dependency(Vorbis CONFIG)
|
||||
+ endif()
|
||||
+ if(SDL2MIXER_OPUS AND NOT SDL2MIXER_VENDORED AND NOT TARGET OpusFile::opusfile)
|
||||
+ find_dependency(OpusFile CONFIG)
|
||||
endif()
|
||||
|
||||
if((NOT SDL2MIXER_VENDORED AND SDL2MIXER_MOD_MODPLUG) OR (HAIKU AND SDL2MIXER_MIDI_NATIVE))
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e70c4d0b..8038abee 100644
|
||||
index dc37b28..d139596 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -753,7 +753,7 @@ if(SDL2MIXER_INSTALL)
|
||||
@@ -907,7 +907,7 @@ if(SDL2MIXER_INSTALL)
|
||||
endif()
|
||||
|
||||
|
||||
##### export files #####
|
||||
- if(WIN32 AND NOT MINGW)
|
||||
+ if(0)
|
||||
set(PKG_PREFIX "cmake")
|
||||
set(SDLMIXER_INSTALL_CMAKEDIR_DEFAULT "cmake")
|
||||
else()
|
||||
set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer")
|
||||
set(SDLMIXER_INSTALL_CMAKEDIR_DEFAULT "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer")
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e70c4d0b..8038abee 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -796,7 +796,7 @@ if(SDL2MIXER_INSTALL)
|
||||
COMPONENT devel
|
||||
)
|
||||
|
||||
- if(SDL2MIXER_BUILD_SHARED_LIBS)
|
||||
+ if(1)
|
||||
# Only create a .pc file for a shared SDL2_mixer
|
||||
set(VERSION ${FULL_VERSION})
|
||||
set(SDL_VERSION ${SDL_REQUIRED_VERSION})
|
||||
@ -2,11 +2,9 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libsdl-org/SDL_mixer
|
||||
REF "release-${VERSION}"
|
||||
SHA512 74c2b449e8a9928679d42e25bd7a5967e41fe9d51732f26197c6bbe1db9170be784125b7f268476050017f3dc970497e09a0409d50731026a18355375d0369ce
|
||||
SHA512 e4c9a4418725ce019bb62216c8fd484cf04b34e2099af633d4c84e0e558fe6ba1921e791c5dde319266ffe3a1237f887871c819a249a8df7e9440c36fce181da
|
||||
PATCHES
|
||||
fix-pkg-prefix.patch
|
||||
fix-pkgconfig.patch
|
||||
fix-deps-targets.patch
|
||||
fix-pkg-prefix.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
@ -21,6 +19,8 @@ vcpkg_check_features(
|
||||
mpg123 SDL2MIXER_MP3
|
||||
mpg123 SDL2MIXER_MP3_MPG123
|
||||
opusfile SDL2MIXER_OPUS
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
SDL2MIXER_MP3_DRMP3
|
||||
)
|
||||
|
||||
if("fluidsynth" IN_LIST FEATURES)
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "sdl2-mixer",
|
||||
"version": "2.6.3",
|
||||
"port-version": 2,
|
||||
"version": "2.8.0",
|
||||
"description": "Multi-channel audio mixer library for SDL.",
|
||||
"homepage": "https://github.com/libsdl-org/SDL_mixer",
|
||||
"license": "Zlib",
|
||||
@ -18,7 +17,8 @@
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
},
|
||||
"wavpack"
|
||||
],
|
||||
"features": {
|
||||
"fluidsynth": {
|
||||
|
||||
@ -7829,8 +7829,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"sdl2-mixer": {
|
||||
"baseline": "2.6.3",
|
||||
"port-version": 2
|
||||
"baseline": "2.8.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"sdl2-mixer-ext": {
|
||||
"baseline": "2.6.0",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "21406093a22cbd3a55befe2ff61f81011d055036",
|
||||
"version": "2.8.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "bf530acd7b5169aaea8a4a7ec8c8d9a1987f7164",
|
||||
"version": "2.6.3",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user