Request 5791 (accepted)

Overview

Request 5791 (accepted)

- Update to version 1.17.4
* Added support for AACS v81
* Small improvements and bugfixes
* Notable bug fixes:
- 4K BDAV discs with 4K-only content could fail to open

Created by manfred.h 11 months ago
In state accepted
Package maintainers: manfred-h and microchip8

Submit MakeMKV

Submit package home:manfred.h / MakeMKV to package Multimedia / MakeMKV

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.17.3.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.17.4.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.17.3.tar.gz/bin/arm64/makemkvcon -> makemkv-bin-1.17.4.tar.gz/bin/arm64/makemkvcon Changed

makemkv-bin-1.17.3.tar.gz/bin/armhf/makemkvcon -> makemkv-bin-1.17.4.tar.gz/bin/armhf/makemkvcon Changed

makemkv-bin-1.17.3.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.17.4.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.17.3.tar.gz/src/share/blues.jar -> makemkv-bin-1.17.4.tar.gz/src/share/blues.jar Changed

makemkv-oss-1.17.3.tar.gz/libdriveio/inc/lgpl/posixio.h -> makemkv-oss-1.17.4.tar.gz/libdriveio/inc/lgpl/posixio.h Changed

makemkv-oss-1.17.3.tar.gz/libebml/inc/ebml/EbmlMaster.h -> makemkv-oss-1.17.4.tar.gz/libebml/inc/ebml/EbmlMaster.h Changed

@@ -43,10 +43,10 @@
 #include "EbmlElement.h"
 #include "EbmlCrc32.h"
 
-#define EBML_MASTER_ITERATOR  std::vector<EbmlElement *>::iterator
-#define EBML_MASTER_CONST_ITERATOR  std::vector<EbmlElement *>::const_iterator
-#define EBML_MASTER_RITERATOR std::vector<EbmlElement *>::reverse_iterator
-#define EBML_MASTER_CONST_RITERATOR std::vector<EbmlElement *>::const_reverse_iterator
+#define EBML_MASTER_ITERATOR  stl::vector<EbmlElement *>::iterator
+#define EBML_MASTER_CONST_ITERATOR  stl::vector<EbmlElement *>::const_iterator
+#define EBML_MASTER_RITERATOR stl::vector<EbmlElement *>::reverse_iterator
+#define EBML_MASTER_CONST_RITERATOR stl::vector<EbmlElement *>::const_reverse_iterator
 
 START_LIBEBML_NAMESPACE
 
@@ -125,8 +125,8 @@
     void Sort();
 
     size_t ListSize() const {return ElementList.size();}
-    std::vector<EbmlElement *> const &GetElementList() const {return ElementList;}
-    std::vector<EbmlElement *> &GetElementList() {return ElementList;}
+    stl::vector<EbmlElement *> const &GetElementList() const {return ElementList;}
+    stl::vector<EbmlElement *> &GetElementList() {return ElementList;}
 
         inline EBML_MASTER_ITERATOR begin() {return ElementList.begin();}
         inline EBML_MASTER_ITERATOR end() {return ElementList.end();}
@@ -187,7 +187,7 @@
 #else
     protected:
 #endif
-    std::vector<EbmlElement *> ElementList;
+    stl::vector<EbmlElement *> ElementList;
 
     const EbmlSemanticContext & Context;

makemkv-oss-1.17.3.tar.gz/libebml/src/EbmlMaster.cpp -> makemkv-oss-1.17.4.tar.gz/libebml/src/EbmlMaster.cpp Changed

@@ -36,6 +36,7 @@
 
 #include <lgpl/cassert>
 #include <lgpl/stl.h>
+#include <lgpl/stlsort.h>
 
 #include "ebml/EbmlMaster.h"
 #include "ebml/EbmlStream.h"
