4:27 a.m.
commit 6afb2af45ac22ca3431e5a22a21d407f818345ab
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sat Aug 8 23:26:53 2020 -0500
Update to Kodi 19.0 Alpha 1
kodi-19-httprequesthandler.patch | 20 --------------------
kodi-19-webserver.patch | 29 -----------------------------
kodi-generate-tarball-xz.sh | 10 +++++-----
kodi.spec | 32 +++++++++++++++-----------------
sources | 2 +-
5 files changed, 21 insertions(+), 72 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index b8d6585..b6098af 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,15 +1,15 @@
#!/bin/sh
MAJORVERSION=19
-MINORVERSION=0
-GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
-GITSHORT=b6daed5
+MINORVERSION=0a1
+#GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
+#GITSHORT=b6daed5
CODENAME=Matrix
VERSION=${MAJORVERSION}.${MINORVERSION}${GITSHORT:+-${GITSHORT}}
-#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-$CODENAME
-GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-$CODENAME
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT
# download zipball
if [[ ! -f xbmc-$VERSION.zip ]]; then
diff --git a/kodi.spec b/kodi.spec
index fdebca7..923032e 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,11 +1,11 @@
# Use old cmake macro
%global __cmake_in_source_build 1
-#global PRERELEASE rc5
-#global DIRVERSION %{version}
-%global GITCOMMIT b6daed5
+%global PRERELEASE a1
+%global DIRVERSION %{version}
+#global GITCOMMIT db40b2a
# use the line below for pre-releases
-%global DIRVERSION %{version}-%{GITCOMMIT}
-#global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}-%{GITCOMMIT}
+%global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
%ifarch %{arm}
# Disable LTO for arm, see http://koji.rpmfusion.org/koji/taskinfo?taskID=424139
@@ -42,7 +42,7 @@
Name: kodi
Version: 19.0
-Release: 0.20200706gitb6daed5%{?dist}
+Release: 0.20200727gitdb40b2a%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -69,8 +69,8 @@ Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz
%endif
%if ! 0%{?_with_external_ffmpeg}
-# wget -O ffmpeg-4.3-Matrix-Alpha1.tar.gz
https://github.com/xbmc/FFmpeg/archive/4.3-Matrix-Alpha1.tar.gz
-Source5: ffmpeg-4.3-Matrix-Alpha1.tar.gz
+# wget -O ffmpeg-4.3.1-Matrix-Alpha1-1.tar.gz
https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Alpha1-1.tar.gz
+Source5: ffmpeg-4.3.1-Matrix-Alpha1-1.tar.gz
%endif
# Set program version parameters
@@ -85,12 +85,8 @@ Patch3: kodi-18-annobin-workaround.patch
# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
Patch4: kodi-18-brp-mangle-shebangs.patch
-# GCC/libmicrohttpd casting fix
-Patch5: kodi-19-webserver.patch
-Patch6: kodi-19-httprequesthandler.patch
-
# Python 3.9 fix
-Patch7: kodi-19-python.patch
+Patch5: kodi-19-python.patch
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -174,6 +170,7 @@ BuildRequires: libcec-devel < 4.0.0
BuildRequires: libcrystalhd-devel
%endif
BuildRequires: libcurl-devel
+BuildRequires: libdav1d-devel
BuildRequires: libdca-devel
BuildRequires: libdrm-devel
BuildRequires: libidn2-devel
@@ -370,9 +367,7 @@ This package contains the Kodi binary for X11 servers.
%patch2 -p1 -b.trousers
%patch3 -p1 -b.innobinfix
%patch4 -p1 -b.brp-mangle-shebangs
-%patch5 -p1 -b.webserver
-%patch6 -p1 -b.httprequesthandler
-%patch7 -p1 -b.python
+%patch5 -p1 -b.python
# Fix up Python shebangs
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
@@ -418,7 +413,7 @@ do
-DLIBDVDREAD_URL=%{SOURCE3} \
-DPYTHON_EXECUTABLE=%{__python3} \
-DCORE_PLATFORM_NAME=$BACKEND \
-%ifarch x86_64 i686
+%ifarch x86_64 i686 %{arm}
-DX11_RENDER_SYSTEM=gl \
-DWAYLAND_RENDER_SYSTEM=gl \
-DGBM_RENDER_SYSTEM=gl \
@@ -542,6 +537,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Sat Aug 08 2020 Michael Cronenworth <mike(a)cchtml.com> -
19.0-0.20200727gitdb40b2a
+- Kodi 19.0 alpha 1
+
* Sun Aug 02 2020 Leigh Scott <leigh123linux(a)gmail.com> -
19.0-0.20200706gitb6daed5
- Rebuild for libfmt
diff --git a/sources b/sources
index 2957e56..1e2e1ff 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (kodi-19.0-b6daed5-patched.tar.xz) =
fe16c7c90d07edb058a9eeab646ab8386a5c8c5d32ad2e78b9057464eb9d2df8976c93f6f59ba2972d0bf1ff8e1e8ad0cdb343e19314fbd174d3a13276449fbc
+SHA512 (kodi-19.0a1-patched.tar.xz) =
58554e970ddb23b5d19feb65e1c4a813f89f95337c7ec08290832fbe8bb9a14538e2b0158dcdf5e0432b2dbd3ba2d9c57906ddd7358660f795f0a3a6c1369ea3
SHA512 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) =
11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
SHA512 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) =
b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7