8:12 p.m.
commit 32b2692e463ea32c8711cd522cc4f9111abc2a59
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sun Dec 22 14:12:11 2019 -0600
Update to 18.5
kodi-18-assert.patch | 21 +++++++++++++++++++++
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 13 +++++++++++--
sources | 6 +++---
4 files changed, 36 insertions(+), 6 deletions(-)
---
diff --git a/kodi-18-assert.patch b/kodi-18-assert.patch
new file mode 100644
index 0000000..4b78eab
--- /dev/null
+++ b/kodi-18-assert.patch
@@ -0,0 +1,21 @@
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp 2019-11-16 05:12:49.000000000
-0600
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp 2019-12-22 13:15:26.037386276
-0600
+@@ -8,6 +8,7 @@
+
+ #include "GUIDialogProfileSettings.h"
+
++#include <cassert>
+ #include <utility>
+
+ #include "dialogs/GUIDialogFileBrowser.h"
+--- a/xbmc/windowing/GraphicContext.cpp 2019-11-16 05:12:49.000000000 -0600
++++ b/xbmc/windowing/GraphicContext.cpp 2019-12-22 13:34:42.062192068 -0600
+@@ -6,6 +6,8 @@
+ * See LICENSES/README.md for more information.
+ */
+
++#include <cassert>
++
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index bf76597..e2cd9b2 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=18
-MINORVERSION=4
+MINORVERSION=5
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Leia
diff --git a/kodi.spec b/kodi.spec
index 4843165..e978824 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -33,8 +33,8 @@
%endif
Name: kodi
-Version: 18.4
-Release: 2%{?dist}
+Version: 18.5
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -80,6 +80,9 @@ Patch3: kodi-18-annobin-workaround.patch
Patch4: kodi-18-python3-0001.patch
Patch5: kodi-18-python3-0002.patch
+# Fix missing include (gcc requirement)
+Patch6: kodi-18-assert.patch
+
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
@@ -157,6 +160,7 @@ BuildRequires: libcrystalhd-devel
%endif
BuildRequires: libcurl-devel
BuildRequires: libdca-devel
+BuildRequires: libdrm-devel
BuildRequires: libidn2-devel
BuildRequires: libinput-devel
%if 0%{?el6}
@@ -367,6 +371,8 @@ This package contains the Kodi binary for X11 servers.
%patch5 -p1 -b.python3-0002
%endif
+%patch6 -p1 -b.assert
+
# Fix up Python shebangs
%if 0%{?fedora} > 31
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
@@ -545,6 +551,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Sun Dec 22 2019 Michael Cronenworth <mike(a)cchtml.com> - 18.5-1
+- Kodi 18.5 final
+
* Wed Sep 11 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 18.4-2
- Rebuild for new libnfs version
diff --git a/sources b/sources
index 00656f8..f4d9d57 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ca0480eeb309c5de47243859fc803d51 kodi-18.4-patched.tar.xz
-2aec5f8c790449126118abc6bb3cb5cd kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
-f3244e7b002d37f91cc6a77461c4f619 kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+SHA512 (kodi-18.5-patched.tar.xz) =
6f35912cabafc3fe1ff9b8999108eb008825d9fd51b27eb5c33a7daa873d04abea6770ecc8be68c9c8a9fc9134d0b6dbead528f2f72159cfb25d7390835eadf0
+SHA512 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) =
11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
+SHA512 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) =
b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7