From fe5bed6d58b7f570f00178d9bae788b696a9768c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 07:09:13 -0500 Subject: [PATCH] import libvdpau-1.4-2.el8 --- .gitignore | 2 +- .libvdpau.metadata | 2 +- ...ssing-include-of-config.h-to-define-.patch | 31 ------- ....h-Make-getenv_wrapper-static-inline.patch | 31 ------- ...c-error-on-displayable-surface-types.patch | 30 ------- SPECS/libvdpau.spec | 82 +++++++++++++------ 6 files changed, 61 insertions(+), 117 deletions(-) delete mode 100644 SOURCES/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch delete mode 100644 SOURCES/0002-util.h-Make-getenv_wrapper-static-inline.patch delete mode 100644 SOURCES/0003-Fix-doc-error-on-displayable-surface-types.patch diff --git a/.gitignore b/.gitignore index 31a3cc3..afee977 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libvdpau-1.1.1.tar.bz2 +SOURCES/libvdpau-1.4.tar.bz2 diff --git a/.libvdpau.metadata b/.libvdpau.metadata index f9b16e0..092ca81 100644 --- a/.libvdpau.metadata +++ b/.libvdpau.metadata @@ -1 +1 @@ -d0158f403be87d0ff554e95ddfcce6d4b2b5f3b8 SOURCES/libvdpau-1.1.1.tar.bz2 +e0c38f4342ae4848dab48c7b6c6770a73c4374ad SOURCES/libvdpau-1.4.tar.bz2 diff --git a/SOURCES/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch b/SOURCES/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch deleted file mode 100644 index 5598410..0000000 --- a/SOURCES/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1cda354bdfd0c9ca107293b84b52f4464fdbedcc Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 1 Sep 2015 10:45:11 +0200 -Subject: [PATCH 1/3] mesa_dri2: Add missing include of config.h to define _GNU_SOURCE - -Fix build with -Wimplicit-function-declaration while secure_getenv() is -guarded by __USE_GNU. - -Reviewed-by: Aaron Plattner -Tested-by: Stefan Dirsch ---- - src/mesa_dri2.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/mesa_dri2.c b/src/mesa_dri2.c -index 51e8794..420ccee 100644 ---- a/src/mesa_dri2.c -+++ b/src/mesa_dri2.c -@@ -33,6 +33,9 @@ - * and José Hiram Soltren (jsoltren@nvidia.com) - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #define NEED_REPLIES - #include --- -1.7.2.1 - diff --git a/SOURCES/0002-util.h-Make-getenv_wrapper-static-inline.patch b/SOURCES/0002-util.h-Make-getenv_wrapper-static-inline.patch deleted file mode 100644 index 63a0648..0000000 --- a/SOURCES/0002-util.h-Make-getenv_wrapper-static-inline.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fb5362be7a6d6f89f76c5e171c339f5fa1916d38 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Mon, 7 Sep 2015 21:16:58 -0700 -Subject: [PATCH 2/3] util.h: Make getenv_wrapper() static inline -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise, GCC generates a "‘getenv_wrapper’ defined but not used" warning. - -Signed-off-by: Aaron Plattner ---- - src/util.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/util.h b/src/util.h -index 1452c06..39227ea 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -28,7 +28,7 @@ - #include - #include - --static char * getenv_wrapper(const char *name) -+static inline char * getenv_wrapper(const char *name) - { - if (getuid() == geteuid() && getgid() == getegid()) { - return getenv(name); --- -1.7.2.1 - diff --git a/SOURCES/0003-Fix-doc-error-on-displayable-surface-types.patch b/SOURCES/0003-Fix-doc-error-on-displayable-surface-types.patch deleted file mode 100644 index 1aac262..0000000 --- a/SOURCES/0003-Fix-doc-error-on-displayable-surface-types.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a21bf7aa438f5dd40d0a300a3167aa3d6f26dccc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Hiram=20Soltren?= -Date: Wed, 9 Sep 2015 15:05:01 -0500 -Subject: [PATCH 3/3] Fix doc error on displayable surface types - -VdpVideoSurface is not directly displayable in the current -implementation of VDPAU. VdpOutputSurface is. Make the documentation -consistent with reality. - -Signed-off-by: Aaron Plattner ---- - include/vdpau/vdpau.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/vdpau/vdpau.h b/include/vdpau/vdpau.h -index 8cc4524..0bc5b60 100644 ---- a/include/vdpau/vdpau.h -+++ b/include/vdpau/vdpau.h -@@ -1704,7 +1704,7 @@ typedef VdpStatus VdpVideoSurfacePutBitsYCbCr( - * - The Hardware that implements \ref VdpPresentationQueue - * "VdpPresentationQueue" functionality, - * -- * VdpVideoSurfaces are directly displayable using a \ref -+ * VdpOutputSurfaces are directly displayable using a \ref - * VdpPresentationQueue "VdpPresentationQueue" object. - * - * @{ --- -1.7.2.1 - diff --git a/SPECS/libvdpau.spec b/SPECS/libvdpau.spec index d0db6f3..9367bc8 100644 --- a/SPECS/libvdpau.spec +++ b/SPECS/libvdpau.spec @@ -1,21 +1,18 @@ Name: libvdpau -Version: 1.1.1 -Release: 7%{?dist} +Version: 1.4 +Release: 2%{?dist} Summary: Wrapper library for the Video Decode and Presentation API License: MIT -URL: http://freedesktop.org/wiki/Software/VDPAU -Source0: http://cgit.freedesktop.org/vdpau/libvdpau/snapshot/%{name}-%{version}.tar.bz2 -Patch0: 0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch -Patch1: 0002-util.h-Make-getenv_wrapper-static-inline.patch -Patch2: 0003-Fix-doc-error-on-displayable-surface-types.patch +URL: https://freedesktop.org/wiki/Software/VDPAU/ +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 @@ -40,7 +37,7 @@ The %{name}-docs package contains documentation for %{name}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libX11-devel +Requires: libX11-devel%{?_isa} Requires: pkgconfig %description devel @@ -48,33 +45,30 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build -autoreconf -vif -%configure --disable-static -make %{?_smp_mflags} +%meson +%meson_build %install -make install DESTDIR=%{buildroot} INSTALL="install -p" +%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 -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets + %files -%doc AUTHORS COPYING +%doc AUTHORS +%license COPYING %config(noreplace) %{_sysconfdir}/vdpau_wrapper.cfg %{_libdir}/*.so.* -%dir %{_libdir}/vdpau +%dir %{_libdir}/vdpau/ %{_libdir}/vdpau/%{name}_trace.so* %files docs @@ -85,7 +79,49 @@ mv doc/html-out html %{_libdir}/%{name}.so %{_libdir}/pkgconfig/vdpau.pc + %changelog +* Fri Jun 05 2020 Benjamin Tissoires - 1.4-2 +- keep only one devel package +- fix source url +- fix prep stage + +* Fri Apr 10 2020 Nicolas Chauvet - 1.4-1 +- Update to 1.4 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* 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 + +* Thu Jul 25 2019 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Mar 01 2019 Nicolas Chauvet - 1.2-1 +- Update to 1.2 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 08 2019 Nicolas Chauvet - 1.1.1-11 +- Apply patches from upstream + +* Tue Jul 17 2018 Nicolas Chauvet - 1.1.1-10 +- Add missng cc + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Feb 20 2018 Nicolas Chauvet - 1.1.1-8 +- Move libvdpau_trace to trace sub-package +- Spec file clean-up + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild