From 6968172f0c2b2b6ce4d5f0bacf3190476316f912 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 4 Dec 2019 21:30:31 -0500 Subject: makemkv 1.14.7 dpkgs use compat-12 --- makemkv-bin/debian/changelog | 6 ++++++ makemkv-bin/debian/compat | 2 +- makemkv-bin/debian/control | 2 +- makemkv-bin/debian/copyright | 2 +- makemkv-oss/debian/changelog | 6 ++++++ makemkv-oss/debian/compat | 2 +- makemkv-oss/debian/control | 2 +- makemkv-oss/debian/copyright | 20 +++++++++----------- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog index 35b6629..652ed76 100644 --- a/makemkv-bin/debian/changelog +++ b/makemkv-bin/debian/changelog @@ -1,3 +1,9 @@ +makemkv-bin (1.14.7-1+devuan) obs; urgency=low + + * Update + + -- B Stack Wed, 04 Dec 2019 21:23:05 -0500 + makemkv-bin (1.14.5-2+devuan) obs; urgency=low * Change build deps for OBS diff --git a/makemkv-bin/debian/compat b/makemkv-bin/debian/compat index b4de394..48082f7 100644 --- a/makemkv-bin/debian/compat +++ b/makemkv-bin/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/makemkv-bin/debian/control b/makemkv-bin/debian/control index e963bc3..cf01789 100644 --- a/makemkv-bin/debian/control +++ b/makemkv-bin/debian/control @@ -2,7 +2,7 @@ Source: makemkv-bin Section: video Priority: optional Maintainer: B Stack -Build-Depends: debhelper (>=11~), +Build-Depends: debhelper (>=12~), libavcodec58, makemkv-oss Standards-Version: 4.1.4 diff --git a/makemkv-bin/debian/copyright b/makemkv-bin/debian/copyright index 7fe3d2b..a53fbf4 100644 --- a/makemkv-bin/debian/copyright +++ b/makemkv-bin/debian/copyright @@ -12,7 +12,7 @@ Copyright: __NO_COPYRIGHT_NOR_LICENSE__ License: __NO_COPYRIGHT_NOR_LICENSE__ Files: src/eula_en_linux.txt -Copyright: 2007-2018 GuinpinSoft inc +Copyright: 2007-2019 GuinpinSoft inc License: __HEADER___ IMPORTANT NOTE . diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog index 084217b..7a323b0 100644 --- a/makemkv-oss/debian/changelog +++ b/makemkv-oss/debian/changelog @@ -1,3 +1,9 @@ +makemkv-oss (1.14.7-1+devuan) obs; urgency=low + + * Update + + -- B Stack Wed, 04 Dec 2019 21:04:41 -0500 + makemkv-oss (1.14.5-2+devuan) obs; urgency=low * Change build deps for OBS diff --git a/makemkv-oss/debian/compat b/makemkv-oss/debian/compat index b4de394..48082f7 100644 --- a/makemkv-oss/debian/compat +++ b/makemkv-oss/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/makemkv-oss/debian/control b/makemkv-oss/debian/control index 7c55684..1a9b93a 100644 --- a/makemkv-oss/debian/control +++ b/makemkv-oss/debian/control @@ -2,7 +2,7 @@ Source: makemkv-oss Section: video Priority: optional Maintainer: B Stack -Build-Depends: debhelper (>=11~), +Build-Depends: debhelper (>=12~), libavcodec-dev, libavcodec58, libc6-dev, diff --git a/makemkv-oss/debian/copyright b/makemkv-oss/debian/copyright index 406651e..b684175 100644 --- a/makemkv-oss/debian/copyright +++ b/makemkv-oss/debian/copyright @@ -21,12 +21,10 @@ Files: libabi/inc/lgpl/expatabi.h libabi/src/xpat.c libabi/src/zlib.c libdriveio/inc/driveio/driveio.h + libdriveio/inc/driveio/error.h libdriveio/inc/driveio/scsicmd.h libdriveio/inc/driveio/scsihlp.h libdriveio/inc/lgpl/tcpip.h - libdriveio/src/drives/drive.h - libdriveio/src/drives/pioneer.cpp - libdriveio/src/drives/xboxhddvd.cpp libdriveio/src/infolist.cpp libdriveio/src/scsihlp.cpp libdriveio/src/stdquery.cpp @@ -67,10 +65,10 @@ Files: libabi/inc/lgpl/expatabi.h libmmbd/src/utf8.h makemkvgui/inc/QtExt/NativeFileDialog.h makemkvgui/src/nativefiledialog.cpp -Copyright: 2007-2018 GuinpinSoft inc - 2007-2018 GuinpinSoft inc - 2007-2018 GuinpinSoft inc - 2007-2018 GuinpinSoft inc +Copyright: 2007-2019 GuinpinSoft inc + 2007-2019 GuinpinSoft inc + 2007-2019 GuinpinSoft inc + 2007-2019 GuinpinSoft inc License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -136,7 +134,7 @@ Files: makemkvgui/src/aboutbox.cpp makemkvgui/src/str/en_utf16.cpp makemkvgui/src/uisync.cpp makemkvgui/src/viteminfo.cpp -Copyright: 2007-2018 GuinpinSoft inc +Copyright: 2007-2019 GuinpinSoft inc License: __UNKNOWN__ You may use this file in accordance with the end user license agreement provided with the Software. For licensing terms and @@ -711,7 +709,7 @@ License: LGPL-2.1+ Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. Files: libffabi/src/ffabicfg.h.in -Copyright: 2007-2018 GuinpinSoft inc +Copyright: 2007-2019 GuinpinSoft inc License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -923,7 +921,7 @@ License: LGPL-2.1+ Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. Files: License.txt -Copyright: 2007-2018 GuinpinSoft inc +Copyright: 2007-2019 GuinpinSoft inc License: __HEADER___ IMPORTANT NOTE . @@ -1092,7 +1090,7 @@ License: GPL-3.0+ with autoconf exception #---------------------------------------------------------------------------- # License file: License.txt - Copyright (C) 2007-2018 GuinpinSoft inc + Copyright (C) 2007-2019 GuinpinSoft inc . IMPORTANT NOTE . -- cgit From 99a688065b647a9bf8987e908b73e795227e463d Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 4 Dec 2019 21:34:04 -0500 Subject: fix bundled makemkv beta key --- makemkv-bin/debian/settings.conf.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makemkv-bin/debian/settings.conf.example b/makemkv-bin/debian/settings.conf.example index c223f5b..018aba6 100644 --- a/makemkv-bin/debian/settings.conf.example +++ b/makemkv-bin/debian/settings.conf.example @@ -1,11 +1,11 @@ # -# MakeMKV settings file, written by MakeMKV v1.14.5 linux(x64-release) -# suitable for version 1.14.5, expires 2019-11-31 +# MakeMKV settings file, written by MakeMKV v1.14.7 linux(x64-release) +# suitable for version 1.14.7, expires 2020-01-31 app_DestinationDir = "" app_InterfaceLanguage = "eng" app_Java = "" -app_Key = "T-2541DIINav5@4EGGUu7241BvCfC4XgLo6D4oPhE2SeyupYYWNYkg_48BAZACI4LfyQ" +app_Key = "T-a37dwZgouzYiNxPOnU4AbpRtCakD0UzdFPuHLnCfX2O2kshXG4KhC37lho7axaXvtZ" app_PreferredLanguage = "eng" app_ccextractor = "" -- cgit From 9a74c015622064c2a535c9df26f030672687c4c3 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 4 Dec 2019 21:47:30 -0500 Subject: makemkv 1.14.7 rpm rc1 --- makemkv/README.md | 5 +++-- makemkv/changelog.txt | 11 +++++++++++ makemkv/makemkv-bin-1.14.5.tar.gz | Bin 9465109 -> 0 bytes makemkv/makemkv-oss-1.14.5.tar.gz | Bin 4384596 -> 0 bytes makemkv/makemkv.spec | 11 +++++++---- makemkv/settings.conf.example | 6 +++--- 6 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 makemkv/makemkv-bin-1.14.5.tar.gz delete mode 100644 makemkv/makemkv-oss-1.14.5.tar.gz diff --git a/makemkv/README.md b/makemkv/README.md index 8b1dc8b..58c49db 100644 --- a/makemkv/README.md +++ b/makemkv/README.md @@ -4,11 +4,12 @@ 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. +As of makemkv 1.14.7, I am diverging from negativo17's spec file. # Reverse dependency matrix Distro | makemkv version ---------- | --------------- -All | 1.14.5 +All | 1.14.7 # Differences from upstream -See file [stackrpms-makemkv.spec.diff](stackrpms-makemkv.spec.diff) +See file [stackrpms-makemkv.spec.diff](stackrpms-makemkv.spec.diff) which was last applied on version 1.14.5. diff --git a/makemkv/changelog.txt b/makemkv/changelog.txt index 22c0f2a..39aaebb 100644 --- a/makemkv/changelog.txt +++ b/makemkv/changelog.txt @@ -1,5 +1,16 @@ Revision history +MakeMKV v1.14.7 ( 4.12.2019 ) + + Bug fixes: + Better compatibility for decrypted AACS 2.1 FMTS files + Fixed variable expansion bug for default file name template + +MakeMKV v1.14.6 ( 2.12.2019 ) + + Added support for AACS 2.1 + Many small bugfixes and improvements + MakeMKV v1.14.5 ( 9.6.2019 ) Some small miscellaneous improvements diff --git a/makemkv/makemkv-bin-1.14.5.tar.gz b/makemkv/makemkv-bin-1.14.5.tar.gz deleted file mode 100644 index 1461179..0000000 Binary files a/makemkv/makemkv-bin-1.14.5.tar.gz and /dev/null differ diff --git a/makemkv/makemkv-oss-1.14.5.tar.gz b/makemkv/makemkv-oss-1.14.5.tar.gz deleted file mode 100644 index e4ee323..0000000 Binary files a/makemkv/makemkv-oss-1.14.5.tar.gz and /dev/null differ diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec index db40955..fd83dd6 100644 --- a/makemkv/makemkv.spec +++ b/makemkv/makemkv.spec @@ -13,17 +13,17 @@ Summary: DVD and Blu-ray to MKV converter and network streamer Name: makemkv -Version: 1.14.5 +Version: 1.14.7 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 -Source0: http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz -Source1: http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz +Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz +Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz Source2: changelog.txt Source3: %{name}.appdata.xml -Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt +Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt Source5: %{name}-wrapper Source6: settings.conf.example @@ -151,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libmmbd.so.0 %changelog +* Wed Dec 04 2019 B Stack - 1.14.7-10 +- Update + * Mon Nov 11 2019 B Stack - 1.14.5-10 - Add stackrpms customizations diff --git a/makemkv/settings.conf.example b/makemkv/settings.conf.example index c223f5b..018aba6 100644 --- a/makemkv/settings.conf.example +++ b/makemkv/settings.conf.example @@ -1,11 +1,11 @@ # -# MakeMKV settings file, written by MakeMKV v1.14.5 linux(x64-release) -# suitable for version 1.14.5, expires 2019-11-31 +# MakeMKV settings file, written by MakeMKV v1.14.7 linux(x64-release) +# suitable for version 1.14.7, expires 2020-01-31 app_DestinationDir = "" app_InterfaceLanguage = "eng" app_Java = "" -app_Key = "T-2541DIINav5@4EGGUu7241BvCfC4XgLo6D4oPhE2SeyupYYWNYkg_48BAZACI4LfyQ" +app_Key = "T-a37dwZgouzYiNxPOnU4AbpRtCakD0UzdFPuHLnCfX2O2kshXG4KhC37lho7axaXvtZ" app_PreferredLanguage = "eng" app_ccextractor = "" -- cgit