cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-24 11:49:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2533 from procxx/sdl2-image

Browse Source 
[sdl2-image] Update to 2.0.2
This commit is contained in:
Robert Schumacher 2018-01-09 00:21:53 -08:00 committed by GitHub
commit ce3026aece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ project(SDL2_image C)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
# enable all file formats which are supported natively # enable all file formats which are supported natively
set(SUPPORTED_FORMATS BMP GIF LBM PCX PNM TGA XPM XCF XV) set(SUPPORTED_FORMATS BMP GIF LBM PCX PNM TGA XPM XCF XV SVG)
# enable all file formats which are supported through external dependencies # enable all file formats which are supported through external dependencies
# first try to load them statically (lib file in vcpkg installation) # first try to load them statically (lib file in vcpkg installation)
@ -34,6 +34,7 @@ add_library(SDL2_image
IMG_pcx.c IMG_pcx.c
IMG_png.c IMG_png.c
IMG_pnm.c IMG_pnm.c
IMG_svg.c
IMG_tga.c IMG_tga.c
IMG_tif.c IMG_tif.c
IMG_webp.c IMG_webp.c

2
ports/sdl2-image/CONTROL
View File

@ -1,5 +1,5 @@
Source: sdl2-image Source: sdl2-image
Version: 2.0.1-3 Version: 2.0.2
Build-Depends: sdl2, libpng, libjpeg-turbo, tiff, libwebp Build-Depends: sdl2, libpng, libjpeg-turbo, tiff, libwebp
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

25
ports/sdl2-image/correct-sdl-headers-dir.patch
View File

@ -1,25 +0,0 @@
diff --git "a/SDL_image.h" "b/SDL_image.h"
index f654483..1bd4f62 100644
--- "a/SDL_image.h"
+++ "b/SDL_image.h"
@@ -24,9 +24,9 @@
#ifndef _SDL_IMAGE_H
#define _SDL_IMAGE_H
-#include "SDL.h"
-#include "SDL_version.h"
-#include "begin_code.h"
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_version.h>
+#include <SDL2/begin_code.h>
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
@@ -140,6 +140,6 @@ extern DECLSPEC int SDLCALL IMG_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst,
#ifdef __cplusplus
}
#endif
-#include "close_code.h"
+#include <SDL2/close_code.h>
#endif /* _SDL_IMAGE_H */

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

@ -7,19 +7,15 @@
# #
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_image-2.0.1) set(SDL2_IMAGE_VERSION "2.0.2")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_image-${SDL2_IMAGE_VERSION})
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.zip" URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${SDL2_IMAGE_VERSION}.zip"
FILENAME "SDL2_image-2.0.1.zip" FILENAME "SDL2_image-${SDL2_IMAGE_VERSION}.zip"
SHA512 37d12f4fae71c586bec73262bddb9207ab2f9a2ca6001d2cbfde646e268a950ba5cd4cff53d75e2da8959ae6da6e9cadc6eca88fa7bd9aa2758395d64c84a307 SHA512 bf143bdbd3cb7cfad61b8dcc35950584304deac802bad6c0c8144e914401a5ddef01f674d2dc1214371d0f371f76e87a45873e2655947e8e1da83fb44d8285f4
) )
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/correct-sdl-headers-dir.patch)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindWEBP.cmake DESTINATION ${SOURCE_PATH}/cmake) file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindWEBP.cmake DESTINATION ${SOURCE_PATH}/cmake)