Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libogg] Update to 1.3.3-3 #6588

Merged
merged 3 commits into from
Jun 14, 2019
Merged

[libogg] Update to 1.3.3-3 #6588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adc762a
[libogg] Update to 1.3.3-3
evpobr May 24, 2019
e7e9acb
[libogg] change casing on directory path
Rastaban Jun 12, 2019
3285928
[libogg] add missing uint64
Rastaban Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 0 additions & 97 deletions ports/libogg/0001-Install-CMake-package-config-module.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ports/libogg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: libogg
Version: 1.3.3-2
Version: 1.3.3-3
Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
12 changes: 12 additions & 0 deletions ports/libogg/missing_usize64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
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)

12 changes: 6 additions & 6 deletions ports/libogg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xiph/ogg
REF v1.3.3
SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b
REF 6ccfcc2dce48c0d430b45064d0e13c962a64c42f
SHA512 441950d541f626a2e668efab4ed429c453534ef0334aad410013f07870a4a99e347f7a7eed335d77af41f02ce3dd600564d982e4c976a0c4cb76c19b1231d39e
HEAD_REF master
PATCHES 0001-Install-CMake-package-config-module.patch
PATCHES
missing_usize64.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DINSTALL_DOCS=0 -DINSTALL_PKG_CONFIG_MODULE=0
)

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)

Expand Down