6 changed files with 105 additions and 70 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,17 +1 @@
-libmatroska-1.0.0.tar.bz2
-/libmatroska-1.1.0.tar.bz2
-/libmatroska-1.2.0.tar.bz2
-/libmatroska-1.3.0.tar.bz2
-/libmatroska-1.4.0.tar.bz2
-/libmatroska-1.4.1.tar.bz2
-/libmatroska-1.4.2.tar.bz2
-/libmatroska-1.4.4.tar.bz2
-/libmatroska-1.4.5.tar.bz2
-/libmatroska-1.4.7.tar.bz2
-/libmatroska-1.4.8.tar.xz
-/libmatroska-1.4.9.tar.xz
-/libmatroska-1.5.0.tar.xz
-/libmatroska-1.5.2.tar.xz
-/libmatroska-1.6.0.tar.xz
-/libmatroska-1.6.2.tar.xz
-/libmatroska-1.6.3.tar.xz
+SOURCES/libmatroska-1.5.0.tar.xz
--- a/.libmatroska.metadata
+++ b/.libmatroska.metadata
@ -0,0 +1 @@
+066e984d110264dffe0e24f13a8f67a5560610ce  SOURCES/libmatroska-1.5.0.tar.xz
--- a/SOURCES/0001-Fix-name-EBML-library.patch
+++ b/SOURCES/0001-Fix-name-EBML-library.patch
@ -0,0 +1,25 @@
+From 8fd83bd7a65456dfce4bfdb571450bd280acc4c5 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
+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
+
--- a/SOURCES/libmatroska-memory.patch
+++ b/SOURCES/libmatroska-memory.patch
@ -0,0 +1,53 @@
+diff -ruwbBd libmatroska-1.5.0/src/KaxBlock.cpp libmatroska-1.5.1/src/KaxBlock.cpp
+--- libmatroska-1.5.0/src/KaxBlock.cpp	2019-03-12 20:54:34.000000000 +0100
+++ libmatroska-1.5.1/src/KaxBlock.cpp	2019-05-25 12:16:54.000000000 +0200
+@@ -628,11 +628,12 @@
+       // put all Frames in the list
+       if (mLacing != LACING_NONE) {
+         // read the number of frames in the lace
+-        uint32 LastBufferSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame
+        const uint32 TotalLacedSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame
+        uint32 LastBufferSize = TotalLacedSize;
+         uint8 FrameNum = _TempHead[0]; // number of frames in the lace - 1
+         // read the list of frame sizes
+         uint8 Index;
+-        int32 FrameSize;
+        uint32 FrameSize;
+         uint32 SizeRead;
+         uint64 SizeUnknown;
+ 
+@@ -646,6 +647,8 @@
+               do {
+                 Result += input.read(_TempHead, 1);
+                 FrameSize += uint8(_TempHead[0]);
+                if (FrameSize > TotalLacedSize)
+                  throw SafeReadIOCallback::EndOfStreamX(0);
+                 LastBufferSize--;
+ 
+                 FirstFrameLocation++;
+@@ -662,6 +665,8 @@
+             cursor = _tmpBuf = new binary[FrameNum*4]; /// \warning assume the mean size will be coded in less than 4 bytes
+             Result += input.read(cursor, FrameNum*4);
+             FrameSize = ReadCodedSizeValue(cursor, SizeRead, SizeUnknown);
+            if (FrameSize > TotalLacedSize)
+              throw SafeReadIOCallback::EndOfStreamX(0);
+             SizeList[0] = FrameSize;
+             cursor += SizeRead;
+             LastBufferSize -= FrameSize + SizeRead;
+@@ -670,6 +675,8 @@
+               // get the size of the frame
+               SizeRead = LastBufferSize;
+               FrameSize += ReadCodedSizeSignedValue(cursor, SizeRead, SizeUnknown);
+              if (FrameSize > TotalLacedSize)
+                throw SafeReadIOCallback::EndOfStreamX(0);
+               SizeList[Index] = FrameSize;
+               cursor += SizeRead;
+               LastBufferSize -= FrameSize + SizeRead;
+@@ -703,7 +710,6 @@
+   } catch (SafeReadIOCallback::EndOfStreamX &) {
+     SetValueIsSet(false);
+ 
+-    std::memset(EbmlBinary::GetBuffer(), 0, GetSize());
+     myBuffers.clear();
+     SizeList.clear();
+     Timecode           = 0;
--- a/SPECS/libmatroska.spec
+++ b/SPECS/libmatroska.spec
@ -1,16 +1,18 @@
-%undefine __cmake_in_source_build
-
 Summary:	Open audio/video container format library
 Name:		libmatroska
-Version:	1.6.3
-Release:	3%{?dist}
+Version:	1.5.0
+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.4.0
-Requires:	libebml%{_isa} >= 1.4.0
+BuildRequires:	libebml-devel >= 1.3.7
+Requires:	libebml%{_isa} >= 1.3.7

 %description
 Matroska is an extensible open standard Audio/Video container.  It
@ -23,7 +25,7 @@ is usually found as .mkv files (matroska video) and .mka files
 Summary:	Matroska container format library development files
 Requires:	%{name}%{_isa} = %{version}-%{release}
 Requires:	%{_libdir}/cmake
-Requires:	libebml-devel >= 1.4.0
+Requires:	libebml-devel >= 1.3.7
 Requires:	pkgconfig

 %description	devel
@ -38,16 +40,17 @@ will use the Matroska container format.

 %prep
 %setup -q
+%patch0 -p1 -b .m
+%patch100 -p1


 %build
-%cmake3
-%cmake3_build
-
+export Ebml_DIR=/usr/lib64/cmake/EBML/
+%cmake3 .
+%make_build

 %install
-%cmake3_install
-
+%make_install

 %ldconfig_scriptlets

@ -55,55 +58,25 @@ will use the Matroska container format.
 %files
 %license LICENSE.LGPL
 %doc ChangeLog
-%{_libdir}/%{name}.so.7*
+%{_libdir}/%{name}.so.6*

 %files devel
 %{_includedir}/matroska/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_libdir}/cmake/Matroska
-%{_libdir}/cmake/Matroska/MatroskaConfig.cmake
-%{_libdir}/cmake/Matroska/MatroskaConfigVersion.cmake
-%{_libdir}/cmake/Matroska/MatroskaTargets-noconfig.cmake
-%{_libdir}/cmake/Matroska/MatroskaTargets.cmake
+%dir %{_libdir}/cmake/matroska
+%{_libdir}/cmake/matroska/MatroskaConfig.cmake
+%{_libdir}/cmake/matroska/MatroskaConfigVersion.cmake
+%{_libdir}/cmake/matroska/MatroskaTargets-noconfig.cmake
+%{_libdir}/cmake/matroska/MatroskaTargets.cmake


 %changelog
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 18 2021 Dominik Mierzejewski <rpm@greysector.net> - 1.6.3-1
- update to 1.6.3 (#1930173)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 Dominik Mierzejewski <rpm@greysector.net> - 1.6.2-1
- update to 1.6.2 (#1862780)
- use new cmake macros (#1864019)
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-3
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 07 2020 Dominik Mierzejewski <rpm@greysector.net> - 1.6.0-1
- update to 1.6.0 (#1851594), ABI bump
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Sep 10 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.5.2-1
- update to 1.5.2 (#1688000)
- drop obsolete patch
+* Fri Mar 01 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.5.0-1.inferit
+- Fix name EBML library for successful build

-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Thu Feb 29 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.5.0-1
+- Rebuilt for MSVSphere 8.9

 * Sat Jun 08 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.5.0-1
 - update to 1.5.0
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (libmatroska-1.6.3.tar.xz) = 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
				`@ -0,0 +1 @@`
				`066e984d110264dffe0e24f13a8f67a5560610ce SOURCES/libmatroska-1.5.0.tar.xz`
				`@ -1 +0,0 @@`
				`SHA512 (libmatroska-1.6.3.tar.xz) = 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41`