mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 20:03:02 +08:00
[ebml,matroska] update ebml to 1.3.7, fix installation on linux (#5981)
* [ebml] fix installation on linux * [ebml] update to 1.3.7 * [ebml] fix config installation on linux * [matroska] cleanup, fix linux compilation
This commit is contained in:
kiwixz
Phil Christensen
parent
bc907b64ee
commit
9a4f3c1982
@ -1,3 +1,3 @@
|
||||
Source: ebml
|
||||
Version: 1.3.6-1
|
||||
Version: 1.3.7
|
||||
Description: a C++ libary to parse EBML files
|
||||
|
||||
@ -4,12 +4,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
message(FATAL_ERROR "${PORT} does not currently support UWP")
|
||||
endif()
|
||||
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Matroska-Org/libebml
|
||||
REF release-1.3.6
|
||||
SHA512 249ff2e9b381d827311eaec910962685243a3b65335c7bd404a35e11cd204c63bc7ea69787f0e27ea9c9144024e45867fd4ae7d30688a3695cd45fee1ce89ec9
|
||||
REF release-1.3.7
|
||||
SHA512 754dee128db2eb6f0ba09962312ddda79f3178238464dd6161cce50bd08fd4193490a48bb537c4e2a388dc339951909a8857617cb30500d76d5689da4f855b47
|
||||
HEAD_REF master
|
||||
PATCHES export-endofstreamx.patch
|
||||
)
|
||||
@ -22,7 +21,11 @@ vcpkg_configure_cmake(
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
|
||||
if (WIN32)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
|
||||
else ()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ebml)
|
||||
endif ()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
|
||||
@ -1,110 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.1.2)
|
||||
|
||||
project(matroska VERSION 1.4.8)
|
||||
|
||||
option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
|
||||
option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF)
|
||||
|
||||
find_package(ebml 1.3.5 REQUIRED)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
set(libmatroska_SOURCES
|
||||
src/FileKax.cpp
|
||||
src/KaxAttached.cpp
|
||||
src/KaxAttachments.cpp
|
||||
src/KaxBlock.cpp
|
||||
src/KaxBlockData.cpp
|
||||
src/KaxCluster.cpp
|
||||
src/KaxContexts.cpp
|
||||
src/KaxCues.cpp
|
||||
src/KaxCuesData.cpp
|
||||
src/KaxInfoData.cpp
|
||||
src/KaxSeekHead.cpp
|
||||
src/KaxSegment.cpp
|
||||
src/KaxSemantic.cpp
|
||||
src/KaxTracks.cpp
|
||||
src/KaxVersion.cpp)
|
||||
|
||||
set(libmatroska_PUBLIC_HEADERS
|
||||
matroska/FileKax.h
|
||||
matroska/KaxAttached.h
|
||||
matroska/KaxAttachments.h
|
||||
matroska/KaxBlockData.h
|
||||
matroska/KaxBlock.h
|
||||
matroska/KaxChapters.h
|
||||
matroska/KaxClusterData.h
|
||||
matroska/KaxCluster.h
|
||||
matroska/KaxConfig.h
|
||||
matroska/KaxContentEncoding.h
|
||||
matroska/KaxContexts.h
|
||||
matroska/KaxCuesData.h
|
||||
matroska/KaxCues.h
|
||||
matroska/KaxDefines.h
|
||||
matroska/KaxInfoData.h
|
||||
matroska/KaxInfo.h
|
||||
matroska/KaxSeekHead.h
|
||||
matroska/KaxSegment.h
|
||||
matroska/KaxSemantic.h
|
||||
matroska/KaxTag.h
|
||||
matroska/KaxTags.h
|
||||
matroska/KaxTrackAudio.h
|
||||
matroska/KaxTrackEntryData.h
|
||||
matroska/KaxTracks.h
|
||||
matroska/KaxTrackVideo.h
|
||||
matroska/KaxTypes.h
|
||||
matroska/KaxVersion.h)
|
||||
|
||||
set (libmatroska_C_PUBLIC_HEADERS
|
||||
matroska/c/libmatroska.h
|
||||
matroska/c/libmatroska_t.h)
|
||||
|
||||
add_library(matroska ${libmatroska_SOURCES} ${limatroska_PUBLIC_HEADERS} ${libmatroska_C_PUBLIC_HEADERS})
|
||||
target_link_libraries(matroska PUBLIC ebml)
|
||||
set_target_properties(matroska PROPERTIES
|
||||
VERSION 6.0.0
|
||||
SOVERSION 6)
|
||||
target_include_directories(matroska PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
||||
if(MSVC)
|
||||
target_compile_definitions(matroska PRIVATE _CRT_SECURE_NO_WARNINGS)
|
||||
endif()
|
||||
if(BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(matroska PUBLIC MATROSKA_DLL)
|
||||
set_target_properties(matroska PROPERTIES DEFINE_SYMBOL "MATROSKA_DLL_EXPORT")
|
||||
endif()
|
||||
|
||||
install(TARGETS matroska
|
||||
EXPORT MatroskaTargets
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
install(FILES ${libmatroska_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska)
|
||||
install(FILES ${libmatroska_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska/c)
|
||||
|
||||
if(NOT DISABLE_PKGCONFIG)
|
||||
set(prefix ${CMAKE_INSTALL_PREFIX})
|
||||
set(exec_prefix "\$\{prefix\}")
|
||||
set(libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}")
|
||||
set(includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
set(PACKAGE_VERSION ${PROJECT_VERSION})
|
||||
configure_file(libmatroska.pc.in libmatroska.pc @ONLY)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmatroska.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
endif()
|
||||
|
||||
if(NOT DISABLE_CMAKE_CONFIG)
|
||||
if(WIN32)
|
||||
set(CMAKE_INSTALL_PACKAGEDIR cmake)
|
||||
elseif(WIN32)
|
||||
set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
||||
endif()
|
||||
include(CMakePackageConfigHelpers)
|
||||
write_basic_package_version_file(MatroskaConfigVersion.cmake COMPATIBILITY SameMajorVersion)
|
||||
install(EXPORT MatroskaTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/MatroskaConfig.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/MatroskaConfigVersion.cmake
|
||||
DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
|
||||
endif()
|
||||
@ -1,4 +1,4 @@
|
||||
Source: matroska
|
||||
Version: 1.4.9
|
||||
Version: 1.4.9-1
|
||||
Description: a C++ libary to parse Matroska files (.mkv and .mka)
|
||||
Build-Depends: ebml
|
||||
|
||||
@ -1,15 +1,3 @@
|
||||
# Common Ambient Variables:
|
||||
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
|
||||
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
|
||||
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
|
||||
# PORT = current port name (zlib, etc)
|
||||
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
|
||||
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
|
||||
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
|
||||
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
|
||||
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
|
||||
#
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
@ -26,15 +14,17 @@ vcpkg_from_github(
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA # Disable this option if project cannot be built with Ninja
|
||||
PREFER_NINJA
|
||||
OPTIONS -DDISABLE_PKGCONFIG=1
|
||||
# OPTIONS_RELEASE -DOPTIMIZE=1
|
||||
# OPTIONS_DEBUG -DDEBUGGABLE=1
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
|
||||
if (WIN32)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
|
||||
else ()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/matroska)
|
||||
endif ()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user