diff --git a/.gitignore b/.gitignore index 0752513..d696f38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -gst-libav-1.2.4.tar.xz -libav-9.13.tar.xz +gst-libav-1.4.1.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 4af19ed..c4ea0da 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.2.4 +Version: 1.4.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,10 +7,10 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-9.13.tar.xz +# Source1: http://libav.org/releases/libav-9.13.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -BuildRequires: gstreamer1-devel >= 1.0.0 -BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 +BuildRequires: gstreamer1-devel >= 1.4.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel %ifarch %{ix86} x86_64 BuildRequires: yasm @@ -27,10 +27,25 @@ plugins. This package provides libav-based GStreamer plug-ins. +%package devel-docs +Summary: Development documentation for the libav GStreamer plug-in +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description devel-docs +GStreamer is a streaming media framework, based on graphs of elements which +operate on media data. + +This package contains the development documentation for the libav GStreamer +plug-in. + + %prep -%setup -q -n gst-libav-%{version} -a 1 -rm -r gst-libs/ext/libav -mv libav-9.13 gst-libs/ext/libav +%setup -q -n gst-libav-%{version} +# -a 1 +#rm -r gst-libs/ext/libav +#mv libav-9.13 gst-libs/ext/libav %patch0 -p1 @@ -51,8 +66,16 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO %{_libdir}/gstreamer-1.0/libgstlibav.so +%files devel-docs +# Take the dir and everything below it for proper dir ownership +%doc %{_datadir}/gtk-doc + %changelog +* Fri Aug 29 2014 Hans de Goede - 1.4.1-1 +- Update to 1.4.1 (rf#3343) +- Includes libav 10.4 + * Sun Jun 15 2014 Hans de Goede - 1.2.4-1 - Update to 1.2.4 (rf#3269) - Update libav to 9.13 diff --git a/sources b/sources index 1d14849..2e45ed2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz -23b9e34bffdaee366710fdf20157a570 libav-9.13.tar.xz +ea2d636c24d7c5ae123967ef22e37c07 gst-libav-1.4.1.tar.xz