- updated to 1.18.5; now uses meson+hotdoc

diff --git a/gstreamer-vaapi.spec b/gstreamer-vaapi.spec
index 4f473583369c8caa3b76bdb7d68524d5c5784a57..5025e40058aa1b95776b8536f24dc42122eae63c 100644 (file)
--- a/gstreamer-vaapi.spec
+++ b/gstreamer-vaapi.spec
@@ -1,53 +1,52 @@
 #
 # Conditional build:
-%bcond_without static_libs     # static libraries
+%bcond_without apidocs         # API documentation
 %bcond_with    api             # GST VA-API libraries API [no longer exported as of 1.6.0]
 
 %define                gstapi          1.6
-%define                gst_ver         1.16.3
-%define                gstpb_ver       1.16.3
-%define                gstpd_ver       1.16.3
+%define                gst_ver         1.18.5
+%define                gstpb_ver       1.18.5
+%define                gstpd_ver       1.18.5
 Summary:       GStreamer plugin to support Video Acceleration API
 Summary(pl.UTF-8):     Wtyczka GStreamera obsługująca Video Acceleration API
 Name:          gstreamer-vaapi
-Version:       1.16.3
+Version:       1.18.5
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://gstreamer.freedesktop.org/src/gstreamer-vaapi/%{name}-%{version}.tar.xz
-# Source0-md5: 8c9b5a4d20afc04bc5e1536e81511f27
+# Source0-md5: aae78428770dd3cc3673b2e3b50931f6
 URL:           https://gstreamer.freedesktop.org/
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: OpenGLESv2-devel
 BuildRequires: OpenGLESv3-devel
-BuildRequires: autoconf >= 2.69
-BuildRequires: automake >= 1:1.14
-BuildRequires: glib2-devel >= 1:2.40.0
+BuildRequires: glib2-devel >= 1:2.44.0
 BuildRequires: gstreamer-devel >= %{gst_ver}
 BuildRequires: gstreamer-gl-devel >= %{gstpb_ver}
 # gstreamer-codecparsers
 BuildRequires: gstreamer-plugins-bad-devel >= %{gstpd_ver}
 BuildRequires: gstreamer-plugins-base-devel >= %{gstpb_ver}
-BuildRequires: gtk-doc >= 1.12
-BuildRequires: libdrm-devel
-BuildRequires: libtool >= 2:2.2
+%{?with_apidocs:BuildRequires: hotdoc >= 0.11.0}
+BuildRequires: libdrm-devel >= 2.4.98
 BuildRequires: libva-devel >= 1.6.0
 BuildRequires: libva-drm-devel >= 1.1.0
 BuildRequires: libva-wayland-devel >= 1.1.0
 BuildRequires: libva-x11-devel >= 1.0.3
+BuildRequires: meson >= 0.48.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(glesv2)
-BuildRequires: pkgconfig(glesv3)
 # libva API versions
 BuildRequires: pkgconfig(libva) >= 0.39.0
 BuildRequires: pkgconfig(libva-drm) >= 0.39.0
 BuildRequires: pkgconfig(libva-wayland) >= 0.39.0
 BuildRequires: pkgconfig(libva-x11) >= 0.39.0
 BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
 BuildRequires: wayland-devel >= 1.11.0
@@ -59,11 +58,12 @@ BuildRequires:      xz
 %ifarch %{ix86} %{x8664} x32
 BuildRequires: yasm
 %endif
-Requires:      glib2 >= 1:2.40.0
+Requires:      glib2 >= 1:2.44.0
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-gl-libs >= %{gstpb_ver}
 Requires:      gstreamer-plugins-bad >= %{gstpd_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
+Requires:      libdrm >= 2.4.98
 Requires:      libva >= 1.6.0
 Requires:      wayland >= 1.11.0
 %if %{without api}
@@ -91,6 +91,7 @@ Requires:     libva-devel >= 1.6.0
 Requires:      libva-drm-devel >= 1.1.0
 Requires:      libva-wayland-devel >= 1.1.0
 Requires:      libva-x11-devel >= 1.0.3
+Obsoletes:     gstreamer-vaapi-static < %{version}
 
 %description devel
 Header files for GStreamer VA-API helper libraries.
@@ -98,18 +99,6 @@ Header files for GStreamer VA-API helper libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek pomocniczych VA-API GStreamera.
 
-%package static
-Summary:       Static GStreamer VA-API libraries
-Summary(pl.UTF-8):     Statyczne biblioteki VA-API GStreamera
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static GStreamer VA-API libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki VA-API GStreamera.
-
 %package apidocs
 Summary:       GStreamer VA-API plugins documentation
 Summary(pl.UTF-8):     Dokumentacja do wtyczek GStreamera VA-API
@@ -126,29 +115,25 @@ Dokumentacja do wtyczek GStreamera VA-API.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4 -I common/m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-silent-rules \
-       %{!?with_static_libs:--disable-static} \
-       --with-html-dir=%{_gtkdocdir}
-
-%{__make}
+%meson build \
+       --default-library=shared \
+       %{!?with_apidocs:-Ddoc=false}
+
+%ninja_build -C build
+
+%if %{with apidocs}
+cd build/docs
+LC_ALL=C.UTF-8 hotdoc run --conf-file vaapi-doc.json
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-# gstreamer module
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
-%if %{with api}
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if %{with apidocs}
+install -d $RPM_BUILD_ROOT%{_docdir}/gstreamer-%{gstmver}
+cp -pr build/docs/vaapi-doc $RPM_BUILD_ROOT%{_docdir}/gstreamer-%{gstmver}
 %endif
 
 %clean
@@ -196,20 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/gstreamer-vaapi-glx-1.0.pc
 %{_pkgconfigdir}/gstreamer-vaapi-wayland-1.0.pc
 %{_pkgconfigdir}/gstreamer-vaapi-x11-1.0.pc
-
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgstcodecparsers_vpx.a
-%{_libdir}/libgstvaapi-%{gstapi}.a
-%{_libdir}/libgstvaapi-drm-%{gstapi}.a
-%{_libdir}/libgstvaapi-egl-%{gstapi}.a
-%{_libdir}/libgstvaapi-glx-%{gstapi}.a
-%{_libdir}/libgstvaapi-wayland-%{gstapi}.a
-%{_libdir}/libgstvaapi-x11-%{gstapi}.a
-%endif
 %endif
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gstreamer-vaapi-plugins-1.0
+%{_docdir}/gstreamer-%{gstmver}/vaapi-doc
+%endif