@@ -264,7 +265,7 @@
 
 EbmlElement *EbmlMaster::FindElt(const EbmlCallbacks & Callbacks) const
 {
-  auto it = std::find_if(ElementList.begin(), ElementList.end(), &(const EbmlElement *Element)
+  auto it = stl::find_if(ElementList.begin(), ElementList.end(), &(const EbmlElement *Element)
     { return EbmlId(*Element) == EBML_INFO_ID(Callbacks); });
 
   return it != ElementList.end() ? *it : nullptr;
@@ -272,7 +273,7 @@
 
 EbmlElement *EbmlMaster::FindFirstElt(const EbmlCallbacks & Callbacks, bool bCreateIfNull)
 {
-  auto it = std::find_if(ElementList.begin(), ElementList.end(), &(const EbmlElement *Element)
+  auto it = stl::find_if(ElementList.begin(), ElementList.end(), &(const EbmlElement *Element)
     { return Element && EbmlId(*Element) == EBML_INFO_ID(Callbacks); });
 
   if (it != ElementList.end())
@@ -296,7 +297,7 @@
 
 EbmlElement *EbmlMaster::FindFirstElt(const EbmlCallbacks & Callbacks) const
 {
-  auto it = std::find_if(ElementList.begin(), ElementList.end(), &(const EbmlElement *Element)
+  auto it = stl::find_if(ElementList.begin(), ElementList.end(), &(const EbmlElement *Element)
     { return EbmlId(*Element) == EBML_INFO_ID(Callbacks); });
 
   return it != ElementList.end() ? *it : nullptr;
@@ -380,7 +381,7 @@
 
 void EbmlMaster::Sort()
 {
-  std::sort(ElementList.begin(), ElementList.end(), EbmlElement::CompareElements);
+  stl_sort(ElementList.begin(), ElementList.end(), EbmlElement::CompareElements);
 }
 
 /*!

makemkv-oss-1.17.3.tar.gz/libmakemkv/inc/lgpl/stl.h -> makemkv-oss-1.17.4.tar.gz/libmakemkv/inc/lgpl/stl.h Changed

makemkv-oss-1.17.4.tar.gz/libmakemkv/inc/lgpl/stlsort.h Added

@@ -0,0 +1,31 @@
+/*
+    libMakeMKV - MKV multiplexer library
+
+    Copyright (C) 2007-2023 GuinpinSoft inc <libmkv@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#ifndef LGPL_STL_STLSORT_H_INCLUDED
+#define LGPL_STL_STLSORT_H_INCLUDED
+
+#include <algorithm>
+
+template <class iterator, class T> inline void stl_sort(iterator begin, iterator end, bool(*comp)(const T* left, const T* right))
+{
+    std:sort(begin,end,comp);
+}
+
+#endif // LGPL_STL_STLSORT_H_INCLUDED

makemkv-oss-1.17.3.tar.gz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.17.4.tar.gz/libmakemkv/src/libmkv.cpp Changed

makemkv-oss-1.17.3.tar.gz/libmatroska/inc/matroska/KaxBlock.h -> makemkv-oss-1.17.4.tar.gz/libmatroska/inc/matroska/KaxBlock.h Changed

makemkv-oss-1.17.3.tar.gz/libmatroska/inc/matroska/KaxCluster.h -> makemkv-oss-1.17.4.tar.gz/libmatroska/inc/matroska/KaxCluster.h Changed

makemkv-oss-1.17.3.tar.gz/libmatroska/inc/matroska/KaxCues.h -> makemkv-oss-1.17.4.tar.gz/libmatroska/inc/matroska/KaxCues.h Changed

makemkv-oss-1.17.3.tar.gz/libmatroska/src/KaxCues.cpp -> makemkv-oss-1.17.4.tar.gz/libmatroska/src/KaxCues.cpp Changed

@@ -67,7 +67,7 @@
 bool KaxCues::AddBlockBlob(const KaxBlockBlob & BlockReference)
 {
   // Do not add the element if it's already present.
-  bool present = std::any_of(myTempReferences.begin(), myTempReferences.end(),
+  bool present = stl::any_of(myTempReferences.begin(), myTempReferences.end(),
     &(const KaxBlockBlob *myTempReference) { return myTempReference == &BlockReference; });
   if (present) {
     return true;
@@ -80,7 +80,7 @@
 void KaxCues::PositionSet(const KaxBlockBlob & BlockReference)
 {
   // look for the element in the temporary references
-  auto it = std::find_if(myTempReferences.begin(), myTempReferences.end(),
+  auto it = stl::find_if(myTempReferences.begin(), myTempReferences.end(),
     &(const KaxBlockBlob *myTempReference){ return myTempReference == &BlockReference; });
 
   if (it != myTempReferences.end()) {
@@ -94,7 +94,7 @@
 void KaxCues::PositionSet(const KaxBlockGroup & BlockRef)
 {
   // look for the element in the temporary references
-  auto it = std::find_if(myTempReferences.begin(), myTempReferences.end(),
+  auto it = stl::find_if(myTempReferences.begin(), myTempReferences.end(),
     &(const KaxBlockBlob *myTempReference)
       { const KaxInternalBlock &refTmp = *myTempReference;
         return refTmp.GlobalTimecode() == BlockRef.GlobalTimecode()

makemkv-oss-1.17.3.tar.gz/libmatroska/src/KaxSeekHead.cpp -> makemkv-oss-1.17.4.tar.gz/libmatroska/src/KaxSeekHead.cpp Changed

makemkv-oss-1.17.3.tar.gz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.17.4.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

makemkv-oss-1.17.3.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.17.4.tar.gz/makemkvgui/inc/ver_num.h Changed

Build Results
RPM Lint

Refresh

Comments for request 5791 0

Request History

manfred.h created request 11 months ago

- Update to version 1.17.4
* Added support for AACS v81
* Small improvements and bugfixes
* Notable bug fixes:
- 4K BDAV discs with 4K-only content could fail to open

manfred.h accepted request 11 months ago