Kodi switched to nvidia ffmpeg

This commit is contained in:
2020-03-08 13:06:35 +01:00
parent 0414bcc7b6
commit d2339fa204
2 changed files with 205 additions and 13 deletions

View File

@@ -19,8 +19,9 @@
%global _with_cwiid 1
%global _with_libssh 1
%global _with_libcec 1
%global _with_external_ffmpeg 1
%global _with_wayland 1
# only enable it, if you have a nvidia gpu!
%global _with_nvidia_ffmpeg 1
%endif
%if 0%{?_with_wayland}
%global kodi_backends x11 wayland gbm
@@ -30,7 +31,7 @@
Name: kodi
Version: 18.6
Release: 99.%{myRELEASE}.%{PRERELEASE}%{?dist}
Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -56,11 +57,6 @@ Source3: kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
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
%endif
# Set program version parameters
Patch1: kodi-18.0-versioning.patch
@@ -104,10 +100,10 @@ BuildRequires: enca-devel
BuildRequires: expat-devel
BuildRequires: faad2-devel
BuildRequires: firewalld-filesystem
%if 0%{?_with_external_ffmpeg}
BuildRequires: ffmpeg-devel
%if 0%{?_with_nvidia_ffmpeg}
BuildRequires: ffmpeg-nvidia-devel
%else
BuildRequires: trousers-devel
BuildRequires: ffmpeg-devel
%endif
BuildRequires: flac-devel
BuildRequires: flatbuffers-devel
@@ -231,6 +227,11 @@ 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)
%if 0%{?_with_nvidia_ffmpeg}
Requires: ffmpeg-nvidia
Requires: ffmpeg-nvidia-libs
%endif
%description
@@ -396,9 +397,6 @@ do
-DLIBDVDCSS_URL=%{SOURCE4} \
%else
-DENABLE_DVDCSS=OFF \
%endif
%if ! 0%{?_with_external_ffmpeg}
-DFFMPEG_URL=%{SOURCE5} \
%endif
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-GNinja \
@@ -544,6 +542,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
* Sun Mar 8 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Nvidia depend build with ffmpeg-nvidia library.
* Fri Mar 3 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Update to 18.6