diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2020-10-07 18:23:23 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 00:23:23 -0700 |
| commit | 72d98524e38d96982618d872ae045c2edb7f2c2e (patch) | |
| tree | 938f98d29453f0c19943da588bcf6ede02b0e110 /ports/libvorbis | |
| parent | 7dc0049439681a7f9537af420573d0ac3ef6ce31 (diff) | |
| download | vcpkg-72d98524e38d96982618d872ae045c2edb7f2c2e.tar.gz vcpkg-72d98524e38d96982618d872ae045c2edb7f2c2e.zip | |
[ffmpeg] Update to 4.3.1 (#13365)
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/libvorbis')
| -rw-r--r-- | ports/libvorbis/0002-Fixup-pkgconfig-libs.patch | 15 | ||||
| -rw-r--r-- | ports/libvorbis/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/libvorbis/vcpkg.json | 1 |
3 files changed, 17 insertions, 4 deletions
diff --git a/ports/libvorbis/0002-Fixup-pkgconfig-libs.patch b/ports/libvorbis/0002-Fixup-pkgconfig-libs.patch new file mode 100644 index 000000000..85508f16f --- /dev/null +++ b/ports/libvorbis/0002-Fixup-pkgconfig-libs.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f377c428..07530304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,9 @@ message(STATUS "Configuring ${PROJECT_NAME} ${PROJECT_VERSION}") + # Find math library + + check_library_exists(m floor "" HAVE_LIBM) ++if(HAVE_LIBM) ++ set(VORBIS_LIBS "-lm") ++endif() + + # Find ogg dependency + find_package(Ogg REQUIRED) + diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index d6d29cf9f..a015e0e8c 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-Dont-export-vorbisenc-functions.patch + 0002-Fixup-pkgconfig-libs.patch ) vcpkg_configure_cmake( @@ -26,8 +27,4 @@ configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copy vcpkg_copy_pdbs() -if(WIN32 AND (NOT MINGW)) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vorbis.pc" "-lm" "") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vorbis.pc" "-lm" "") -endif() vcpkg_fixup_pkgconfig() diff --git a/ports/libvorbis/vcpkg.json b/ports/libvorbis/vcpkg.json index 9f467363d..af19c1851 100644 --- a/ports/libvorbis/vcpkg.json +++ b/ports/libvorbis/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvorbis", "version-string": "1.3.7", + "port-version": 1, "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", |