diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-05-08 12:17:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 12:17:55 -0700 |
| commit | e3deeb0e9215d76beede0773ad00e61359e80990 (patch) | |
| tree | 2e5d6f42ad043aba5b73367e7740fc5fa96abfd6 | |
| parent | 8275e05ca6711ab15aa30a89e3e97767f5a57ed0 (diff) | |
| parent | a315b78ae0a04a22525d1f069e0a620cc7c339f2 (diff) | |
| download | vcpkg-e3deeb0e9215d76beede0773ad00e61359e80990.tar.gz vcpkg-e3deeb0e9215d76beede0773ad00e61359e80990.zip | |
Merge pull request #1048 from OlafvdSpek/lzo
Update LZO to 2.10
| -rw-r--r-- | ports/lzo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/lzo/do-not-declare-setargv.patch | 17 | ||||
| -rw-r--r-- | ports/lzo/portfile.cmake | 15 |
3 files changed, 6 insertions, 28 deletions
diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL index afc3540d2..a3b69bd7e 100644 --- a/ports/lzo/CONTROL +++ b/ports/lzo/CONTROL @@ -1,3 +1,3 @@ Source: lzo -Version: 2.09 +Version: 2.10 Description: Lossless data compression library diff --git a/ports/lzo/do-not-declare-setargv.patch b/ports/lzo/do-not-declare-setargv.patch deleted file mode 100644 index 48ae31514..000000000 --- a/ports/lzo/do-not-declare-setargv.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/lzo_supp.h b/src/lzo_supp.h -index 87307f9..f94a6b0 100644 ---- a/src/lzo_supp.h -+++ b/src/lzo_supp.h -@@ -3643,9 +3643,9 @@ LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); } - #endif - #if (LZO_OS_WIN32 || LZO_OS_WIN64) - #if (LZO_CC_INTELC || LZO_CC_MSC) --LZO_EXTERN_C int __lzo_cdecl __setargv(void); --LZO_EXTERN_C int __lzo_cdecl _setargv(void); --LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); } -+// LZO_EXTERN_C int __lzo_cdecl __setargv(void); -+// LZO_EXTERN_C int __lzo_cdecl _setargv(void); -+// LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); } - #endif - #endif - #if (LZO_OS_EMX) diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake index 6df36269c..e9575f5ce 100644 --- a/ports/lzo/portfile.cmake +++ b/ports/lzo/portfile.cmake @@ -12,19 +12,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lzo-2.09) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lzo-2.10) vcpkg_download_distfile(ARCHIVE - URLS "http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz" - FILENAME "lzo-2.09.tar.gz" - SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7 + URLS "http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz" + FILENAME "lzo-2.10.tar.gz" + SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4 ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/do-not-declare-setargv.patch" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 @@ -40,5 +35,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/lzo-2.09/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lzo) +file(COPY ${CURRENT_BUILDTREES_DIR}/src/lzo-2.10/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lzo) file(RENAME ${CURRENT_PACKAGES_DIR}/share/lzo/COPYING ${CURRENT_PACKAGES_DIR}/share/lzo/copyright) |