From 3f9cb0a26385a1cc9b541811d228f912ffe3ab3d Mon Sep 17 00:00:00 2001 From: rsadowski Date: Fri, 14 Oct 2022 06:41:17 +0000 Subject: [PATCH] Update to libmatroska 1.7.1 From Brad --- multimedia/libmatroska/Makefile | 8 ++++---- multimedia/libmatroska/distinfo | 4 ++-- multimedia/libmatroska/patches/patch-CMakeLists_txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile index f9e819b8744..cc8a92e4a15 100644 --- a/multimedia/libmatroska/Makefile +++ b/multimedia/libmatroska/Makefile @@ -1,11 +1,11 @@ COMMENT= extensible open standard audio/video container library -DISTNAME= libmatroska-1.6.3 +DISTNAME= libmatroska-1.7.1 CATEGORIES= multimedia MASTER_SITES= https://dl.matroska.org/downloads/libmatroska/ EXTRACT_SUFX= .tar.xz -SHARED_LIBS= matroska 5.1 +SHARED_LIBS= matroska 5.2 HOMEPAGE= https://www.matroska.org/ @@ -16,7 +16,7 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} ebml m -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc MODULES = devel/cmake @@ -24,7 +24,7 @@ CFLAGS += -I${LOCALBASE}/include CXXFLAGS += -I${LOCALBASE}/include MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -LIB_DEPENDS += textproc/libebml>=1.4.2 +LIB_DEPENDS += textproc/libebml>=1.4.4 NO_TEST = Yes diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo index 53319f603bc..d08e0385197 100644 --- a/multimedia/libmatroska/distinfo +++ b/multimedia/libmatroska/distinfo @@ -1,2 +1,2 @@ -SHA256 (libmatroska-1.6.3.tar.xz) = 2vkaY/WN0VfKNAxFeHHmYmDLnDMz/vsAizGL77sOCBo= -SIZE (libmatroska-1.6.3.tar.xz) = 65612 +SHA256 (libmatroska-1.7.1.tar.xz) = VyowM7jZPUimqFjlFKvOSy96lG/h8Cy/7KOb/XAwGLM= +SIZE (libmatroska-1.7.1.tar.xz) = 61416 diff --git a/multimedia/libmatroska/patches/patch-CMakeLists_txt b/multimedia/libmatroska/patches/patch-CMakeLists_txt index 764e4a24765..e5ee6d6d9a8 100644 --- a/multimedia/libmatroska/patches/patch-CMakeLists_txt +++ b/multimedia/libmatroska/patches/patch-CMakeLists_txt @@ -3,14 +3,14 @@ Add options for building and installing shared, static libraries Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -4,6 +4,8 @@ project(matroska VERSION 1.6.3) +@@ -4,6 +4,8 @@ project(matroska VERSION 1.7.1) option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF) option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF) +option(DISABLE_SHARED_LIBS "Disable build and install shared libraries" OFF) +option(DISABLE_STATIC_LIBS "Disable build and install static libraries" OFF) - find_package(EBML 1.4.2 REQUIRED) + find_package(EBML 1.4.3 REQUIRED) @@ -62,44 +64,69 @@ set (libmatroska_C_PUBLIC_HEADERS matroska/c/libmatroska.h @@ -113,7 +113,7 @@ Index: CMakeLists.txt if(NOT DISABLE_PKGCONFIG) set(prefix ${CMAKE_INSTALL_PREFIX}) -@@ -117,7 +144,9 @@ if(NOT DISABLE_CMAKE_CONFIG) +@@ -125,7 +152,9 @@ if(NOT DISABLE_CMAKE_CONFIG) configure_package_config_file(MatroskaConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/MatroskaConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) write_basic_package_version_file(MatroskaConfigVersion.cmake COMPATIBILITY SameMajorVersion)