aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpast-due <30942300+past-due@users.noreply.github.com>2019-09-11 17:33:07 -0400
committerCurtis J Bezault <curtbezault@gmail.com>2019-09-11 14:33:07 -0700
commitb6bc3f306c295fd2c5c613029a91c05eead3dc94 (patch)
tree06adb693016a9068972800c0e970eefd0c51edb8
parentfa66acbf5a536bb7303bb2831d95808a90059c68 (diff)
downloadvcpkg-b6bc3f306c295fd2c5c613029a91c05eead3dc94.tar.gz
vcpkg-b6bc3f306c295fd2c5c613029a91c05eead3dc94.zip
[libogg] Update to 1.3.4-1 (#8094)
* [libogg] Update to 1.3.4-1 * Remove revision number * Handle new cmake output dir Cmake is now output to .../Ogg/... instead of .../ogg/...
-rw-r--r--ports/libogg/CONTROL2
-rw-r--r--ports/libogg/missing_usize64.patch12
-rw-r--r--ports/libogg/portfile.cmake8
3 files changed, 4 insertions, 18 deletions
diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL
index 497ec9a6d..bc36d27b6 100644
--- a/ports/libogg/CONTROL
+++ b/ports/libogg/CONTROL
@@ -1,4 +1,4 @@
Source: libogg
-Version: 1.3.3-4
+Version: 1.3.4
Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
Homepage: https://github.com/xiph/ogg
diff --git a/ports/libogg/missing_usize64.patch b/ports/libogg/missing_usize64.patch
deleted file mode 100644
index 556bc2a54..000000000
--- a/ports/libogg/missing_usize64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c31a3c..c3c060a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,6 +63,7 @@ set(USIZE16 uint16_t)
- set(SIZE32 int32_t)
- set(USIZE32 uint32_t)
- set(SIZE64 int64_t)
-+set(USIZE64 uint64_t)
-
- configure_file(include/ogg/config_types.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ogg/config_types.h @ONLY)
-
diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake
index 0b3b8be7b..476feb7d2 100644
--- a/ports/libogg/portfile.cmake
+++ b/ports/libogg/portfile.cmake
@@ -3,11 +3,9 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xiph/ogg
- REF 6ccfcc2dce48c0d430b45064d0e13c962a64c42f
- SHA512 441950d541f626a2e668efab4ed429c453534ef0334aad410013f07870a4a99e347f7a7eed335d77af41f02ce3dd600564d982e4c976a0c4cb76c19b1231d39e
+ REF c8fca6b4a02d695b1ceea39b330d4406001c03ed
+ SHA512 52980fcca3c1dbb5fbfa4032f179679a5c4000f1fea88e7ed8b2522d80d27513be96d94933daeb9e36f4ac8556e7e4e8ec7e91101e2ba456e0fce51c484eee9e
HEAD_REF master
- PATCHES
- missing_usize64.patch
)
vcpkg_configure_cmake(
@@ -18,7 +16,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ogg TARGET_PATH share/ogg)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Ogg TARGET_PATH share/ogg)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)