mirror of
https://github.com/cemu-project/vcpkg.git
synced 2024-11-26 20:50:36 +00:00
[libvorbis] Update to 1.3.6-4d963fe
* Use latest upsteam * Support config mode (upstream) * Remove patch 0002 (merged to upstream) * Remove `ogg.patch` (not needed)
This commit is contained in:
parent
0304c45315
commit
e73ad47065
@ -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)
|
@ -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
|
||||
|
@ -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)
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user