diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-06 22:07:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 13:07:46 -0700 |
| commit | 61c055a6fcfee2a7e764997bb2478adf49db6edf (patch) | |
| tree | 708267482f32dabbbb9b41f6c6e8dfb331b451a0 /ports/sfml | |
| parent | 56174640c9b593f088145ea9cea70d84edf65c92 (diff) | |
| download | vcpkg-61c055a6fcfee2a7e764997bb2478adf49db6edf.tar.gz vcpkg-61c055a6fcfee2a7e764997bb2478adf49db6edf.zip | |
[brotli] add pkgconfig / [freetype] depend on brotli (#12405)
* [brotli] add pkgconfig
* [freetype] add pkgconfig and add dependency on brotli
* [qt5-base] add new freetype dependency to brotli and zstd
* [freetype] fix cmake paths
* [freetype] removed renaming of include dir and unnecessary cmake fixes
* [freetype-gl] fix glew include dir
* [podofo] fix freetype search.
* fixing wrong freetype stuff due to vcpkg owned wrong CMakeLists.txt .....
* fixing more freetype hidden issues.
* [sfml] fix missing include
* fix typo
* [freetype] uncomment previous renaming of include folders
* fix brotli linkage in static builds
* remove added alias to avoid problems.
* [freetype] add brotli to the wrapper
* [lzokay] format manifest
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/sfml')
| -rw-r--r-- | ports/sfml/CONTROL | 3 | ||||
| -rw-r--r-- | ports/sfml/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/sfml/stb_include.patch | 14 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index 6f46156a9..836280f8b 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,5 +1,6 @@ Source: sfml -Version: 2.5.1-7 +Version: 2.5.1 +Port-Version: 8 Homepage: https://github.com/sfml/sfml Description: Simple and fast multimedia library Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index efbcdd135..82f6e11d1 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 PATCHES use-system-freetype.patch + stb_include.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) diff --git a/ports/sfml/stb_include.patch b/ports/sfml/stb_include.patch new file mode 100644 index 000000000..3519b1c1e --- /dev/null +++ b/ports/sfml/stb_include.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e821a49bc..c68264ef2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,6 +188,9 @@ if(SFML_USE_SYSTEM_DEPS) + endforeach() + + list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) ++ ++ find_path(STB_INCLUDE_DIR stb.h) ++ include_directories(${STB_INCLUDE_DIR}) + endif() + + # Visual C++: remove warnings regarding SL security and algorithms on pointers |