diff --git a/ports/libvorbis/0004-ogg-find-dependency.patch b/ports/libvorbis/0004-ogg-find-dependency.patch new file mode 100644 index 0000000000..6db3eb14e0 --- /dev/null +++ b/ports/libvorbis/0004-ogg-find-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/VorbisConfig.cmake.in b/cmake/VorbisConfig.cmake.in +index 6fc07941..c762ba55 100644 +--- a/cmake/VorbisConfig.cmake.in ++++ b/cmake/VorbisConfig.cmake.in +@@ -1,7 +1,7 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) +-find_dependency(Ogg REQUIRED) ++find_dependency(Ogg CONFIG) + + include(${CMAKE_CURRENT_LIST_DIR}/VorbisTargets.cmake) + diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index 95f2825b70..5a9bef40b3 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( 0001-Dont-export-vorbisenc-functions.patch 0002-Fixup-pkgconfig-libs.patch 0003-def-mingw-compat.patch + 0004-ogg-find-dependency.patch ) vcpkg_cmake_configure( diff --git a/ports/libvorbis/vcpkg.json b/ports/libvorbis/vcpkg.json index 65c5edd854..44a77c8380 100644 --- a/ports/libvorbis/vcpkg.json +++ b/ports/libvorbis/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libvorbis", "version": "1.3.7", - "port-version": 2, + "port-version": 3, "description": "Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format", "homepage": "https://github.com/xiph/vorbis", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 56d0dbe441..ff7d02b7c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5162,7 +5162,7 @@ }, "libvorbis": { "baseline": "1.3.7", - "port-version": 2 + "port-version": 3 }, "libvpx": { "baseline": "1.13.1", diff --git a/versions/l-/libvorbis.json b/versions/l-/libvorbis.json index 0df7ea5b3c..194aabd330 100644 --- a/versions/l-/libvorbis.json +++ b/versions/l-/libvorbis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23d11198ff2df7a3af54f1c4645ef71a141f2a85", + "version": "1.3.7", + "port-version": 3 + }, { "git-tree": "c4c646a26ce3e6ad63992d3e4a55cb185159b23c", "version": "1.3.7",