[packages/gstreamer-libav] - updated to 1.4.0; it's possible to build against ffmpeg 2.2.x (as bcond)

[qboosh]

commit dd5c5789235bdc2c044fa835c11d541da3b80d55
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 27 21:26:04 2014 +0200

    - updated to 1.4.0; it's possible to build against ffmpeg 2.2.x (as bcond)

 gstreamer-libav.spec | 46 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/gstreamer-libav.spec b/gstreamer-libav.spec
index 08e9e96..424f367 100644
--- a/gstreamer-libav.spec
+++ b/gstreamer-libav.spec
@@ -2,23 +2,28 @@
 # Conditional build:
 %bcond_without	vdpau		# build libav without VDPAU support
 %bcond_with	system_libav	# system libav (note: upstream does not accept bugs with system libav)
+%bcond_with	system_ffmpeg	# system ffmpeg instead of libav (unadvised, only some ffmpeg versions are compatible)
 
 %define		gstname gst-libav
 %define		gst_major_ver   1.0
-%define		gst_req_ver	1.2.0
-%define		gstpb_req_ver	1.2.2
-%define		libav_ver	9.12
+%define		gst_req_ver	1.4.0
+%define		gstpb_req_ver	1.4.0
+%define		libav_ver	10.2
+%define		ffmpeg_ver	2.2
 
+%if %{with system_ffmpeg}
+%define		with_system_libav	1
+%endif
 %include	/usr/lib/rpm/macros.gstreamer
 Summary:	GStreamer Streaming-media framework plug-in using libav
 Summary(pl.UTF-8):	Wtyczka do środowiska obróbki strumieni GStreamer używająca libav
 Name:		gstreamer-libav
-Version:	1.2.4
+Version:	1.4.0
 Release:	1
 License:	LGPL v2+ (gst part), GPL v2+ (some libav parts)
 Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gst-libav/%{gstname}-%{version}.tar.xz
-# Source0-md5:	6454f9f22b3aa37694781633e0d20a9c
+# Source0-md5:	60811ae08c26fa093a96996582962c75
 URL:		http://gstreamer.net/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
@@ -33,7 +38,11 @@ BuildRequires:	python >= 2.1
 BuildRequires:	rpmbuild(macros) >= 1.470
 %if %{with system_libav}
 # libavformat,libavcodec,libavutil,libswscale needed
+%if %{with system_ffmpeg}
+BuildRequires:	ffmpeg-devel >= %{ffmpeg_ver}
+%else
 BuildRequires:	libav-devel >= %{libav_ver}
+%endif
 %else
 # libav dependencies
 BuildRequires:	SDL-devel
@@ -50,7 +59,13 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	gstreamer >= %{gst_req_ver}
 Requires:	gstreamer-plugins-base >= %{gstpb_req_ver}
-%{?with_system_libav:Requires:	libav >= %{libav_ver}}
+%if %{with system_libav}
+%if %{with system_ffmpeg}
+BuildRequires:	ffmpeg-libs >= %{ffmpeg_ver}
+%else
+BuildRequires:	libav >= %{libav_ver}
+%endif
+%endif
 Requires:	orc >= 0.4.16
 Obsoletes:	gstreamer-ffmpeg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,6 +92,18 @@ nowych typów danych lub możliwości obróbki.
 Wtyczka ta zawiera kodeki libav, potrafiące zdekodować
 najpopularniejsze formaty multimedialne.
 
+%package apidocs
+Summary:	API documentation for GStreamer libav plugin
+Summary(pl.UTF-8):	Dokumentacja API do wtyczki GStreamera libav
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+API documentation for GStreamer libav plugin.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API do wtyczki GStreamera libav.
+
 %prep
 %setup -q -n %{gstname}-%{version}
 
@@ -92,7 +119,8 @@ najpopularniejsze formaty multimedialne.
 	%{?with_system_libav:--with-system-libav} \
 	%{?with_vdpau:--with-libav-extra-configure="--enable-vdpau"} \
 	--disable-silent-rules \
-	--disable-static
+	--disable-static \
+	--with-html-dir=%{_gtkdocdir}
 # V=1 is for libav (--disable-silent-rules affects only main gst-libav sources)
 %{__make} \
 	V=1
@@ -114,3 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gstreamer-%{gst_major_ver}/libgstlibav.so
 # disabled in (upstream) 1.2.0 until someone fixes it
 #%attr(755,root,root) %{_libdir}/gstreamer-%{gst_major_ver}/libgstavscale.so
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gst-libav-plugins-1.0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gstreamer-libav.git/commitdiff/dd5c5789235bdc2c044fa835c11d541da3b80d55