public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates for Fedora 37

Browse Source
This commit is contained in:
admin
2022-11-25 10:33:47 +01:00
parent 4e888ee9ee
commit 9754e4d04a
4 changed files with 65 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
fedora/SPECS/kodi.spec
View File

@@ -1,9 +1,17 @@
%global PRERELEASE r
%global myRELEASE 1
# Use old cmake macro
%global __cmake_in_source_build 1
%global PRERELEASE RC1
%global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
#global GITCOMMIT db40b2a
# use the line below for pre-releases
#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
%global _lto_cflags %{nil}
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
# We support hte following options:
# --with,
@@ -33,8 +41,8 @@
%endif
Name: kodi
Version: 18.8
Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist}
Version: 19.0
Release: 20210123%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -61,12 +69,12 @@ 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.1-Matrix-Beta1.tar.gz https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz
Source5: ffmpeg-4.3.1-Matrix-Beta1.tar.gz
%endif
# Set program version parameters
Patch1: kodi-18.0-versioning.patch
Patch1: kodi-19-versioning.patch
# Prevent trousers from being linked, which breaks Samba
Patch2: kodi-18-trousers.patch
@@ -74,17 +82,8 @@ Patch2: kodi-18-trousers.patch
# Fix an annobin issue
Patch3: kodi-18-annobin-workaround.patch
# Python 3 support
# https://github.com/xbmc/xbmc/commits/feature_python3
# https://github.com/xbmc/xbmc/issues/16560
Patch4: kodi-18-python3-0001.patch
Patch5: kodi-18-python3-0002.patch
# Fix missing include (gcc requirement)
Patch6: kodi-18-assert.patch
# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
Patch7: kodi-18-brp-mangle-shebangs.patch
Patch4: kodi-18-brp-mangle-shebangs.patch
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -137,6 +136,7 @@ BuildRequires: giflib-devel
BuildRequires: glew-devel
BuildRequires: glib2-devel
BuildRequires: gperf
BuildRequires: gtest-devel
BuildRequires: jasper-devel
BuildRequires: java-devel
BuildRequires: lame-devel
@@ -162,6 +162,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
@@ -212,15 +213,11 @@ 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
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: systemd-devel
@@ -235,24 +232,7 @@ BuildRequires: waylandpp-devel
BuildRequires: yajl-devel
BuildRequires: zlib-devel
# Install major backends, users can remove them individually
Requires: %{name}-common = %{version}-%{release}
Requires: (%{name}-wayland = %{version}-%{release} if libwayland-server)
Requires: (%{name}-x11 = %{version}-%{release} if xorg-x11-server-Xorg)
Requires: (%{name}-firewalld = %{version}-%{release} if firewalld)
%description
Kodi is a free cross-platform media-player jukebox and entertainment hub.
Kodi can play a spectrum of of multimedia formats, and featuring playlist,
audio visualizations, slideshow, and weather forecast functions, together
third-party plugins.
This is a meta package.
%package common
Summary: Common Kodi files and binaries
Requires: dejavu-sans-fonts
# need explicit requires for these packages
# as they are dynamically loaded via XBMC's arcane
@@ -281,14 +261,24 @@ 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
# https://github.com/xbmc/xbmc/pull/18534
Provides: kodi-common = %{version}-%{release}
Obsoletes: kodi-common < %{version}-%{release}
Provides: kodi-gbm = %{version}-%{release}
Obsoletes: kodi-gbm < %{version}-%{release}
Provides: kodi-wayland = %{version}-%{release}
Obsoletes: kodi-wayland < %{version}-%{release}
Provides: kodi-x11 = %{version}-%{release}
Obsoletes: kodi-x11 < %{version}-%{release}
%description
Kodi is a free cross-platform media-player jukebox and entertainment hub.
Kodi can play a spectrum of of multimedia formats, and featuring playlist,
audio visualizations, slideshow, and weather forecast functions, together
third-party plugins.
%package devel
@@ -333,56 +323,15 @@ Requires(post): firewalld-filesystem
This package contains FirewallD files for Kodi.
%package gbm
Summary: Kodi binary for Generic Buffer Management
Requires: %{name}-common = %{version}-%{release}
%description gbm
This package contains the Kodi binary for Generic Buffer Management.
%package wayland
Summary: Kodi binary for Wayland compositors
Requires: %{name}-common = %{version}-%{release}
%description wayland
This package contains the Kodi binary for Wayland compositors.
%package x11
Summary: Kodi binary for X11 servers
Requires: %{name}-common = %{version}-%{release}
%description x11
This package contains the Kodi binary for X11 servers.
%prep
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.trousers
%if 0%{?fedora} > 29
%patch3 -p1 -b.innobinfix
%endif
%if 0%{?fedora} > 31
%patch4 -p1 -b.python3-0001
%patch5 -p1 -b.python3-0002
%endif
%patch6 -p1 -b.assert
%patch7 -p1 -b.brp-mangle-shebangs
%patch4 -p1 -b.brp-mangle-shebangs
# 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 \
@@ -398,11 +347,6 @@ sed -i 's/ pkg_check_modules(PC_PYTHON python>=2.7 QUIET)/ pkg_check_modules(P
%build
mkdir {fedora-gbm,fedora-wayland,fedora-x11}
for BACKEND in %{kodi_backends}
do
pushd fedora-$BACKEND
%cmake3 \
%if %{with dvdcss}
-DLIBDVDCSS_URL=%{SOURCE4} \
@@ -413,6 +357,9 @@ do
-DFFMPEG_URL=%{SOURCE5} \
%endif
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG" \
-DCMAKE_ASM_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG" \
-DENABLE_DEBUGFISSION=OFF \
-GNinja \
-DENABLE_EVENTCLIENTS=ON \
@@ -420,32 +367,15 @@ 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
-DWAYLAND_RENDER_SYSTEM=gl \
-DGBM_RENDER_SYSTEM=gl \
%else
-DWAYLAND_RENDER_SYSTEM=gles \
-DGBM_RENDER_SYSTEM=gles \
%endif
../
%ninja_build
popd
done
-DCORE_PLATFORM_NAME="%{kodi_backends}" \
-DAPP_RENDER_SYSTEM=gl \
.
%ninja_build
%install
for BACKEND in %{kodi_backends}
do
pushd fedora-$BACKEND
%ninja_install
popd
done
%ninja_install
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
@@ -460,13 +390,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/
@@ -480,25 +405,19 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%endif
# remove not needed dvdnav output:
rm -rf ${RPM_BUILD_ROOT}/root
%post firewalld
%firewalld_reload
%files
%files common
%license LICENSE.md LICENSES/
%doc README.md docs
%{_bindir}/kodi
%{_bindir}/kodi-standalone
%{_bindir}/JsonSchemaBuilder
%{_bindir}/TexturePacker
%dir %{_libdir}/kodi/
%{_libdir}/kodi/addons/
%{_libdir}/kodi/system/
%{_libdir}/kodi/
%{_datadir}/kodi/
%{_datadir}/xsessions/kodi.desktop
%{_datadir}/applications/kodi.desktop
@@ -506,6 +425,7 @@ rm -rf ${RPM_BUILD_ROOT}/root
%{_mandir}/man1/kodi.1.gz
%{_mandir}/man1/kodi.bin.1.gz
%{_mandir}/man1/kodi-standalone.1.gz
%{_mandir}/man1/TexturePacker.1.gz
%files devel
@@ -514,11 +434,7 @@ rm -rf ${RPM_BUILD_ROOT}/root
%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
@@ -544,78 +460,4 @@ rm -rf ${RPM_BUILD_ROOT}/root
%{_prefix}/lib/firewalld/services/kodi-jsonrpc.xml
%files gbm
%{_libdir}/kodi/kodi-gbm
%files wayland
%{_libdir}/kodi/kodi-wayland
%files x11
%{_libdir}/kodi/kodi-x11
%{_libdir}/kodi/kodi-xrandr
%changelog
* Sun Aug 2 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.8
* Wed May 20 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.7
* Sat Apr 11 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Nvidia dependencies removed.
* Sun Mar 8 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Nvidia depend build with ffmpeg-nvidia library.
* Fri Mar 6 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.6
* Sat Nov 16 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.5
* Fri Nov 1 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Build for FC31.
* Sat Sep 14 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.4
* Wed Jun 19 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.3
- Release increase to 99, using myRELEASE.
* Fri May 10 2019 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update 18.2 to commit 5c09e9d
- Release increase to 99, using myRELEASE.
* Fri Feb 22 2019 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.1-1.60.final
- Update to Final 18.2.
* Fri Feb 22 2019 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.1-1.60.final
- Update to Final 18.1.
* Thu Jan 31 2019 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-1.60.final
- Update to Final 18.
* Sun Jan 13 2019 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.50.rc5
- Update to RC5
* Fri Jan 4 2019 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.21.rc4
- Update to RC4
* Wed Dec 19 2018 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.21.rc3
- Update to RC3
* Sat Dec 8 2018 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.21.rc2
- fmt library updated.
* Fri Dec 7 2018 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.20.rc2
- Update to RC2
* Sat Nov 10 2018 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.10.rc0
- Update to RC0
* Sun Nov 4 2018 Daniel Steiner <daniel.steiner@greenmail.ch> - 18.0-0.10.b5
- Update to beta5