diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-28 09:24:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 09:24:41 -0700 |
| commit | 7039a09b0664a68a8323644eafe53df6ea941585 (patch) | |
| tree | a961606c44a44fc4388c884fce3d33f8369ec954 | |
| parent | 2c8bbf0caeb8d2d358917b461dff85285eb060df (diff) | |
| parent | 2b27fdec678de875880bbbaa3af146ce7a515414 (diff) | |
| download | vcpkg-7039a09b0664a68a8323644eafe53df6ea941585.tar.gz vcpkg-7039a09b0664a68a8323644eafe53df6ea941585.zip | |
Merge pull request #1557 from atkawa7/ogg
[libogg] use vcpkg_from_github
| -rw-r--r-- | ports/libogg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libogg/portfile.cmake | 46 |
2 files changed, 12 insertions, 36 deletions
diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL index 266cf4c2b..fb4557e57 100644 --- a/ports/libogg/CONTROL +++ b/ports/libogg/CONTROL @@ -1,3 +1,3 @@ Source: libogg -Version: 1.3.2 +Version: 2017-07-27-cab46b19847 Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index 4127a6aef..fb666acde 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -1,44 +1,20 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - include(vcpkg_common_functions) -find_program(GIT git) - -set(GIT_URL "https://git.xiph.org/ogg.git") -set(GIT_REF "cab46b19847eb1d38aeda73ab4708716e5776366") - -if(NOT EXISTS "${DOWNLOADS}/ogg.git") - message(STATUS "Cloning") - vcpkg_execute_required_process( - COMMAND ${GIT} clone --bare ${GIT_URL} ${DOWNLOADS}/ogg.git - WORKING_DIRECTORY ${DOWNLOADS} - LOGNAME clone - ) -endif() - -if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") - message(STATUS "Adding worktree") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}) - vcpkg_execute_required_process( - COMMAND ${GIT} worktree add -f --detach ${CURRENT_BUILDTREES_DIR}/src ${GIT_REF} - WORKING_DIRECTORY ${DOWNLOADS}/ogg.git - LOGNAME worktree - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/ogg + REF cab46b19847eb1d38aeda73ab4708716e5776366 + SHA512 3a5add81210a699c219ef3cef52ed71e00069dfee160aaf23bb68126f768a57139a77022f8c7bec88143a9393865a1e81b0a4c4e7b9e7f533dc665d656e99d90 + HEAD_REF master +) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src + SOURCE_PATH ${SOURCE_PATH} ) vcpkg_install_cmake() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libogg/COPYING ${CURRENT_PACKAGES_DIR}/share/libogg/copyright) vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg RENAME copyright) |