From 5e9466fee61d2b0a94095263ded0f83d12964bf3 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 1 Jul 2024 23:04:06 +0200 Subject: [PATCH] bcmatroska2: update to 5.3.69. --- srcpkgs/bcmatroska2/patches/cmake.patch | 11 +++++++++++ srcpkgs/bcmatroska2/patches/linking.patch | 21 --------------------- srcpkgs/bcmatroska2/template | 8 ++++---- 3 files changed, 15 insertions(+), 25 deletions(-) create mode 100644 srcpkgs/bcmatroska2/patches/cmake.patch delete mode 100644 srcpkgs/bcmatroska2/patches/linking.patch diff --git a/srcpkgs/bcmatroska2/patches/cmake.patch b/srcpkgs/bcmatroska2/patches/cmake.patch new file mode 100644 index 00000000000..d5828f0e3b2 --- /dev/null +++ b/srcpkgs/bcmatroska2/patches/cmake.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-03-11 10:09:13.000000000 +0100 ++++ - 2024-07-03 17:00:23.355534969 +0200 +@@ -83,7 +83,7 @@ + add_subdirectory(build) + + include(CMakePackageConfigHelpers) +-set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake") ++set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/") + configure_package_config_file("${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}" + NO_SET_AND_CHECK_MACRO diff --git a/srcpkgs/bcmatroska2/patches/linking.patch b/srcpkgs/bcmatroska2/patches/linking.patch deleted file mode 100644 index 41a9076e174..00000000000 --- a/srcpkgs/bcmatroska2/patches/linking.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/corec/corec/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100 -+++ - 2023-01-06 19:32:45.598386210 +0100 -@@ -52,7 +52,6 @@ - else() - list(APPEND COREC_SOURCES - helpers/date/date_libc.c -- helpers/file/file_libc.c - helpers/file/file_bctbx.c - multithread/multithread_pthread.c - ) ---- a/libmatroska2/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100 -+++ - 2023-01-06 19:35:18.813490108 +0100 -@@ -26,7 +26,7 @@ - matroska_sem.c - ) - --set(LIBS ) -+set(LIBS bctoolbox) - if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND LIBS Winmm) - endif() diff --git a/srcpkgs/bcmatroska2/template b/srcpkgs/bcmatroska2/template index a07431d6410..80e91f2a10c 100644 --- a/srcpkgs/bcmatroska2/template +++ b/srcpkgs/bcmatroska2/template @@ -1,23 +1,23 @@ # Template file for 'bcmatroska2' pkgname=bcmatroska2 -version=5.2.1 +version=5.3.69 revision=1 build_style=cmake -configure_args="-DENABLE_STATIC=OFF" +configure_args="-DBUILD_SHARED_LIBS=TRUE" makedepends="bctoolbox-devel" short_desc="C library for working with matroska files" maintainer="John " license="GPL-2.0-only" homepage="https://gitlab.linphone.org/BC/public/bcmatroska2" distfiles="https://gitlab.linphone.org/BC/public/bcmatroska2/-/archive/${version}/bcmatroska2-${version}.tar.gz" -checksum=473aa34b66c5b138a882afaa2d16feb042a7df8b71542566d53d80ae745d051a +checksum=89231f21841d7087c58619103d04d1fa32836d88571e3724e68c3488b0dc7aa8 bcmatroska2-devel_package() { depends="bcmatroska2-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/share/bcmatroska2/cmake + vmove usr/lib/cmake vmove "usr/lib/*.so" } }