diff --git a/Add-VP9-decode-support-in-VDPAU-API.patch b/Add-VP9-decode-support-in-VDPAU-API.patch deleted file mode 100644 index 8929345..0000000 --- a/Add-VP9-decode-support-in-VDPAU-API.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 4475d106fdd00d74ac84c78691b13db7bd323a8c Mon Sep 17 00:00:00 2001 -From: ManojGuptaBonda -Date: Wed, 17 Jul 2019 14:57:51 +0530 -Subject: [PATCH] Add VP9 decode support in VDPAU API - -Added VP9 decoder profiles and level to VDPAU header file. -VP9 specification has 4 profiles and 1 level defined. -A new VdpPictureInfoVP9 structure is defined to pass VP9 specific params -to the driver. ---- - include/vdpau/vdpau.h | 71 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 71 insertions(+) - -diff --git a/include/vdpau/vdpau.h b/include/vdpau/vdpau.h -index 67aeacf..68a814d 100644 ---- a/include/vdpau/vdpau.h -+++ b/include/vdpau/vdpau.h -@@ -2560,6 +2560,14 @@ typedef uint32_t VdpDecoderProfile; - /** \brief Support for 8 bit depth only */ - #define VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE ((VdpDecoderProfile)26) - /** \hideinitializer */ -+#define VDP_DECODER_PROFILE_VP9_PROFILE_0 ((VdpDecoderProfile)27) -+/** \hideinitializer */ -+#define VDP_DECODER_PROFILE_VP9_PROFILE_1 ((VdpDecoderProfile)28) -+/** \hideinitializer */ -+#define VDP_DECODER_PROFILE_VP9_PROFILE_2 ((VdpDecoderProfile)29) -+/** \hideinitializer */ -+#define VDP_DECODER_PROFILE_VP9_PROFILE_3 ((VdpDecoderProfile)30) -+/** \hideinitializer */ - /** \brief MPEG-H Part 2 == H.265 == HEVC */ - #define VDP_DECODER_PROFILE_HEVC_MAIN ((VdpDecoderProfile)100) - /** \hideinitializer */ -@@ -2664,6 +2672,9 @@ typedef uint32_t VdpDecoderProfile; - /** \hideinitializer */ - #define VDP_DECODER_LEVEL_DIVX_NA 0 - -+/** \hideinitializer */ -+#define VDP_DECODER_LEVEL_VP9_L1 1 -+ - /** - * The VDPAU H.265/HEVC decoder levels correspond to the values of - * general_level_idc as described in the H.265 Specification, Annex A, -@@ -3202,6 +3213,66 @@ typedef VdpPictureInfoMPEG4Part2 VdpPictureInfoDivX4; - */ - typedef VdpPictureInfoMPEG4Part2 VdpPictureInfoDivX5; - -+typedef struct -+{ -+ unsigned int width; -+ unsigned int height; -+ -+ //Frame Indices -+ VdpVideoSurface lastReference; -+ VdpVideoSurface goldenReference; -+ VdpVideoSurface altReference; -+ -+ unsigned char colorSpace; -+ -+ unsigned short profile; -+ unsigned short frameContextIdx; -+ unsigned short keyFrame; -+ unsigned short showFrame; -+ unsigned short errorResilient; -+ unsigned short frameParallelDecoding; -+ unsigned short subSamplingX; -+ unsigned short subSamplingY; -+ unsigned short intraOnly; -+ unsigned short allowHighPrecisionMv; -+ unsigned short refreshEntropyProbs; -+ -+ unsigned char refFrameSignBias[4]; -+ -+ unsigned char bitDepthMinus8Luma; -+ unsigned char bitDepthMinus8Chroma; -+ unsigned char loopFilterLevel; -+ unsigned char loopFilterSharpness; -+ -+ unsigned char modeRefLfEnabled; -+ unsigned char log2TileColumns; -+ unsigned char log2TileRows; -+ -+ unsigned char segmentEnabled; -+ unsigned char segmentMapUpdate; -+ unsigned char segmentMapTemporalUpdate; -+ unsigned char segmentFeatureMode; -+ -+ unsigned char segmentFeatureEnable[8][4]; -+ short segmentFeatureData[8][4]; -+ unsigned char mbSegmentTreeProbs[7]; -+ unsigned char segmentPredProbs[3]; -+ unsigned char reservedSegment16Bits[2]; -+ -+ int qpYAc; -+ int qpYDc; -+ int qpChDc; -+ int qpChAc; -+ -+ unsigned int activeRefIdx[3]; -+ unsigned int resetFrameContext; -+ unsigned int mcompFilterType; -+ unsigned int mbRefLfDelta[4]; -+ unsigned int mbModeLfDelta[2]; -+ unsigned int uncompressedHeaderSize; -+ unsigned int compressedHeaderSize; -+} VdpPictureInfoVP9; -+ - /** - * \brief Picture parameter information for an H.265/HEVC picture. - * --- -2.20.1 - diff --git a/libvdpau.spec b/libvdpau.spec index 78a006f..7e94a38 100644 --- a/libvdpau.spec +++ b/libvdpau.spec @@ -1,22 +1,18 @@ -%global gitlab_hash 14b620084c027d546fa0b3f083b800c6 - Name: libvdpau -Version: 1.2 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Wrapper library for the Video Decode and Presentation API License: MIT URL: https://freedesktop.org/wiki/Software/VDPAU/ -Source0: https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/%{gitlab_hash}/libvdpau-%{version}.tar.bz2 -Patch0: Add-VP9-decode-support-in-VDPAU-API.patch +Source0: https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/%{version}/libvdpau-%{version}.tar.bz2 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: libtool BuildRequires: libX11-devel BuildRequires: libXext-devel +BuildRequires: meson %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: tex(latex) %else @@ -65,17 +61,16 @@ applications that use %{name}. %build -autoreconf -vif -%configure --disable-static -%make_build +%meson +%meson_build %install -%make_install +%meson_install find %{buildroot} -name '*.la' -delete # Let %%doc macro create the correct location in the rpm file, creates a # versioned docdir in <= f19 and an unversioned docdir in >= f20. rm -fr %{buildroot}%{_docdir} -mv doc/html-out html +mv %{_vpath_builddir}/doc/html html %ldconfig_scriptlets @@ -86,7 +81,7 @@ mv doc/html-out html %license COPYING %config(noreplace) %{_sysconfdir}/vdpau_wrapper.cfg %{_libdir}/*.so.* -%dir %{_libdir}/vdpau +%dir %{_libdir}/vdpau/ %files trace %{_libdir}/vdpau/%{name}_trace.so* @@ -101,6 +96,11 @@ mv doc/html-out html %changelog +* Thu Aug 29 2019 Leigh Scott - 1.3-1 +- Update to 1.3 +- Switch to meson build +- Use an easier URL for source + * Wed Aug 21 2019 Nicolas Chauvet - 1.2-3 - Fetch VP9 support diff --git a/sources b/sources index be16c4c..4d6b131 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvdpau-1.2.tar.bz2) = 86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f +SHA512 (libvdpau-1.3.tar.bz2) = c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330