Nvidia dependency remove for kodi build

This commit is contained in:
2020-04-11 08:26:15 +02:00
parent 252a42224a
commit 58da48d4e4
2 changed files with 23 additions and 7 deletions

View File

@@ -1,18 +1,22 @@
Summary: Digital VCR and streaming server Summary: Digital VCR and streaming server
Name: ffmpeg-nvidia Name: ffmpeg-nvidia
Version: 4.2.2 Version: 4.2.2
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://ffmpeg.org/ URL: http://ffmpeg.org/
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%define cudav 10-1
%define ffname ffmpeg %define ffname ffmpeg
%define debug_package %{nil} %define debug_package %{nil}
%define _with_libnpp 1 %define _with_libnpp 1
BuildRequires: cuda-drivers-devel
BuildRequires: cuda-minimal-build-%{cudav} %if 0%{?_with_libnpp}
BuildRequires: cuda
BuildRequires: cuda-devel
%endif
BuildRequires: fdk-aac-devel BuildRequires: fdk-aac-devel
BuildRequires: gsm-devel BuildRequires: gsm-devel
BuildRequires: jack-audio-connection-kit-devel BuildRequires: jack-audio-connection-kit-devel
@@ -175,7 +179,9 @@ This package contains development files for %{ffname}
--enable-libfreetype \ --enable-libfreetype \
--enable-libfribidi \ --enable-libfribidi \
--enable-libgsm \ --enable-libgsm \
%{?_with_libnpp:--enable-libnpp \} %if 0%{?_with_libnpp}
--enable-libnpp \
%endif
--enable-version3 --enable-version3
@@ -187,6 +193,10 @@ make install DESTDIR=%{?buildroot}
rm -f %{ffname}-%{version}/debugsourcefiles.list rm -f %{ffname}-%{version}/debugsourcefiles.list
rm -rf %{buildroot}/.build-id rm -rf %{buildroot}/.build-id
%clean
[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
%files %files
%{_bindir}/%{ffname} %{_bindir}/%{ffname}
%{_bindir}/ffplay %{_bindir}/ffplay
@@ -212,6 +222,9 @@ rm -rf %{buildroot}/.build-id
%changelog %changelog
* Mon Mar 9 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
- More modules added.
* Sun Mar 8 2020 Daniel Steiner <daniel.steiner@dsteiner.ch> * Sun Mar 8 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Initial build. - Initial build.
- Build with Nvidia Cuda support. - Build with Nvidia Cuda support.

View File

@@ -21,7 +21,7 @@
%global _with_libcec 1 %global _with_libcec 1
%global _with_wayland 1 %global _with_wayland 1
# only enable it, if you have a nvidia gpu! # only enable it, if you have a nvidia gpu!
%global _with_nvidia_ffmpeg 1 %global _with_nvidia_ffmpeg 0
%endif %endif
%if 0%{?_with_wayland} %if 0%{?_with_wayland}
%global kodi_backends x11 wayland gbm %global kodi_backends x11 wayland gbm
@@ -31,7 +31,7 @@
Name: kodi Name: kodi
Version: 18.6 Version: 18.6
Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist} Release: 101.%{myRELEASE}.%{PRERELEASE}%{?dist}
Summary: Media center Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -545,6 +545,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog %changelog
* Sat Apr 11 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Nvidia dependencies removed.
* Sun Mar 8 2020 Daniel Steiner <daniel.steiner@greenmail.ch> * Sun Mar 8 2020 Daniel Steiner <daniel.steiner@greenmail.ch>
- Nvidia depend build with ffmpeg-nvidia library. - Nvidia depend build with ffmpeg-nvidia library.