mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 19:03:02 +08:00
[sdl2-mixer] Bump to 2.0.2
Follows upstream default mp3 library change from smpeg to mpg123
This commit is contained in:
parent
1ea060d6fa
commit
0526ec7678
@ -8,17 +8,16 @@ set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY})
|
||||
|
||||
# builtin formats
|
||||
set(SDL_MIXER_DEFINES
|
||||
WAV_MUSIC
|
||||
MID_MUSIC
|
||||
USE_NATIVE_MIDI)
|
||||
MUSIC_WAV
|
||||
MUSIC_MID_NATIVE)
|
||||
|
||||
# MP3 support
|
||||
if(SDL_MIXER_ENABLE_MP3)
|
||||
find_path(SMPEG_INCLUDE_DIR smpeg.h)
|
||||
find_library(SMPEG_LIBRARY smpeg2)
|
||||
list(APPEND SDL_MIXER_INCLUDES ${SMPEG_INCLUDE_DIR})
|
||||
list(APPEND SDL_MIXER_LIBRARIES ${SMPEG_LIBRARY})
|
||||
list(APPEND SDL_MIXER_DEFINES MP3_MUSIC)
|
||||
find_path(MPG123_INCLUDE_DIR mpg123.h)
|
||||
find_library(MPG123_LIBRARY libmpg123)
|
||||
list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR})
|
||||
list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY})
|
||||
list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123)
|
||||
endif()
|
||||
|
||||
# FLAC support
|
||||
@ -27,7 +26,7 @@ if(SDL_MIXER_ENABLE_FLAC)
|
||||
find_library(FLAC_LIBRARY flac)
|
||||
list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR})
|
||||
list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY})
|
||||
list(APPEND SDL_MIXER_DEFINES FLAC_MUSIC)
|
||||
list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC)
|
||||
endif()
|
||||
|
||||
# MOD support
|
||||
@ -36,7 +35,7 @@ if(SDL_MIXER_ENABLE_MOD)
|
||||
find_library(MODPLUG_LIBRARY modplug)
|
||||
list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR})
|
||||
list(APPEND SDL_MIXER_LIBRARIES ${MODPLUG_LIBRARY})
|
||||
list(APPEND SDL_MIXER_DEFINES MODPLUG_MUSIC)
|
||||
list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG)
|
||||
endif()
|
||||
|
||||
# Ogg-Vorbis support
|
||||
@ -45,34 +44,29 @@ if(SDL_MIXER_ENABLE_OGGVORBIS)
|
||||
find_library(VORBISFILE_LIBRARY vorbisfile)
|
||||
list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR})
|
||||
list(APPEND SDL_MIXER_LIBRARIES ${VORBISFILE_LIBRARY})
|
||||
list(APPEND SDL_MIXER_DEFINES OGG_MUSIC)
|
||||
list(APPEND SDL_MIXER_DEFINES MUSIC_OGG)
|
||||
endif()
|
||||
|
||||
add_library(SDL2_mixer
|
||||
dynamic_flac.c
|
||||
dynamic_fluidsynth.c
|
||||
dynamic_mod.c
|
||||
dynamic_modplug.c
|
||||
dynamic_mp3.c
|
||||
dynamic_ogg.c
|
||||
effect_position.c
|
||||
effect_stereoreverse.c
|
||||
effects_internal.c
|
||||
fluidsynth.c
|
||||
load_aiff.c
|
||||
load_flac.c
|
||||
load_mp3.c
|
||||
load_ogg.c
|
||||
load_voc.c
|
||||
mixer.c
|
||||
music.c
|
||||
music_cmd.c
|
||||
music_flac.c
|
||||
music_fluidsynth.c
|
||||
music_mad.c
|
||||
music_mod.c
|
||||
music_mikmod.c
|
||||
music_modplug.c
|
||||
music_mpg123.c
|
||||
music_nativemidi.c
|
||||
music_ogg.c
|
||||
wavestream.c
|
||||
music_smpeg.c
|
||||
music_timidity.c
|
||||
music_wav.c
|
||||
native_midi/native_midi_common.c
|
||||
native_midi/native_midi_win32.c)
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: sdl2-mixer
|
||||
Version: 2.0.1-3
|
||||
Version: 2.0.2-1
|
||||
Description: Multi-channel audio mixer library for SDL.
|
||||
Build-Depends: sdl2, libflac, smpeg2, libmodplug, libvorbis
|
||||
Build-Depends: sdl2, libflac, mpg123, libmodplug, libvorbis
|
||||
|
@ -1,9 +1,9 @@
|
||||
include(vcpkg_common_functions)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_mixer-2.0.1)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_mixer-2.0.2)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.zip"
|
||||
FILENAME "SDL2_mixer-2.0.1.zip"
|
||||
SHA512 7399f08c5b091698c90d49fcc2996677eae8a36f05a65b4470807c9cf2c04730669e0ca395893cfa49177a929f8c5b2b10b6c541ba2fe2646300dcdad4ec1d9e)
|
||||
URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.2.zip"
|
||||
FILENAME "SDL2_mixer-2.0.2.zip"
|
||||
SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc)
|
||||
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
@ -12,7 +12,7 @@ vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DSDL_MIXER_ENABLE_MP3=ON # smpeg2
|
||||
-DSDL_MIXER_ENABLE_MP3=ON # mpg123
|
||||
-DSDL_MIXER_ENABLE_FLAC=ON # libflac
|
||||
-DSDL_MIXER_ENABLE_MOD=ON # libmodplug
|
||||
-DSDL_MIXER_ENABLE_OGGVORBIS=ON # libvorbis
|
||||
|
Loading…
Reference in New Issue
Block a user