[libmediainfo] Update to 20.08 (#12944)

This commit is contained in:
Maxime Gervais 2020-08-20 06:24:02 +02:00 committed by GitHub
parent 89aa2f39f0
commit a6ca1a514b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 14 deletions

View File

@ -1,5 +1,5 @@
Source: libmediainfo Source: libmediainfo
Version: 20.03 Version: 20.08
Homepage: https://github.com/MediaArea/MediaInfoLib Homepage: https://github.com/MediaArea/MediaInfoLib
Description: Get most relevant technical and tag data from video and audio files Description: Get most relevant technical and tag data from video and audio files
Build-Depends: libzen, curl, zlib Build-Depends: libzen, curl, zlib

View File

@ -1,8 +1,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO MediaArea/MediaInfoLib REPO MediaArea/MediaInfoLib
REF v20.03 REF v20.08
SHA512 c5d3444c8694ca68ee08f97f387cef3aefd9fbb23623b643a6daf9ed7d247521f1291a8a13c9088b31be9a9d594ca772d3125d6eb3d3770bee1f7c50b3b23c07 SHA512 271742af2b2407c04a0555d851fc9ef5590326f4101413ef2092d0a0b99e8367d01bb6442464d171b582b00bb2f45edb9bc9867e74a8d14daba99e2416bc08f3
HEAD_REF master HEAD_REF master
PATCHES vcpkg_support_in_cmakelists.patch PATCHES vcpkg_support_in_cmakelists.patch
) )
@ -10,7 +10,9 @@ vcpkg_from_github(
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Project/CMake SOURCE_PATH ${SOURCE_PATH}/Project/CMake
PREFER_NINJA PREFER_NINJA
OPTIONS -DBUILD_ZENLIB=0 -DBUILD_ZLIB=0 OPTIONS
-DBUILD_ZENLIB=0
-DBUILD_ZLIB=0
) )
vcpkg_install_cmake() vcpkg_install_cmake()

View File

@ -2,16 +2,6 @@ diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
index 47c4ed13..f13ff531 100644 index 47c4ed13..f13ff531 100644
--- a/Project/CMake/CMakeLists.txt --- a/Project/CMake/CMakeLists.txt
+++ b/Project/CMake/CMakeLists.txt +++ b/Project/CMake/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(MediaInfoLib)
-
cmake_minimum_required(VERSION 2.8.11)
+project(MediaInfoLib)
+
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
set(MediaInfoLib_MAJOR_VERSION 20)
@@ -88,7 +88,7 @@ endif() @@ -88,7 +88,7 @@ endif()
find_package(TinyXML) find_package(TinyXML)