From 6d3d8cb6428743abc6e274f82720be3c601180b9 Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Fri, 1 Mar 2024 15:18:05 +0300 Subject: [PATCH] Fix build problem --- SOURCES/0001-Fix-name-EBML-library.patch | 25 ++++++++++++++++++++++++ SPECS/libmatroska.spec | 12 +++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 SOURCES/0001-Fix-name-EBML-library.patch diff --git a/SOURCES/0001-Fix-name-EBML-library.patch b/SOURCES/0001-Fix-name-EBML-library.patch new file mode 100644 index 0000000..b37d19d --- /dev/null +++ b/SOURCES/0001-Fix-name-EBML-library.patch @@ -0,0 +1,25 @@ +From 8fd83bd7a65456dfce4bfdb571450bd280acc4c5 Mon Sep 17 00:00:00 2001 +From: Sergey Cherevko +Date: Fri, 1 Mar 2024 15:12:29 +0300 +Subject: [PATCH] Fix name EBML library + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e7d11cb..17a4ef9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ project(matroska VERSION 1.5.0) + option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF) + option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF) + +-find_package(Ebml 1.3.7 REQUIRED) ++find_package(EBML 1.3.7 REQUIRED) + + include(GNUInstallDirs) + +-- +2.39.3 + diff --git a/SPECS/libmatroska.spec b/SPECS/libmatroska.spec index 47e29a2..39e8057 100644 --- a/SPECS/libmatroska.spec +++ b/SPECS/libmatroska.spec @@ -1,11 +1,14 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.5.0 -Release: 1%{?dist} +Release: 1%{?dist}.inferit License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-memory.patch +# MSVSphere +Patch100: 0001-Fix-name-EBML-library.patch + BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.7 @@ -38,17 +41,17 @@ will use the Matroska container format. %prep %setup -q %patch0 -p1 -b .m +%patch100 -p1 %build +export Ebml_DIR=/usr/lib64/cmake/EBML/ %cmake3 . %make_build - %install %make_install - %ldconfig_scriptlets @@ -69,6 +72,9 @@ will use the Matroska container format. %changelog +* Fri Mar 01 2024 Sergey Cherevko - 1.5.0-1.inferit +- Fix name EBML library for successful build + * Thu Feb 29 2024 Sergey Cherevko - 1.5.0-1 - Rebuilt for MSVSphere 8.9