[vdr-softhddevice] Use fork because its under maintenance fixes (rfbz#5882)

commit 356143fe372b90d1922e9bc1800fb61a775ab962 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Tue Dec 29 11:56:07 2020 +0100 Use fork because its under maintenance fixes (rfbz#5882) .gitignore | 1 + chartype.patch | 11 - ffmpeg_2.9.patch | 575 -------------------------------------------------- sources | 2 +- vdr-softhddevice.spec | 60 +++--- 5 files changed, 27 insertions(+), 622 deletions(-) --- diff --git a/.gitignore b/.gitignore index a852493..deeb6d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vdr-plugin-softhddevice-ee2311d25237b9828c1423505e5d4055a836414d.tar.bz2 /vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2 +/vdr-softhddevice-1.0.9.tar.gz diff --git a/sources b/sources index b15ee92..9e11059 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2) = 676fb558d1b424cc2ae1f7dde365f9dc1080d6c809c5eb1292e597b5f72832c243d402388d2803cb18ddba70f0fc054db7b4f297a9bff66afff3af7dcf95c13a +SHA512 (vdr-softhddevice-1.0.9.tar.gz) = bd83c7ac605a400511d379b73549bc113207a6e601f99bfd4664dc305af7f740c91713e3449f629c54d24b6bc266a1fa6241edf19de6f5a2c83b5c6441d0c4c0 diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec index 5210468..d341215 100644 --- a/vdr-softhddevice.spec +++ b/vdr-softhddevice.spec @@ -1,29 +1,21 @@ -%global commit0 6dfa88aecf1b5a4c5932ba278209d9f22676547f +%global commit0 057a3ab6d6ee2b1ebc4a302edf1629ba6a0377ce %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20151103 - -%if 0%{?fedora} > 27 -%bcond_without compat_ffmpeg -%else -%bcond_with compat_ffmpeg -%endif +%global gitdate 20201226 Name: vdr-softhddevice -Version: 0.6.1 -Release: 27.%{gitdate}git%{shortcommit0}%{?dist} +Version: 1.0.9 +#Release: 0.1.%%{gitdate}git%%{shortcommit0}%%{?dist} +Release: 1%{?dist} Summary: A software and GPU emulated HD output device plugin for VDR License: AGPLv3 -URL: http://projects.vdr-developer.org/projects/plg-softhddevice -Source0: http://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git/snapsho... +URL: https://github.com/ua0lnj/vdr-plugin-softhddevice +#Source0: https://github.com/ua0lnj/vdr-plugin-softhddevice/archive/%%{commit0}/%%{... +Source0: https://github.com/ua0lnj/vdr-plugin-softhddevice/archive/v%{version}.tar... # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf -# http://projects.vdr-developer.org/issues/1417 +# https://github.com/ua0lnj/vdr-plugin-softhddevice/pull/33 Patch0: exit-crash.patch -# http://projects.vdr-developer.org/issues/1916 -Patch1: chartype.patch -# https://projects.vdr-developer.org/issues/2424 -Patch2: ffmpeg_2.9.patch BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.7.22 @@ -31,11 +23,7 @@ BuildRequires: gettext BuildRequires: libva-devel BuildRequires: libvdpau-devel BuildRequires: alsa-lib-devel -%if %{with compat_ffmpeg} -BuildRequires: compat-ffmpeg28-devel -%else BuildRequires: ffmpeg-devel -%endif BuildRequires: libxcb-devel BuildRequires: xcb-util-devel BuildRequires: xcb-util-wm-devel @@ -45,10 +33,11 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} Requires: xorg-x11-server-Xorg %description -A software and GPU emulated HD output device plugin for VDR. +A software and GPU emulated UHD output device plugin for VDR. - Video decoder CPU / VDPAU - Video output VDPAU + Video decoder CPU / VA-API / VDPAU / CUVID + Video output VA-API / VDPAU / GLX (VA-API / CUVID) + OSD accelerated by GPU VDPAU / CUVID Audio FFMpeg / Alsa / Analog Audio FFMpeg / Alsa / Digital Audio FFMpeg / OSS / Analog @@ -57,20 +46,20 @@ A software and GPU emulated HD output device plugin for VDR. VDR ScaleVideo API Software deinterlacer Bob (VA-API only) Autocrop - Grab image (VDPAU only) + Grab image (VA-API / VDPAU / CUVID) Suspend / Dettach Letterbox, Stretch and Center cut-out video display modes atmo light support with plugin http://github.com/durchflieger/DFAtmo - PIP (Picture-in-Picture) (VDPAU only) + PIP (Picture-in-Picture) (VDPAU / CUVID) + planned: OSD accelerated by GPU VA-API + planned: Video output Opengl / Xv + planned: Improved software deinterlacer (yadif or/and ffmpeg filters) + XvBa support is no longer planned (use future Radeon UVD VDPAU) %prep -%setup -qn vdr-plugin-softhddevice-%{commit0} -%patch0 -p1 -%patch1 -p0 -%if ! %{with compat_ffmpeg} -%patch2 -p1 -%endif +#%%setup -qn vdr-plugin-softhddevice-%%{commit0} +%autosetup -p1 -n vdr-plugin-softhddevice-%{version} # remove .git files and Gentoo files rm -f .indent.pro .gitignore .gitattributes @@ -83,9 +72,6 @@ for f in ChangeLog README.txt; do done %build -%if %{with compat_ffmpeg} -export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig -%endif make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} %install @@ -101,6 +87,10 @@ install -Dpm 644 %{SOURCE1} \ %license AGPL-3.0.txt %changelog +* Tue Dec 29 2020 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 1.0.9-1 +- Use fork because its under maintenance +- fixes (rfbz#5882) + * Wed Oct 21 2020 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.6.1-27.20151103git6dfa88a - Rebuilt for new VDR API version