From 7713f29a58545a55ed0c7d21f477a77c5909f7ef Mon Sep 17 00:00:00 2001 From: wangli28 Date: Tue, 17 Sep 2019 07:37:09 +0000 Subject: [PATCH 1/4] [sdl2-mixer] Fix features dependency link libraries. --- ports/sdl2-mixer/CMakeLists.txt | 42 +++++++++++++++++++++++++++++++++ ports/sdl2-mixer/CONTROL | 2 +- ports/sdl2-mixer/portfile.cmake | 9 +++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index bc864cf29d07cb..177ac9744e464d 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -10,6 +10,48 @@ set(SDL_MIXER_LIBRARIES SDL2::SDL2) # builtin formats set(SDL_MIXER_DEFINES MUSIC_WAV) +# MP3 support +if(SDL_MIXER_ENABLE_MP3) + find_path(MPG123_INCLUDE_DIR mpg123.h) + find_library(MPG123_LIBRARY NAMES libmpg123 mpg123) + list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123) +endif() + +# FLAC support +if(SDL_MIXER_ENABLE_FLAC) + find_path(FLAC_INCLUDE_DIR FLAC/all.h) + find_library(FLAC_LIBRARY FLAC) + list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC) +endif() + +# MOD support +if(SDL_MIXER_ENABLE_MOD) + find_path(MODPLUG_INCLUDE_DIR libmodplug/modplug.h) + find_library(MODPLUG_LIBRARY modplug) + list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG) +endif() + +# Ogg-Vorbis support +if(SDL_MIXER_ENABLE_OGGVORBIS) + find_path(VORBIS_INCLUDE_DIR vorbis/codec.h) + find_library(VORBISFILE_LIBRARY vorbisfile) + list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) +endif() + +# Opus support +if(SDL_MIXER_ENABLE_OPUS) + find_path(OPUS_INCLUDE_DIR opus/opusfile.h) + find_package(ogg CONFIG REQUIRED) + find_package(Opus CONFIG REQUIRED) + find_library(OPUSFILE_LIBRARY opusfile) + list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) +endif() + add_library(SDL2_mixer effect_position.c effect_stereoreverse.c diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index 9e1bd1e8048342..151c643046ab36 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,5 +1,5 @@ Source: sdl2-mixer -Version: 2.0.4-4 +Version: 2.0.4-5 Homepage: https://www.libsdl.org/projects/SDL_mixer Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2 diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index e844c5ba58499a..fc85796f80d330 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -13,10 +13,19 @@ vcpkg_extract_source_archive_ex( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + mpg123 USE_MP3 + libflac USE_FLAC + libmodplug USE_MOD + libvorbis USE_OGGVORBIS + opusfile USE_OPUS +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS_DEBUG + ${FEATURE_OPTIONS} -DSDL_MIXER_SKIP_HEADERS=ON ) From edc955c4d8baeb8f921c79409cf921c900472f3b Mon Sep 17 00:00:00 2001 From: wangli28 Date: Tue, 17 Sep 2019 07:50:43 +0000 Subject: [PATCH 2/4] [sdl2-mixer] Remove find_library. --- ports/sdl2-mixer/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 177ac9744e464d..96529d096ba1c1 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -13,7 +13,6 @@ set(SDL_MIXER_DEFINES MUSIC_WAV) # MP3 support if(SDL_MIXER_ENABLE_MP3) find_path(MPG123_INCLUDE_DIR mpg123.h) - find_library(MPG123_LIBRARY NAMES libmpg123 mpg123) list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123) endif() @@ -21,7 +20,6 @@ endif() # FLAC support if(SDL_MIXER_ENABLE_FLAC) find_path(FLAC_INCLUDE_DIR FLAC/all.h) - find_library(FLAC_LIBRARY FLAC) list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC) endif() @@ -29,7 +27,6 @@ endif() # MOD support if(SDL_MIXER_ENABLE_MOD) find_path(MODPLUG_INCLUDE_DIR libmodplug/modplug.h) - find_library(MODPLUG_LIBRARY modplug) list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG) endif() @@ -37,7 +34,6 @@ endif() # Ogg-Vorbis support if(SDL_MIXER_ENABLE_OGGVORBIS) find_path(VORBIS_INCLUDE_DIR vorbis/codec.h) - find_library(VORBISFILE_LIBRARY vorbisfile) list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) endif() @@ -47,7 +43,6 @@ if(SDL_MIXER_ENABLE_OPUS) find_path(OPUS_INCLUDE_DIR opus/opusfile.h) find_package(ogg CONFIG REQUIRED) find_package(Opus CONFIG REQUIRED) - find_library(OPUSFILE_LIBRARY opusfile) list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) endif() From ccfbcec0eb1a878ed7c2ee5d591d76dbedafdf51 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Wed, 18 Sep 2019 02:43:20 +0000 Subject: [PATCH 3/4] [sdl2-mixer] Fix feature name --- ports/sdl2-mixer/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index fc85796f80d330..d96dd0a481e5b9 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -14,11 +14,11 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - mpg123 USE_MP3 - libflac USE_FLAC - libmodplug USE_MOD - libvorbis USE_OGGVORBIS - opusfile USE_OPUS + mpg123 SDL_MIXER_ENABLE_MP3 + libflac SDL_MIXER_ENABLE_FLAC + libmodplug SDL_MIXER_ENABLE_MOD + libvorbis SDL_MIXER_ENABLE_OGGVORBIS + opusfile SDL_MIXER_ENABLE_OPUS ) vcpkg_configure_cmake( From 1f73b4f9ca0764999202cc43a76c6e9bf36edc8e Mon Sep 17 00:00:00 2001 From: wangli28 Date: Wed, 18 Sep 2019 03:22:34 +0000 Subject: [PATCH 4/4] [sdl2-mixer] Fix feature options --- ports/sdl2-mixer/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index d96dd0a481e5b9..315715dfe951ef 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -17,15 +17,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS mpg123 SDL_MIXER_ENABLE_MP3 libflac SDL_MIXER_ENABLE_FLAC libmodplug SDL_MIXER_ENABLE_MOD - libvorbis SDL_MIXER_ENABLE_OGGVORBIS - opusfile SDL_MIXER_ENABLE_OPUS + libvorbis SDL_MIXER_ENABLE_OGGVORBIS + opusfile SDL_MIXER_ENABLE_OPUS ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} OPTIONS_DEBUG - ${FEATURE_OPTIONS} -DSDL_MIXER_SKIP_HEADERS=ON ) @@ -35,5 +36,4 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-mixer) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-mixer/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-mixer/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file