12:06 a.m.
commit e6f405c8ad4b127de339612ad59936dfbb3f1125
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Dec 25 00:02:44 2022 +0000
Kodi 19.5 Final
kodi-19-fmt-9.patch | 74 -----------------------------------
kodi-19.4-fix-mesa-22.3.0-build.patch | 12 ++++++
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 60 +++++++++-------------------
sources | 2 +-
5 files changed, 33 insertions(+), 117 deletions(-)
---
diff --git a/kodi-19.4-fix-mesa-22.3.0-build.patch
b/kodi-19.4-fix-mesa-22.3.0-build.patch
new file mode 100644
index 0000000..e9ff90d
--- /dev/null
+++ b/kodi-19.4-fix-mesa-22.3.0-build.patch
@@ -0,0 +1,12 @@
+--- xbmc/xbmc/windowing/X11/GLContextEGL.h
++++ xbmc/xbmc/windowing/X11/GLContextEGL.h
+@@ -13,7 +13,7 @@
+ #include "threads/CriticalSection.h"
+
+ #include <EGL/eglext.h>
+-#include <EGL/eglextchromium.h>
++#include <EGL/eglext_angle.h>
+ #include <X11/Xutil.h>
+
+ class CGLContextEGL : public CGLContext
+
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index f30f4f3..13abcbb 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=19
-MINORVERSION=4
+MINORVERSION=5
#GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
#GITSHORT=b6daed5
CODENAME=Matrix
diff --git a/kodi.spec b/kodi.spec
index 0f55163..b3de42c 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,5 +1,3 @@
-# Use old cmake macro
-%global __cmake_in_source_build 1
#global PRERELEASE RC1
%global DIRVERSION %{version}
#global GITCOMMIT db40b2a
@@ -27,11 +25,7 @@
%if 0%{?fedora}
# (libbluray in EPEL 6 is too old.)
%global _with_libbluray 1
-%if 0%{?fedora} < 31
-%global _with_cwiid 1
-%else
%global _with_cwiid 0
-%endif
%global _with_libssh 1
%global _with_libcec 1
%global _with_external_ffmpeg 1
@@ -44,15 +38,15 @@
%endif
Name: kodi
-Version: 19.4
-Release: 4%{?dist}
+Version: 19.5
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
# Main binary and all supporting files are GPLv2+/GPLv3+
# Some supporting libraries use the LGPL / BSD / MIT license
Group: Applications/Multimedia
-URL: http://www.kodi.tv/
+URL: https://www.kodi.tv/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# kodi contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
@@ -94,10 +88,11 @@ Patch5: kodi-19-ffmpeg-4-4.patch
# FFmpeg 4.4 fix for AC3 transcoding (RFBZ#6000)
Patch6: kodi-19-ffmpeg-4-4-ac3.patch
-# https://github.com/xbmc/xbmc/pull/21674
-Patch7: kodi-19-fmt-9.patch
+# Fix build with mesa-22.3
+#
https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/kodi/files/kodi-...
+Patch7: kodi-19.4-fix-mesa-22.3.0-build.patch
-%ifarch x86_64 i686
+%ifarch x86_64
%global _with_crystalhd 1
%endif
@@ -111,7 +106,7 @@ BuildRequires: avahi-devel
BuildRequires: bluez-libs-devel
BuildRequires: boost-devel
BuildRequires: bzip2-devel
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: crossguid-devel
%if 0%{?_with_cwiid}
BuildRequires: cwiid-devel
@@ -124,12 +119,8 @@ BuildRequires: expat-devel
BuildRequires: faad2-devel
BuildRequires: firewalld-filesystem
%if 0%{?_with_external_ffmpeg}
-%if 0%{?fedora} && 0%{?fedora} > 35
BuildRequires: compat-ffmpeg4-devel
%else
-BuildRequires: ffmpeg-devel
-%endif
-%else
BuildRequires: trousers-devel
%endif
BuildRequires: flac-devel
@@ -142,11 +133,7 @@ BuildRequires: fontpackages-devel
BuildRequires: freetype-devel
BuildRequires: fribidi-devel
BuildRequires: fstrcmp-devel
-%if 0%{?el6}
-BuildRequires: gettext-devel
-%else
BuildRequires: gettext-autopoint
-%endif
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: giflib-devel
@@ -169,11 +156,7 @@ BuildRequires: libbluray-devel
BuildRequires: libcap-devel
BuildRequires: libcdio-devel
%if 0%{?_with_libcec}
-%if 0%{?fedora} > 24
BuildRequires: libcec-devel >= 4.0.0
-%else
-BuildRequires: libcec-devel < 4.0.0
-%endif
%endif
%if 0%{?_with_crystalhd}
BuildRequires: libcrystalhd-devel
@@ -184,11 +167,7 @@ BuildRequires: libdca-devel
BuildRequires: libdrm-devel
BuildRequires: libidn2-devel
BuildRequires: libinput-devel
-%if 0%{?el6}
-BuildRequires: libjpeg-devel
-%else
BuildRequires: libjpeg-turbo-devel
-%endif
BuildRequires: libmad-devel
BuildRequires: libmicrohttpd-devel
BuildRequires: libmms-devel
@@ -258,11 +237,7 @@ Requires: dejavu-sans-fonts
Requires: libbluray%{?_isa}
%endif
%if 0%{?_with_libcec}
-%if 0%{?fedora} > 24
Requires: libcec%{?_isa} >= 4.0.0
-%else
-Requires: libcec%{?_isa} < 4.0.0
-%endif
%endif
%if 0%{?_with_crystalhd}
Requires: libcrystalhd%{?_isa}
@@ -343,7 +318,9 @@ This package contains FirewallD files for Kodi.
%patch4 -p1 -b.brp-mangle-shebangs
%patch5 -p1 -b.ffmpeg-4-4
%patch6 -p1 -b.ffmpeg-4-4-ac3
-%patch7 -p1 -b.fmt-9
+%if 0%{?fedora} && 0%{?fedora} >= 37
+%patch7 -p1 -b.mesa-22.3.0-build
+%endif
# Fix up Python shebangs
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
@@ -356,10 +333,8 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
tools/EventClients/lib/python/xbmcclient.py
%build
-%if 0%{?fedora} && 0%{?fedora} > 35
export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-%endif
-%cmake3 \
+%cmake \
%if %{with dvdcss}
-DLIBDVDCSS_URL=%{SOURCE4} \
%else
@@ -381,13 +356,13 @@ export
PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-DLIBDVDREAD_URL=%{SOURCE3} \
-DPYTHON_EXECUTABLE=%{__python3} \
-DCORE_PLATFORM_NAME="%{kodi_backends}" \
- -DAPP_RENDER_SYSTEM=gl \
- .
-%ninja_build
+ -DAPP_RENDER_SYSTEM=gl
+
+%cmake_build
%install
-%ninja_install
+%cmake_install
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned
docdir
rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
@@ -474,6 +449,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Sat Dec 24 2022 Leigh Scott <leigh123linux(a)gmail.com> - 19.5-1
+- Kodi 19.5 Final
+
* Sun Aug 07 2022 Leigh Scott <leigh123linux(a)gmail.com> - 19.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 9f09d7d..36a41b7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (kodi-19.4-patched.tar.xz) =
7e97dffdf363696c6f0a327a77e8a758d66ce09ee38c976157a393a14a4c1a96add76b8a5dcf56c16487b420e6c3b5fad5b1f78811052d79ce510cecfda6127a
+SHA512 (kodi-19.5-patched.tar.xz) =
8529a81e61ad00394c142b51ca664c6c547e54c0c47497a1be661c20eda6d4b7025d0036e3d0ad4b0654ed16a9248f455dc9e1c94f9d5e174f2bd9f9cf271b40
SHA512 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) =
11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
SHA512 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) =
b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7