commit fdacca10549de89a765b20ebe61d4b5c3cd43dfe
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Sat Oct 31 10:55:44 2015 +0100
Update to 1.6.1
- Upstream is using ffmpeg instead of libav now, switch to system ffmpeg-libs
.gitignore | 1 +
gst-libav-1.1.3-ffmpeg-2.0.patch | 121 ---------------------------------------
gstreamer1-libav.spec | 22 ++++---
sources | 3 +-
4 files changed, 15 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a6915f..a042bc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gst-libav-1.4.5.tar.xz
libav-10.6.tar.xz
+gst-libav-1.6.1.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 30860e6..9e81a93 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,16 +1,14 @@
Name: gstreamer1-libav
-Version: 1.4.5
+Version: 1.6.1
Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
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-10.6.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
-BuildRequires: gstreamer1-devel >= 1.4.0
-BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0
+BuildRequires: gstreamer1-devel >= 1.6.0
+BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0
BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel
%ifarch %{ix86} x86_64
BuildRequires: yasm
@@ -42,17 +40,19 @@ plug-in.
%prep
-%setup -q -n gst-libav-%{version} -a 1
-rm -r gst-libs/ext/libav
-mv libav-10.6 gst-libs/ext/libav
+%setup -q -n gst-libav-%{version}
%patch0 -p1
+# hack to allow building against 1.6.0 as 1.6.1 is not yet in the buildroot
+sed -i 's/GST_REQ=1.6.1/GST_REQ=1.6.0/' configure
+sed -i 's/GST_PBREQ=1.6.1/GST_PBREQ=1.6.0/' configure
%build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations"
%configure --disable-dependency-tracking --disable-static \
--with-package-name="gst-libav 1.0 rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
- --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu}
--optflags=\\\"\\\$RPM_OPT_FLAGS\\\""
+ --with-system-libav
make %{?_smp_mflags} V=1
@@ -71,6 +71,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Sat Oct 31 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.6.1-1
+- Update to 1.6.1
+- Upstream is using ffmpeg instead of libav now, switch to system ffmpeg-libs
+
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1
- Update to 1.4.5
- Update libav to 10.6
diff --git a/sources b/sources
index 86749eb..d532572 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f4922a46adbcbe7bd01331ff5dc7979d gst-libav-1.4.5.tar.xz
-dcdf0e8c2f5fa1fc69d61cd8154cbe46 libav-10.6.tar.xz
+058b22411e1690eee5b71d1ab44eab25 gst-libav-1.6.1.tar.xz