[libogg] Update to 1.3.3-3 (#6588)

* [libogg] Update to 1.3.3-3

* No patches required (merged in upstream)

Notes:

Target name changed: Ogg::Ogg -> Ogg::ogg (official).

4 files changed, 19 insertions, 104 deletions

diff --git a/ports/libogg/0001-Install-CMake-package-config-module.patch b/ports/libogg/0001-Install-CMake-package-config-module.patch
deleted file mode 100644
index 2a33a641e..000000000
--- a/ports/libogg/0001-Install-CMake-package-config-module.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0d3c307cee6e8135c84f3f7755bbc10dfd26e02b Mon Sep 17 00:00:00 2001
-From: evpobr <evpobr@gmail.com>
-Date: Sat, 16 Feb 2019 11:50:16 +0500
-Subject: [PATCH] Install CMake package config module
-
----
- CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++------
- 1 file changed, 34 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ab14a2..9f5ee5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,9 +1,10 @@
--cmake_minimum_required(VERSION 2.8.7)
-+cmake_minimum_required(VERSION 2.8.12)
- project(libogg)
- 
- # Required modules
- include(GNUInstallDirs)
- include(CheckIncludeFiles)
-+include(CMakePackageConfigHelpers)
- 
- # Build options
- option(BUILD_SHARED_LIBS "Build shared library" OFF)
-@@ -80,18 +81,24 @@ if(BUILD_FRAMEWORK)
-     set(BUILD_SHARED_LIBS TRUE)
- endif()
- 
--include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include)
--add_library(ogg ${OGG_HEADERS} ${OGG_SOURCES})
-+add_library(Ogg ${OGG_HEADERS} ${OGG_SOURCES})
-+
-+target_include_directories(Ogg
-+    PUBLIC
-+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-+)
- 
- get_version_info(OGG_VERSION_INFO "LIB_CURRENT" "LIB_AGE" "LIB_REVISION")
- set_target_properties(
--    ogg PROPERTIES
-+    Ogg PROPERTIES
-     SOVERSION ${OGG_VERSION_INFO}
-     PUBLIC_HEADER "${OGG_HEADERS}"
- )
- 
- if(BUILD_FRAMEWORK)
--    set_target_properties(ogg PROPERTIES
-+    set_target_properties(Ogg PROPERTIES
-         FRAMEWORK TRUE
-         FRAMEWORK_VERSION ${PROJECT_VERSION}
-         MACOSX_FRAMEWORK_IDENTIFIER org.xiph.ogg
-@@ -100,17 +107,38 @@ if(BUILD_FRAMEWORK)
-         XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
-         OUTPUT_NAME Ogg
-     )
-+else()
-+    set_target_properties(Ogg PROPERTIES OUTPUT_NAME ogg)
- endif()
- 
- configure_pkg_config_file(ogg.pc.in)
- 
--install(TARGETS ogg
-+set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Ogg)
-+
-+install(TARGETS Ogg
-+    EXPORT OggConfig
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
-     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ogg
- )
-+install(EXPORT OggConfig
-+    NAMESPACE Ogg::
-+    DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}
-+)
-+
-+if(CMAKE_VERSION VERSION_LESS 3.11)
-+    write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMajorVersion)
-+else()
-+    write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMinorVersion)
-+endif()
-+
-+install(
-+    FILES ${CMAKE_CURRENT_BINARY_DIR}/OggConfigVersion.cmake
-+    DESTINATION	${CMAKE_INSTALL_PACKAGEDIR}
-+)
-+
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ogg.pc
-     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
--- 
-2.20.1.windows.1
-
diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL
index 965e4e46f..3d52a9dca 100644
--- a/ports/libogg/CONTROL
+++ b/ports/libogg/CONTROL
@@ -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.

diff --git a/ports/libogg/missing_usize64.patch b/ports/libogg/missing_usize64.patch
new file mode 100644
index 000000000..556bc2a54
--- /dev/null
+++ b/ports/libogg/missing_usize64.patch
@@ -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)

+ 

diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake
index 3a37e1744..b42ad8136 100644
--- a/ports/libogg/portfile.cmake
+++ b/ports/libogg/portfile.cmake
@@ -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)