diff options
| author | Daniel <supsuper@gmail.com> | 2019-03-11 20:15:08 +0000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-03-11 13:15:08 -0700 |
| commit | 7dcf30197ec2988eb6725e920ffa6527bce3a150 (patch) | |
| tree | 1742f99577e79265789ccac72866580f4f592c24 /ports/sdl2-mixer | |
| parent | 37ddeed0ead71cf4fa3770b5affb83a2a9230976 (diff) | |
| download | vcpkg-7dcf30197ec2988eb6725e920ffa6527bce3a150.tar.gz vcpkg-7dcf30197ec2988eb6725e920ffa6527bce3a150.zip | |
Update various SDL2-based libraries (#5623)
* [sdl2-gfx] Update to 1.0.4
* [sdl2-mixer] Update to 2.0.4 (#4934)
* [sdl2-image] Update to 2.0.4
* [sdl2-ttf] Update to 2.0.15
* [sdl2-gfx,-image,-ttf] Use vcpkg_extract_source_archive_ex()
Diffstat (limited to 'ports/sdl2-mixer')
| -rw-r--r-- | ports/sdl2-mixer/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | ports/sdl2-mixer/CONTROL | 6 | ||||
| -rw-r--r-- | ports/sdl2-mixer/portfile.cmake | 12 |
3 files changed, 24 insertions, 5 deletions
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 5edb15906..c8934abd3 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -45,6 +45,15 @@ if(SDL_MIXER_ENABLE_OGGVORBIS) list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) endif() +# Opus support +if(SDL_MIXER_ENABLE_OPUS) + find_path(OPUS_INCLUDE_DIR opus/opusfile.h) + find_library(OPUSFILE_LIBRARY opusfile) + list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) + list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY}) + list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) +endif() + add_library(SDL2_mixer effect_position.c effect_stereoreverse.c @@ -61,7 +70,7 @@ add_library(SDL2_mixer music_modplug.c music_mpg123.c music_ogg.c - music_smpeg.c + music_opus.c music_timidity.c music_wav.c version.rc) diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index 77cf2ae0d..5e209401d 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,5 +1,5 @@ Source: sdl2-mixer -Version: 2.0.2-6 +Version: 2.0.4 Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2 @@ -18,3 +18,7 @@ Build-Depends: libmodplug Feature: libvorbis Description: Support for OGG Vorbis audio format. Build-Depends: libvorbis + +Feature: opusfile +Description: Support for Opus audio format. +Build-Depends: opusfile diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index b0cb9af14..cfc76055f 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -1,9 +1,9 @@ include(vcpkg_common_functions) -set(SDL2_MIXER_VERSION 2.0.2) +set(SDL2_MIXER_VERSION 2.0.4) vcpkg_download_distfile(ARCHIVE URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip" FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip" - SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc + SHA512 359b4f9877804f9c4b3cb608ca6082aab684f07a20a816ab71c8cdf85d26f76d67eeb5aee44daf52b7935d82aa3b45941f8f53f07ca3dd5150d6c58ed99e1492 ) vcpkg_extract_source_archive_ex( @@ -33,6 +33,11 @@ if("libvorbis" IN_LIST FEATURES) set(USE_OGGVORBIS ON) endif() +set(USE_OPUS OFF) +if("opusfile" IN_LIST FEATURES) + set(USE_OPUS ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -40,7 +45,8 @@ vcpkg_configure_cmake( -DSDL_MIXER_ENABLE_MP3=${USE_MP3} # mpg123 -DSDL_MIXER_ENABLE_FLAC=${USE_FLAC} # libflac -DSDL_MIXER_ENABLE_MOD=${USE_MOD} # libmodplug - -DSDL_MIXER_ENABLE_OGGVORBIS=${USE_OGGVORBIS} # libvorbis + -DSDL_MIXER_ENABLE_OGGVORBIS=${USE_OGGVORBIS} # libvorbis + -DSDL_MIXER_ENABLE_OPUS=${USE_OPUS} # opusfile OPTIONS_DEBUG -DSDL_MIXER_SKIP_HEADERS=ON ) |