Merge branch 'updates' into 'master'

Slew of applicaton updates

See merge request bgstack15/stackrpms!99

9 files changed, 101 insertions, 13 deletions

diff --git a/makemkv/README.md b/makemkv/README.md
new file mode 100644
index 0000000..8b1dc8b
--- /dev/null
+++ b/makemkv/README.md
@@ -0,0 +1,14 @@
+# makemkv upstream
+https://negativo17.org/repos/multimedia/fedora-30/SRPMS/makemkv-1.14.5-1.fc30.src.rpm
+https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053
+
+# Reason for being in stackrpms
+Fedora does not package makemkv because it is only partially open-source. I do not want to depend on external repos too much. I also include some logic for always being able to run makemkv.
+
+# Reverse dependency matrix
+Distro     | makemkv version
+---------- | ---------------
+All        | 1.14.5
+
+# Differences from upstream
+See file [stackrpms-makemkv.spec.diff](stackrpms-makemkv.spec.diff)
diff --git a/makemkv/changelog.txt b/makemkv/changelog.txt
index 3aa5591..22c0f2a 100644
--- a/makemkv/changelog.txt
+++ b/makemkv/changelog.txt
@@ -1,5 +1,14 @@
 Revision history
 
+MakeMKV v1.14.5 ( 9.6.2019 )
+
+    Some small miscellaneous improvements
+
+MakeMKV v1.14.4 ( 6.6.2019 )
+
+    Added support for AACS v70 (for those poor souls without LibreDrive)
+    Many small improvements, program should work a bit faster now
+
 MakeMKV v1.14.3 ( 10.3.2019 )
 
     Added support for AACS v68
diff --git a/makemkv/makemkv-bin-1.14.3.tar.gz b/makemkv/makemkv-bin-1.14.5.tar.gz
index 513baec..1461179 100644
--- a/makemkv/makemkv-bin-1.14.3.tar.gz
+++ b/makemkv/makemkv-bin-1.14.5.tar.gz
diff --git a/makemkv/makemkv-oss-1.14.3.tar.gz b/makemkv/makemkv-oss-1.14.3.tar.gz
deleted file mode 100644
index 27c7f1f..0000000
--- a/makemkv/makemkv-oss-1.14.3.tar.gz
+++ /dev/null
diff --git a/makemkv/makemkv-oss-1.14.5.tar.gz b/makemkv/makemkv-oss-1.14.5.tar.gz
new file mode 100644
index 0000000..e4ee323
--- /dev/null
+++ b/makemkv/makemkv-oss-1.14.5.tar.gz
diff --git a/makemkv/makemkv-wrapper b/makemkv/makemkv-wrapper
index 66e8050..c776d3a 100755
--- a/makemkv/makemkv-wrapper
+++ b/makemkv/makemkv-wrapper
@@ -18,7 +18,7 @@
 test ! -e "$( sudo which ntpdate )" && { echo "need ntpdate. Aborted." ; exit 1 ; }
 
 # vars
-MW_GOODDATE="2019-02-27 13:38:55"
+MW_GOODDATE="2019-11-11 08:56:23"
 MW_NTPSERVICE="$( sudo systemctl list-units | awk '/ntp|chrony/{print $1}' | head -n1 )"
 MW_GOOD_KEYFILE="$( find /usr/share/doc -ipath '*/makemkv/*' -name 'settings.conf.example' )"
 MW_KEYFILE=~/.MakeMKV/settings.conf
diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec
index ca579c8..db40955 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.14.3
+Version:        1.14.5
 Release:        10%{?dist}
 License:        GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+
 URL:            http://www.%{name}.com/
@@ -27,6 +27,7 @@ Source4:        http://www.%{name}.com/developers/usage.txt#/%{name}con.txt
 Source5:        %{name}-wrapper
 Source6:        settings.conf.example
 
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  expat-devel
 # Todo: unbundle these
@@ -41,6 +42,7 @@ BuildRequires:	pkgconfig(Qt5Core)
 BuildRequires:	pkgconfig(Qt5Gui)
 BuildRequires:	pkgconfig(Qt5Widgets)
 BuildRequires:	pkgconfig(Qt5DBus)
+BuildRequires:  zlib-devel
 
 Requires:       ccextractor
 Requires:       hicolor-icon-theme
@@ -52,10 +54,6 @@ Provides:       libbdplus%{?_isa} = %{version}-%{release}
 Obsoletes:      libaacs%{?_isa} < %{version}-%{release}
 Obsoletes:      libbdplus%{?_isa} < %{version}-%{release}
 
-# Remove next version
-Obsoletes:      mmdtsdec < %{version}-%{release}
-Provides:       mmdtsdec = %{version}-%{release}
-
 %description
 MakeMKV is your one-click solution to convert video that you own into free and
 patents-unencumbered format that can be played everywhere. MakeMKV is a format
