The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update various SDL2-based libraries (#5623)

Browse Source 
* [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()
This commit is contained in:
Daniel 2019-03-11 20:15:08 +00:00 committed by Victor Romero
parent 37ddeed0ea
commit 7dcf30197e
10 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/sdl2-gfx/CONTROL
View File

@ -1,4 +1,4 @@
Source: sdl2-gfx Source: sdl2-gfx
Version: 1.0.3-3 Version: 1.0.4
Build-Depends: sdl2 Build-Depends: sdl2
Description: Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer. Description: Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.

18
ports/sdl2-gfx/portfile.cmake
View File

@ -1,11 +1,19 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_gfx-1.0.3)
set(VERSION 1.0.4)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.3.zip" URLS "http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${VERSION}.zip"
FILENAME "SDL2_gfx-1.0.3.zip" FILENAME "SDL2_gfx-${VERSION}.zip"
SHA512 f68485f71acf979aba68f3575f260fbc95a59496a9639498bcff80ffbfdb157c82a44bb5a0b0e3b1e157376ea4ff2f196f50466e6f24d850f94cfe7c24b1a497 SHA512 213b481469ba2161bd8558a7a5427b129420193b1c3895923d515f69f87991ed2c99bbc44349c60b4bcbb7d7d2255c1f15ee8a3523c26502070cfaacccaa5242
) )
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${VERSION}
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake( vcpkg_configure_cmake(

1
ports/sdl2-image/CMakeLists.txt
View File

@ -44,6 +44,7 @@ add_library(SDL2_image
IMG_xpm.c IMG_xpm.c
IMG_xv.c IMG_xv.c
IMG_xxx.c IMG_xxx.c
IMG_WIC.c
version.rc version.rc
) )

2
ports/sdl2-image/CONTROL
View File

@ -1,5 +1,5 @@
Source: sdl2-image Source: sdl2-image
Version: 2.0.2-3 Version: 2.0.4
Build-Depends: sdl2, libpng Build-Depends: sdl2, libpng
Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV

14
ports/sdl2-image/portfile.cmake
View File

@ -1,12 +1,18 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SDL2_IMAGE_VERSION "2.0.2")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_image-${SDL2_IMAGE_VERSION}) set(SDL2_IMAGE_VERSION "2.0.4")
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${SDL2_IMAGE_VERSION}.zip" URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${SDL2_IMAGE_VERSION}.zip"
FILENAME "SDL2_image-${SDL2_IMAGE_VERSION}.zip" FILENAME "SDL2_image-${SDL2_IMAGE_VERSION}.zip"
SHA512 bf143bdbd3cb7cfad61b8dcc35950584304deac802bad6c0c8144e914401a5ddef01f674d2dc1214371d0f371f76e87a45873e2655947e8e1da83fb44d8285f4 SHA512 b26ef2546718754481385ddad800ee61c84c58a9e141127c0a12215362d41c23603bfb21d556803396c0cb17bd7f48a45dd1b2e66573a1b2e32f590cc3fa48d0
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${SDL2_IMAGE_VERSION}
) )
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

11
ports/sdl2-mixer/CMakeLists.txt
View File

@ -45,6 +45,15 @@ if(SDL_MIXER_ENABLE_OGGVORBIS)
list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) list(APPEND SDL_MIXER_DEFINES MUSIC_OGG)
endif() 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 add_library(SDL2_mixer
effect_position.c effect_position.c
effect_stereoreverse.c effect_stereoreverse.c
@ -61,7 +70,7 @@ add_library(SDL2_mixer
music_modplug.c music_modplug.c
music_mpg123.c music_mpg123.c
music_ogg.c music_ogg.c
music_smpeg.c music_opus.c
music_timidity.c music_timidity.c
music_wav.c music_wav.c
version.rc) version.rc)

6
ports/sdl2-mixer/CONTROL
View File

@ -1,5 +1,5 @@
Source: sdl2-mixer Source: sdl2-mixer
Version: 2.0.2-6 Version: 2.0.4
Description: Multi-channel audio mixer library for SDL. Description: Multi-channel audio mixer library for SDL.
Build-Depends: sdl2 Build-Depends: sdl2
@ -18,3 +18,7 @@ Build-Depends: libmodplug
Feature: libvorbis Feature: libvorbis
Description: Support for OGG Vorbis audio format. Description: Support for OGG Vorbis audio format.
Build-Depends: libvorbis Build-Depends: libvorbis
Feature: opusfile
Description: Support for Opus audio format.
Build-Depends: opusfile

12
ports/sdl2-mixer/portfile.cmake
View File

@ -1,9 +1,9 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SDL2_MIXER_VERSION 2.0.2) set(SDL2_MIXER_VERSION 2.0.4)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip" URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip"
FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip" FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip"
SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc SHA512 359b4f9877804f9c4b3cb608ca6082aab684f07a20a816ab71c8cdf85d26f76d67eeb5aee44daf52b7935d82aa3b45941f8f53f07ca3dd5150d6c58ed99e1492
) )
vcpkg_extract_source_archive_ex( vcpkg_extract_source_archive_ex(
@ -33,6 +33,11 @@ if("libvorbis" IN_LIST FEATURES)
set(USE_OGGVORBIS ON) set(USE_OGGVORBIS ON)
endif() endif()
set(USE_OPUS OFF)
if("opusfile" IN_LIST FEATURES)
set(USE_OPUS ON)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
@ -40,7 +45,8 @@ vcpkg_configure_cmake(
-DSDL_MIXER_ENABLE_MP3=${USE_MP3} # mpg123 -DSDL_MIXER_ENABLE_MP3=${USE_MP3} # mpg123
-DSDL_MIXER_ENABLE_FLAC=${USE_FLAC} # libflac -DSDL_MIXER_ENABLE_FLAC=${USE_FLAC} # libflac
-DSDL_MIXER_ENABLE_MOD=${USE_MOD} # libmodplug -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 OPTIONS_DEBUG
-DSDL_MIXER_SKIP_HEADERS=ON -DSDL_MIXER_SKIP_HEADERS=ON
) )

2
ports/sdl2-ttf/CONTROL
View File

@ -1,4 +1,4 @@
Source: sdl2-ttf Source: sdl2-ttf
Version: 2.0.14-4 Version: 2.0.15
Description: A library for rendering TrueType fonts with SDL Description: A library for rendering TrueType fonts with SDL
Build-Depends: sdl2, freetype Build-Depends: sdl2, freetype

20
ports/sdl2-ttf/portfile.cmake
View File

@ -1,12 +1,18 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_ttf-2.0.14)
set(VERSION 2.0.15)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz" URLS "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${VERSION}.tar.gz"
FILENAME "SDL2_ttf-2.0.14.tar.gz" FILENAME "SDL2_ttf-${VERSION}.tar.gz"
SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099) SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${VERSION}
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})