Merge branch 'makemkv-bump' into 'master'

Makemkv 1.15.4

See merge request bgstack15/stackrpms!209

8 files changed, 46 insertions, 15 deletions

diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog
index 3407d6b..42eb45e 100644
--- a/makemkv-bin/debian/changelog
+++ b/makemkv-bin/debian/changelog
@@ -1,3 +1,16 @@
+makemkv-bin (1.15.4-1+devuan) obs; urgency=medium
+
+  * Improved handling for discs with mastering errors
+  * Many internal improvements and small bugfixes
+  * Implemented seamless joining of TrueHD streams with overlapping frames based
+    on Dominik Mydlil's idea
+  * MakeMKV now recognizes and converts double-track Dolby Vision MKV files
+  * Bug fixes:
+    - Program could fail when processing TrueHD streams from MKV file
+    - DTS core was not extracted from DTS-HD streams (1.15.0 regression)
+
+ -- Ben Stack <bgstack15@gmail.com>  Tue, 15 Dec 2020 14:19:45 -0500
+
 makemkv-bin (1.15.3-1+devuan) obs; urgency=medium
 
   * Massive internal rewrite, many bugfixes
diff --git a/makemkv-bin/debian/makemkv-bin+devuan.dsc b/makemkv-bin/debian/makemkv-bin+devuan.dsc
index 3ddf409..1a21360 100644
--- a/makemkv-bin/debian/makemkv-bin+devuan.dsc
+++ b/makemkv-bin/debian/makemkv-bin+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: makemkv-bin
 Binary: makemkv-bin
 Architecture: any
-Version: 1.15.3-1+devuan
+Version: 1.15.4-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://www.makemkv.com
 Standards-Version: 4.1.4
diff --git a/makemkv-bin/debian/settings.conf.example b/makemkv-bin/debian/settings.conf.example
index 026fead..bd8bb45 100644
--- a/makemkv-bin/debian/settings.conf.example
+++ b/makemkv-bin/debian/settings.conf.example
@@ -1,12 +1,12 @@
 #
-# MakeMKV settings file, written by MakeMKV v1.15.3 linux(x64-release)
-# suitable for version 1.15.3, expires 2020-10-31
+# MakeMKV settings file, written by MakeMKV v1.15.4 linux(x64-release)
+# suitable for version 1.15.4 as of 2020-12-15
 # However, I think now as of 1.15.2, the application will work without this app_Key value; if app_Key is left undefined the application should work.
 
 app_DestinationDir = ""
 app_InterfaceLanguage = "eng"
 app_Java = ""
-app_Key = "T-vBv3hO43Xc4XQNhZZCbnodBarVeXHoa8yne@DeRCCQsm6V7twX3jDI@O8hDkqTUlQf"
+app_Key = "T-gco77foDGdw0bI6tKKFxDorZSRn12AHy85tDdl1rS6QpUv5p5JFWPEj7e0nYV8iU8o"
 app_PreferredLanguage = "eng"
 app_ccextractor = ""
 
diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog
index 66cf1c6..b60025b 100644
--- a/makemkv-oss/debian/changelog
+++ b/makemkv-oss/debian/changelog
@@ -1,3 +1,16 @@
+makemkv-oss (1.15.4-1+devuan) obs; urgency=medium
+
+  * Improved handling for discs with mastering errors
+  * Many internal improvements and small bugfixes
+  * Implemented seamless joining of TrueHD streams with overlapping frames based
+    on Dominik Mydlil's idea
+  * MakeMKV now recognizes and converts double-track Dolby Vision MKV files
+  * Bug fixes:
+    - Program could fail when processing TrueHD streams from MKV file
+    - DTS core was not extracted from DTS-HD streams (1.15.0 regression)
+
+ -- Ben Stack <bgstack15@gmail.com>  Tue, 15 Dec 2020 14:19:45 -0500
+
 makemkv-oss (1.15.3-1+devuan) obs; urgency=medium
 
   * Massive internal rewrite, many bugfixes
diff --git a/makemkv-oss/debian/control b/makemkv-oss/debian/control
index ea641a9..e770175 100644
--- a/makemkv-oss/debian/control
+++ b/makemkv-oss/debian/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper (>=12~),
    libc6-dev,
    libexpat1-dev,
    libgl1-mesa-dev,