@@ -87,7 +85,6 @@ make %{?_smp_mflags}
 make -C %{name}-oss-%{version} install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
 make -C %{name}-bin-%{version} install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
 chmod 755 %{buildroot}%{_libdir}/lib*.so*
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Transparenty enable AACS and BD+ decryption, libbluray supports overriding
 # libaacs and libbdplus.
@@ -108,9 +105,11 @@ EOF
 mkdir -p %{buildroot}%{_datadir}/appdata
 install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/
 %endif
-
 %{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/
 
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
 %post
 %if 0%{?rhel} == 7
 /usr/bin/update-desktop-database &> /dev/null || :
@@ -152,8 +151,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libmmbd.so.0
 
 %changelog
-* Sun Apr 21 2019 B Stack <bgstack15@gmail.com> - 1.14.3-10
-- Update to 1.14.3.
+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.14.5-10
+- Add stackrpms customizations
+
+* Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1
+- Update to 1.14.5.
+
+* Sun Jun 16 2019 Simone Caronni <negativo17@gmail.com> - 1.14.4-1
+- Update to 1.14.4.
 
 * Sat Mar 30 2019 Simone Caronni <negativo17@gmail.com> - 1.14.3-1
 - Update to 1.14.3.
diff --git a/makemkv/settings.conf.example b/makemkv/settings.conf.example
index d28d6bf..c223f5b 100644
--- a/makemkv/settings.conf.example
+++ b/makemkv/settings.conf.example
@@ -1,11 +1,11 @@
 #
-# MakeMKV settings file, written by MakeMKV v1.14.2 linux(x64-release)
-# suitable for version 1.14.2, expires 2019-03-30
+# MakeMKV settings file, written by MakeMKV v1.14.5 linux(x64-release)
+# suitable for version 1.14.5, expires 2019-11-31
 
 app_DestinationDir = ""
 app_InterfaceLanguage = "eng"
 app_Java = ""
-app_Key = "T-JRohkknxtUGHBE5RWnzpxHH01EN4UkVJI8evivBOw56OH8KWxbVE3w6yBTMHm5qF7D"
+app_Key = "T-2541DIINav5@4EGGUu7241BvCfC4XgLo6D4oPhE2SeyupYYWNYkg_48BAZACI4LfyQ"
 app_PreferredLanguage = "eng"
 app_ccextractor = ""
 
diff --git a/makemkv/stackrpms-makemkv.spec.diff b/makemkv/stackrpms-makemkv.spec.diff
new file mode 100644
index 0000000..528f652
--- /dev/null
+++ b/makemkv/stackrpms-makemkv.spec.diff
@@ -0,0 +1,60 @@
+--- 1.14.5-1/makemkv.spec	2019-09-12 12:36:18.000000000 -0400
++++ 1.14.5-10/makemkv.spec	2019-11-11 08:21:09.541158055 -0500
+@@ -14,7 +14,7 @@
+ Summary:        DVD and Blu-ray to MKV converter and network streamer
+ Name:           makemkv
+ Version:        1.14.5
+-Release:        1%{?dist}
++Release:        10%{?dist}
+ License:        GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+
+ URL:            http://www.%{name}.com/
+ ExclusiveArch:  %{ix86} x86_64
+@@ -24,6 +24,9 @@
+ Source2:        changelog.txt
+ Source3:        %{name}.appdata.xml
+ Source4:        http://www.%{name}.com/developers/usage.txt#/%{name}con.txt
++Source5:        %{name}-wrapper
++Source6:        settings.conf.example
++
+ 
+ BuildRequires:  desktop-file-utils
+ BuildRequires:  expat-devel
+@@ -66,6 +69,7 @@
+ %prep
+ %setup -q -T -c -n %{name}-%{version} -a 0 -a 1
+ cp %{SOURCE2} %{SOURCE4} .
++cp %{SOURCE5} %{SOURCE6} .
+ 
+ %build
+ # Accept eula  
+@@ -101,6 +105,7 @@
+ mkdir -p %{buildroot}%{_datadir}/appdata
+ install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/
+ %endif
++%{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/
+ 
+ %check
+ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+@@ -130,10 +135,11 @@
+ %files
+ %license %{name}-bin-%{version}/src/eula_en_linux.txt
+ %license %{name}-oss-%{version}/License.txt
+-%doc changelog.txt makemkvcon.txt
++%doc changelog.txt makemkvcon.txt settings.conf.example
+ %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
+ %{_bindir}/makemkv
+ %{_bindir}/makemkvcon
++%{_bindir}/%{name}-wrapper
+ %{_datadir}/MakeMKV
+ %if 0%{?fedora}
+ %{_datadir}/appdata/%{name}.appdata.xml
+@@ -145,6 +151,9 @@
+ %{_libdir}/libmmbd.so.0
+ 
+ %changelog
++* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.14.5-10
++- Add stackrpms customizations
++
+ * Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1
+ - Update to 1.14.5.
+