diff --git a/.gitignore b/.gitignore index 60fb035..b0bbd4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -gst-libav-1.0.6.tar.xz -libav-0.8.6.tar.xz +gst-libav-1.0.9.tar.xz diff --git a/gst-libav-configure-set-the-assembler.patch b/gst-libav-configure-set-the-assembler.patch deleted file mode 100644 index a4b1c60..0000000 --- a/gst-libav-configure-set-the-assembler.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7c160e64686e6b9d971955246ffd0eccad9c3359 Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge -Date: Thu, 07 Mar 2013 08:30:55 +0000 -Subject: configure: Set the assembler used for libav to $CC - -libav assumes that it's not just an assembler but something that -can also handle CPPFLAGS and other things. - -https://bugzilla.gnome.org/show_bug.cgi?id=694416 ---- -diff --git a/configure.ac b/configure.ac -index 22ede88..5317bd1 100644 ---- a/configure -+++ b/configure -@@ -342,7 +342,7 @@ else - fi - - if test x"$AS" != x; then -- emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$AS\\\"" -+ emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$CC\\\"" - fi - - if test x"$CC" != x; then --- -cgit v0.9.0.2-2-gbebe diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index bca8f49..42f3ded 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.0.6 +Version: 1.0.9 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,9 +7,8 @@ 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-0.8.6.tar.xz +#Source1: http://libav.org/releases/libav-0.8.8.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -Patch1: gst-libav-configure-set-the-assembler.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 BuildRequires: orc-devel bzip2-devel zlib-devel @@ -29,12 +28,13 @@ This package provides libav-based GStreamer plug-ins. %prep -%setup -q -n gst-libav-%{version} -a 1 +%setup -q -n gst-libav-%{version} %patch0 -p1 -%patch1 -p1 -chmod +x configure -rm -r gst-libs/ext/libav -mv libav-0.8.6 gst-libs/ext/libav + +# Use this when overriding the buildin libav +#setup -q -n gst-libav-%{version} -a 1 +#rm -r gst-libs/ext/libav +#mv libav-0.8.8 gst-libs/ext/libav %build @@ -48,7 +48,7 @@ make %{?_smp_mflags} V=1 %install -make install V=1 DESTDIR=$RPM_BUILD_ROOT +%make_install V=1 rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la @@ -59,6 +59,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Aug 6 2013 Hans de Goede - 1.0.9-1 +- Rebase to 1.0.9 +- This includes an upgrade of the buildin libav to 0.8.8 which includes a + bunch of security fixes from +- No longer overwrite the included libav, as the bundled one is the latest + * Mon Mar 25 2013 Hans de Goede - 1.0.6-1 - Rebase to 1.0.6 - Upgrade the buildin libav to 0.8.6 to get all the security fixes from diff --git a/sources b/sources index 9ba7a86..7afa489 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -07e5399c44346a95aafc1d4533125774 gst-libav-1.0.6.tar.xz -c4a57b81a110c1b72c1e875e222ab8d2 libav-0.8.6.tar.xz +8414f8d4c4a239a74a3d5eadf3d14875 gst-libav-1.0.9.tar.xz