-   qt5-default,
+   qtbase5-dev,
+   qtchooser,
    libssl-dev,
    pkg-config,
    zlib1g-dev
diff --git a/makemkv-oss/debian/makemkv-oss+devuan.dsc b/makemkv-oss/debian/makemkv-oss+devuan.dsc
index 765a691..795e6ad 100644
--- a/makemkv-oss/debian/makemkv-oss+devuan.dsc
+++ b/makemkv-oss/debian/makemkv-oss+devuan.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: makemkv-oss
 Binary: makemkv-oss
 Architecture: any
-Version: 1.15.3-1+devuan
+Version: 1.15.4-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://www.makemkv.com
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12~), libavcodec-dev, libc6-dev, libexpat1-dev, libgl1-mesa-dev, qt5-default, libssl-dev, pkg-config, zlib1g-dev
+Build-Depends: debhelper (>= 12~), libavcodec-dev, libc6-dev, libexpat1-dev, libgl1-mesa-dev, qtbase5-dev, qtchooser, libssl-dev, pkg-config, zlib1g-dev
 Package-List:
  makemkv-oss deb video optional arch=any
 Files:
diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec
index 9abca68..7f75cbe 100644
--- a/makemkv/makemkv.spec
+++ b/makemkv/makemkv.spec
@@ -13,7 +13,7 @@
 
 Summary:        DVD and Blu-ray to MKV converter and network streamer
 Name:           makemkv
-Version:        1.15.3
+Version:        1.15.4
 Release:        10%{?dist}
 License:        GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+
 URL:            http://www.%{name}.com/
@@ -49,10 +49,10 @@ Requires:       hicolor-icon-theme
 
 # This makes sure you can open AACS and BD+ encrypted BluRays transparently.
 # See below in the install section.
-Provides:       libaacs%{?_isa} = %{version}-%{release}
-Provides:       libbdplus%{?_isa} = %{version}-%{release}
-Obsoletes:      libaacs%{?_isa} < %{version}-%{release}
-Obsoletes:      libbdplus%{?_isa} < %{version}-%{release}
+Provides:       libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release}
+Provides:       libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release}
+Obsoletes:      libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release}
+Obsoletes:      libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release}
 
 %description
 MakeMKV is your one-click solution to convert video that you own into free and
@@ -139,6 +139,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/makemkv
 %{_bindir}/makemkvcon
+%{_bindir}/sdftool
 %{_bindir}/%{name}-wrapper
 %{_datadir}/MakeMKV
 %if 0%{?fedora}
@@ -151,6 +152,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libmmbd.so.0
 
 %changelog
+* Tue Dec 15 2020 B Stack <bgstack15@gmail.com> - 1.15.4-10
+- Update
+
 * Mon Oct 05 2020 B Stack <bgstack15@gmail.com> - 1.15.3-10
 - Update
 
diff --git a/makemkv/settings.conf.example b/makemkv/settings.conf.example
index 026fead..bd8bb45 100644
--- a/makemkv/settings.conf.example
+++ b/makemkv/settings.conf.example
@@ -1,12 +1,12 @@
 #
-# MakeMKV settings file, written by MakeMKV v1.15.3 linux(x64-release)
-# suitable for version 1.15.3, expires 2020-10-31
+# MakeMKV settings file, written by MakeMKV v1.15.4 linux(x64-release)
+# suitable for version 1.15.4 as of 2020-12-15
 # However, I think now as of 1.15.2, the application will work without this app_Key value; if app_Key is left undefined the application should work.
 
 app_DestinationDir = ""
 app_InterfaceLanguage = "eng"
 app_Java = ""
-app_Key = "T-vBv3hO43Xc4XQNhZZCbnodBarVeXHoa8yne@DeRCCQsm6V7twX3jDI@O8hDkqTUlQf"
+app_Key = "T-gco77foDGdw0bI6tKKFxDorZSRn12AHy85tDdl1rS6QpUv5p5JFWPEj7e0nYV8iU8o"
 app_PreferredLanguage = "eng"
 app_ccextractor = ""