Merge pull request #10756 from evpobr/libvorbis-update-to-v1.3.6-4d963fe-4

[libvorbis] Update to latest commit

4 files changed, 8 insertions, 38 deletions

diff --git a/ports/libvorbis/0002-Allow-deprecated-functions.patch b/ports/libvorbis/0002-Allow-deprecated-functions.patch
deleted file mode 100644
index ea1d07e39..000000000
--- a/ports/libvorbis/0002-Allow-deprecated-functions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 2043294..e273393 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -61,6 +61,9 @@ if(MSVC)
-     list(APPEND VORBIS_SOURCES ../win32/vorbis.def)
-     list(APPEND VORBISENC_SOURCES ../win32/vorbisenc.def)
-     list(APPEND VORBISFILE_SOURCES ../win32/vorbisfile.def)
-+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
- endif()
- 
- include_directories(../include)
diff --git a/ports/libvorbis/CONTROL b/ports/libvorbis/CONTROL
index 33a300957..8ea6bbc44 100644
--- a/ports/libvorbis/CONTROL
+++ b/ports/libvorbis/CONTROL
@@ -1,5 +1,5 @@
 Source: libvorbis
-Version: 1.3.6-9eadecc-3
+Version: 1.3.6-4d963fe
 Homepage: https://github.com/xiph/vorbis
 Description: Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format.
 Build-Depends: libogg
diff --git a/ports/libvorbis/ogg.patch b/ports/libvorbis/ogg.patch
deleted file mode 100644
index 323e2c7e2..000000000
--- a/ports/libvorbis/ogg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbc045ba..a23630f5 100644
---- a/CMakeLists.txt	
-+++ b/CMakeLists.txt
-@@ -57,10 +57,10 @@ if(NOT OGG_ROOT)
-     find_package(PkgConfig QUIET)
-     pkg_check_modules(PC_OGG QUIET ogg)
-     find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${PC_OGG_INCLUDE_DIRS} PATH_SUFFIXES ogg)
--    find_library(OGG_LIBRARIES NAMES ogg HINTS ${PC_OGG_LIBRARY_DIRS})
-+    find_library(OGG_LIBRARIES NAMES ogg libogg HINTS ${PC_OGG_LIBRARY_DIRS})
- else()
-     find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${OGG_ROOT}/include PATH_SUFFIXES ogg)
--    find_library(OGG_LIBRARIES NAMES ogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64)
-+    find_library(OGG_LIBRARIES NAMES ogg libogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64)
- endif()
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(OGG DEFAULT_MSG OGG_INCLUDE_DIRS OGG_LIBRARIES)
diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake
index 0e1ef5d42..cf6b86a5c 100644
--- a/ports/libvorbis/portfile.cmake
+++ b/ports/libvorbis/portfile.cmake
@@ -1,14 +1,11 @@
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiph/vorbis
-    REF 9eadeccdc4247127d91ac70555074239f5ce3529
-    SHA512 26d6826eba57fd47ebf426ba5a0c961c87ff62e2bb4185190e4985de9ac49aa493f77a1bd01d3d0757eb89a8494ba7de3a506f76bf5c8942ac1de3f75746a301
+    REF 4d963fe0b4ba3bdb45233de4b959ce2f36963f7a
+    SHA512 c739cebf1a7ff4739447e899d3373e2fa7a0f3a87affd59c9c0c65d69e7611ceadcdcd1592c279e65123d7d2e1c9f8f8e7dee93def8753bcdd6d115677232d83
     HEAD_REF master
     PATCHES
         0001-Dont-export-vorbisenc-functions.patch
-        0002-Allow-deprecated-functions.patch
-        ogg.patch
 )
 
 vcpkg_configure_cmake(
@@ -17,10 +14,14 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/Vorbis
+    TARGET_PATH share/Vorbis
+)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libvorbis/copyright COPYONLY)
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
 vcpkg_copy_pdbs()