[kodi] Update ffmpeg source, remove python2 references, add new binary
commit bd1edabd60be87b75000ee6a88206b28decc4745
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Jul 6 23:08:23 2020 -0500
Update ffmpeg source, remove python2 references, add new binary
kodi.spec | 31 +++----------------------------
1 file changed, 3 insertions(+), 28 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index ef56cff..8416df8 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -62,8 +62,8 @@ Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz
%endif
%if ! 0%{?_with_external_ffmpeg}
-# wget -O ffmpeg-4.0.4-Leia-18.4.tar.gz
https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz
-Source5: ffmpeg-4.0.4-Leia-18.4.tar.gz
+# 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
%endif
# Set program version parameters
@@ -212,13 +212,8 @@ BuildRequires: ninja-build
BuildRequires: pcre-devel
BuildRequires: pixman-devel
BuildRequires: pulseaudio-libs-devel
-%if 0%{?fedora} > 31
BuildRequires: python3-devel
BuildRequires: python3-pillow
-%else
-BuildRequires: python2-devel
-BuildRequires: python2-pillow
-%endif
BuildRequires: /usr/bin/pathfix.py
BuildRequires: rapidjson-devel
BuildRequires: spdlog-devel
@@ -282,11 +277,7 @@ Requires: xorg-x11-utils
# This is just symlinked to, but needed both at build-time
# and for installation
-%if 0%{?fedora} > 31
Requires: python3-pillow%{?_isa}
-%else
-Requires: python2-pillow%{?_isa}
-%endif
%description common
Common Kodi files and binaries
@@ -372,11 +363,7 @@ This package contains the Kodi binary for X11 servers.
%patch7 -p1 -b.python
# Fix up Python shebangs
-%if 0%{?fedora} > 31
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
-%else
-pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
-%endif
tools/EventClients/lib/python/zeroconf.py \
tools/EventClients/Clients/PS3BDRemote/ps3_remote.py \
tools/EventClients/lib/python/ps3/sixaxis.py \
@@ -414,11 +401,7 @@ do
-DLIRC_DEVICE=/var/run/lirc/lircd \
-DLIBDVDNAV_URL=%{SOURCE2} \
-DLIBDVDREAD_URL=%{SOURCE3} \
-%if 0%{?fedora} > 31
-DPYTHON_EXECUTABLE=%{__python3} \
-%else
- -DPYTHON_EXECUTABLE=%{__python2} \
-%endif
-DCORE_PLATFORM_NAME=$BACKEND \
%ifarch x86_64 i686
-DX11_RENDER_SYSTEM=gl \
@@ -456,13 +439,8 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop
# Normally we are expected to build these manually. But since we are using
# the system Python interpreter, we also want to use the system libraries
install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib
-%if 0%{?fedora} > 31
ln -s %{python3_sitearch}/PIL
$RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
-%else
-ln -s %{python2_sitearch}/PIL
$RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
-%endif
#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
-#ln -s %{python2_sitearch}/pysqlite2
$RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
# Use external font files instead of bundled ones
ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf
${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/
@@ -489,6 +467,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%doc README.md docs
%{_bindir}/kodi
%{_bindir}/kodi-standalone
+%{_bindir}/JsonSchemaBuilder
%{_bindir}/TexturePacker
%dir %{_libdir}/kodi/
%{_libdir}/kodi/addons/
@@ -508,11 +487,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%files eventclients
%license LICENSE.md LICENSES/
-%if 0%{?fedora} > 31
%{python3_sitelib}/kodi
-%else
-%{python2_sitelib}/kodi
-%endif
%dir %{_datadir}/pixmaps/kodi
%{_datadir}/pixmaps/kodi/*.png
%{_bindir}/kodi-ps3remote