diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-02-01 19:02:49 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-02-01 19:02:49 -0800 |
| commit | d7ca47d9e0d8a54ada14360b0c82421272cf768a (patch) | |
| tree | 1fd7c5a3a4c8ded87f994ffc7cd34ca928f11f5c | |
| parent | fdc885fb06cb6dcb201099b6520a73fb5034da34 (diff) | |
| parent | a2f3a4bf4c67c751e0912ccea6aca2132894c9f8 (diff) | |
| download | vcpkg-d7ca47d9e0d8a54ada14360b0c82421272cf768a.tar.gz vcpkg-d7ca47d9e0d8a54ada14360b0c82421272cf768a.zip | |
Merge pull request #622 from stammen/libvorbis-uwp2
[libvorbis] Fix UWP builds
| -rw-r--r-- | ports/libvorbis/0002-Allow-deprecated-functions.patch | 14 | ||||
| -rw-r--r-- | ports/libvorbis/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libvorbis/portfile.cmake | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ports/libvorbis/0002-Allow-deprecated-functions.patch b/ports/libvorbis/0002-Allow-deprecated-functions.patch new file mode 100644 index 000000000..ea1d07e39 --- /dev/null +++ b/ports/libvorbis/0002-Allow-deprecated-functions.patch @@ -0,0 +1,14 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2043294..e273393 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -61,6 +61,9 @@ if(MSVC) + list(APPEND VORBIS_SOURCES ../win32/vorbis.def) + list(APPEND VORBISENC_SOURCES ../win32/vorbisenc.def) + list(APPEND VORBISFILE_SOURCES ../win32/vorbisfile.def) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE) ++ add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + endif() + + include_directories(../include) diff --git a/ports/libvorbis/CONTROL b/ports/libvorbis/CONTROL index 258edc4db..db9b1f530 100644 --- a/ports/libvorbis/CONTROL +++ b/ports/libvorbis/CONTROL @@ -1,4 +1,4 @@ Source: libvorbis -Version: 1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee +Version: 1.3.5-1-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee Description: Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format. Build-Depends: libogg diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index 66bfca07c..85fa1d26b 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -35,7 +35,9 @@ if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") ) message(STATUS "Patching") vcpkg_execute_required_process( - COMMAND ${GIT} apply ${CMAKE_CURRENT_LIST_DIR}/0001-Add-vorbisenc.c-to-vorbis-library.patch --ignore-whitespace --whitespace=fix + COMMAND ${GIT} apply ${CMAKE_CURRENT_LIST_DIR}/0001-Add-vorbisenc.c-to-vorbis-library.patch + ${CMAKE_CURRENT_LIST_DIR}/0002-Allow-deprecated-functions.patch + --ignore-whitespace --whitespace=fix WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src LOGNAME patch ) |