aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Gervais <gervais.maxime@gmail.com>2020-08-20 06:24:02 +0200
committerGitHub <noreply@github.com>2020-08-19 21:24:02 -0700
commita6ca1a514b74e0b11ff37673b40554b79603675e (patch)
tree3f2645eed42c81c9bea885fcbf7da7c97ee5fa9d
parent89aa2f39f01ce8065de088910b8dc81954de282d (diff)
downloadvcpkg-a6ca1a514b74e0b11ff37673b40554b79603675e.tar.gz
vcpkg-a6ca1a514b74e0b11ff37673b40554b79603675e.zip
[libmediainfo] Update to 20.08 (#12944)
-rw-r--r--ports/libmediainfo/CONTROL2
-rw-r--r--ports/libmediainfo/portfile.cmake8
-rw-r--r--ports/libmediainfo/vcpkg_support_in_cmakelists.patch10
3 files changed, 6 insertions, 14 deletions
diff --git a/ports/libmediainfo/CONTROL b/ports/libmediainfo/CONTROL
index e877ba233..1ca85c787 100644
--- a/ports/libmediainfo/CONTROL
+++ b/ports/libmediainfo/CONTROL
@@ -1,5 +1,5 @@
Source: libmediainfo
-Version: 20.03
+Version: 20.08
Homepage: https://github.com/MediaArea/MediaInfoLib
Description: Get most relevant technical and tag data from video and audio files
Build-Depends: libzen, curl, zlib
diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake
index d6b002797..955bb9c77 100644
--- a/ports/libmediainfo/portfile.cmake
+++ b/ports/libmediainfo/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MediaArea/MediaInfoLib
- REF v20.03
- SHA512 c5d3444c8694ca68ee08f97f387cef3aefd9fbb23623b643a6daf9ed7d247521f1291a8a13c9088b31be9a9d594ca772d3125d6eb3d3770bee1f7c50b3b23c07
+ REF v20.08
+ SHA512 271742af2b2407c04a0555d851fc9ef5590326f4101413ef2092d0a0b99e8367d01bb6442464d171b582b00bb2f45edb9bc9867e74a8d14daba99e2416bc08f3
HEAD_REF master
PATCHES vcpkg_support_in_cmakelists.patch
)
@@ -10,7 +10,9 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Project/CMake
PREFER_NINJA
- OPTIONS -DBUILD_ZENLIB=0 -DBUILD_ZLIB=0
+ OPTIONS
+ -DBUILD_ZENLIB=0
+ -DBUILD_ZLIB=0
)
vcpkg_install_cmake()
diff --git a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch b/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
index d0f988d7b..d3c22ab02 100644
--- a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
+++ b/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
@@ -2,16 +2,6 @@ diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
index 47c4ed13..f13ff531 100644
--- a/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()
find_package(TinyXML)