Merge branch 'makemkv-bump'

9 files changed, 33 insertions, 29 deletions

diff --git a/makemkv-bin/debian/_service b/makemkv-bin/debian/_service
index 63e4e74..bc078da 100644
--- a/makemkv-bin/debian/_service
+++ b/makemkv-bin/debian/_service
@@ -1,7 +1,7 @@
 <services>
    <service name="tar_scm">
       <param name="scm">git</param>
-      <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param>
+      <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param>
       <param name="subdir">makemkv-bin/debian</param>
       <param name="filename">debian</param>
       <param name="revision">makemkv-bump</param>
@@ -18,7 +18,7 @@
    <service name="download_url">
       <param name="protocol">https</param>
       <param name="host">makemkv.com</param>
-      <param name="path">download/makemkv-bin-1.17.4.tar.gz</param>
-      <param name="filename">makemkv-bin_1.17.4.orig.tar.gz</param>
+      <param name="path">download/makemkv-bin-1.17.5.tar.gz</param>
+      <param name="filename">makemkv-bin_1.17.5.orig.tar.gz</param>
    </service>
 </services>
diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog
index 8d17b33..5a54ff0 100644
--- a/makemkv-bin/debian/changelog
+++ b/makemkv-bin/debian/changelog
@@ -1,3 +1,14 @@
+makemkv-bin (1.17.5-1+stackrpms) obs; urgency=low
+
+  * Upstream updates
+    * Improved handling for discs with mastering errors
+    * Fixed several bughs related to HD-DVD handling (just about time...)
+    * Fixed Linux ARM64 executabe crashing on certain hardware
+      configurations
+    * Small improvements and bugfixes
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 03 Oct 2023 20:20:26 -0400
+
 makemkv-bin (1.17.4-2+stackrpms) obs; urgency=low
 
   * Rebuild for -oss bump
diff --git a/makemkv-bin/debian/makemkv-bin+stackrpms.dsc b/makemkv-bin/debian/makemkv-bin+stackrpms.dsc
index bbed030..5a8690e 100644
--- a/makemkv-bin/debian/makemkv-bin+stackrpms.dsc
+++ b/makemkv-bin/debian/makemkv-bin+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: makemkv-bin
 Binary: makemkv-bin
 Architecture: any
-Version: 1.17.4-2+stackrpms
+Version: 1.17.5-1+stackrpms
 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 8685bc0..a6162df 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.17.2 linux(x64-release)
-# suitable for version 1.17.4 as of 2023-05-30
+# suitable for version 1.17.5 as of 2023-10-03-3 20: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-LrMaMHZQshJkxCXaUIhAlwmQW3aFFsgWdR1MbMd43RUtQG8Qhijh2FEOBa5BjpQkv4"
+app_Key = "T-YIPPz6Z8MFlFJkPA4YTnwcNGX5IU1AqAJdQi8akyG8m2AXqWm9sfuqXmFYScGcfDw8"
 app_PreferredLanguage = "eng"
 app_ccextractor = ""
diff --git a/makemkv-oss/debian/_service b/makemkv-oss/debian/_service
index 162b3d7..8d2102a 100644
--- a/makemkv-oss/debian/_service
+++ b/makemkv-oss/debian/_service
@@ -1,7 +1,7 @@
 <services>
    <service name="tar_scm">
       <param name="scm">git</param>
-      <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param>
+      <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param>
       <param name="subdir">makemkv-oss/debian</param>
       <param name="filename">debian</param>
       <param name="revision">makemkv-bump</param>
@@ -18,7 +18,7 @@
    <service name="download_url">
       <param name="protocol">https</param>
       <param name="host">makemkv.com</param>
-      <param name="path">download/makemkv-oss-1.17.4.tar.gz</param>
-      <param name="filename">makemkv-oss_1.17.4.orig.tar.gz</param>
+      <param name="path">download/makemkv-oss-1.17.5.tar.gz</param>
+      <param name="filename">makemkv-oss_1.17.5.orig.tar.gz</param>
    </service>
 </services>
diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog
index d0bd10a..db21cb5 100644
--- a/makemkv-oss/debian/changelog
+++ b/makemkv-oss/debian/changelog
@@ -1,3 +1,15 @@
+makemkv-oss (1.17.5-1+stackrpms) obs; urgency=low
+
+  * Upstream updates
+    * Improved handling for discs with mastering errors
+    * Fixed several bughs related to HD-DVD handling (just about time...)
+    * Fixed Linux ARM64 executabe crashing on certain hardware
+      configurations
+    * Small improvements and bugfixes
+  * Remove patch for av_mallocz_array
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 03 Oct 2023 20:20:26 -0400
+
 makemkv-oss (1.17.4-2+stackrpms) obs; urgency=low
 
   * Add av_mallocz_array patch
diff --git a/makemkv-oss/debian/makemkv-oss+stackrpms.dsc b/makemkv-oss/debian/makemkv-oss+stackrpms.dsc
index 8ceaa0c..2368b78 100644
--- a/makemkv-oss/debian/makemkv-oss+stackrpms.dsc
+++ b/makemkv-oss/debian/makemkv-oss+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: makemkv-oss
 Binary: makemkv-oss
 Architecture: any
-Version: 1.17.4-2+stackrpms
+Version: 1.17.5-1+stackrpms
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://www.makemkv.com
 Standards-Version: 4.1.4
diff --git a/makemkv-oss/debian/patches/missing-av_mallocz_array.patch b/makemkv-oss/debian/patches/missing-av_mallocz_array.patch
deleted file mode 100644
index 86a56f0..0000000
--- a/makemkv-oss/debian/patches/missing-av_mallocz_array.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: junknot
-Origin: https://build.opensuse.org/package/show/home:junknot/makemkv
-Reference: https://forum.makemkv.com/forum/viewtopic.php?f=3&p=132993
-Version: 1.17.4
-Message: FFmpeg deprecated a function call name.
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 5dda9e1..2b29b87 100644
---- a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n
- #else
-     ctx->frame = av_frame_alloc();
-     if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
--        ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels,
-+        ctx->frame_extended_data = av_calloc(ctx->avctx->channels,
-             sizeof(*ctx->frame_extended_data));
-         if (!ctx->frame_extended_data) {
-             ffm_audio_encode_close(ctx);
diff --git a/makemkv-oss/debian/patches/series b/makemkv-oss/debian/patches/series
index ce8f4e2..e69de29 100644
--- a/makemkv-oss/debian/patches/series
+++ b/makemkv-oss/debian/patches/series
@@ -1 +0,0 @@
-missing-av_mallocz_array.patch -p1