From 62588e7c5f0e456b82dd5992e75665f5cf5bf051 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Wed, 30 Nov 2016 11:14:14 +0000
Subject: [PATCH] Update to 1.10.2

---
 .gitignore                           | 10 ++-----
 disable_ffmpeg_hw_acceleration.patch | 39 ----------------------------
 gstreamer1-libav.spec                | 23 +++++++++-------
 sources                              |  2 +-
 4 files changed, 16 insertions(+), 58 deletions(-)
 delete mode 100644 disable_ffmpeg_hw_acceleration.patch

diff --git a/.gitignore b/.gitignore
index a9c89dd..83f93cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
-gst-libav-1.4.5.tar.xz
-libav-10.6.tar.xz
-gst-libav-1.6.1.tar.xz
-gst-libav-1.6.2.tar.xz
-gst-libav-1.6.3.tar.xz
-gst-libav-1.8.1.tar.xz
-gst-libav-1.8.2.tar.xz
-/gst-libav-1.10.0.tar.xz
+/gst-libav-*.tar.xz
+/gstreamer1-libav-*.src.rpm
diff --git a/disable_ffmpeg_hw_acceleration.patch b/disable_ffmpeg_hw_acceleration.patch
deleted file mode 100644
index 62bbeb9..0000000
--- a/disable_ffmpeg_hw_acceleration.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -2064,6 +2064,13 @@
-     if (strstr (in_plugin->name, "vaapi")) {
-       GST_DEBUG
-           ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg",
-+          in_plugin->name);
-+      goto next;
-+    }
-+
-+    if (g_str_has_suffix (in_plugin->name, "_qsv")) {
-+      GST_DEBUG
-+          ("Ignoring qsv decoder %s. We can't handle this outside of ffmpeg",
-           in_plugin->name);
-       goto next;
-     }
---- a/ext/libav/gstavvidenc.c
-+++ b/ext/libav/gstavvidenc.c
-@@ -974,12 +974,19 @@ gst_ffmpegvidenc_register (GstPlugin * p
-       goto next;
-     }
- 
--    if (g_str_has_suffix (in_plugin->name, "_nvenc")) {
-+    if (strstr (in_plugin->name, "nvenc")) {
-       GST_DEBUG
-           ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg",
-           in_plugin->name);
-       goto next;
-     }
-+
-+    if (g_str_has_suffix (in_plugin->name, "_qsv")) {
-+      GST_DEBUG
-+          ("Ignoring qsv encoder %s. We can't handle this outside of ffmpeg",
-+          in_plugin->name);
-+      goto next;
-+    }
- 
-     /* only video encoders */
-     if (!av_codec_is_encoder (in_plugin)
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index cd14cf4..bc5c895 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,16 +1,18 @@
 Name:           gstreamer1-libav
-Version:        1.10.0
-Release:        2%{?dist}
+Version:        1.10.2
+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
 Patch0:         gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
-Patch2:         disable_ffmpeg_hw_acceleration.patch
-BuildRequires:  gstreamer1-devel >= 1.6.0
-BuildRequires:  gstreamer1-plugins-base-devel >= 1.6.0
-BuildRequires:  orc-devel bzip2-devel zlib-devel ffmpeg-devel
+BuildRequires:  gstreamer1-devel >= 1.10.0
+BuildRequires:  gstreamer1-plugins-base-devel >= 1.10.0
+BuildRequires:  orc-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  ffmpeg-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  yasm
 %endif
@@ -43,14 +45,12 @@ plug-in.
 %prep
 %setup -q -n gst-libav-%{version}
 %patch0 -p1
-%patch2 -p1
-# Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo
-sed -i 's/1.10.0/1.9.2/' configure
 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations"
-%configure --disable-dependency-tracking --disable-static \
+%configure --disable-dependency-tracking \
+  --disable-static \
   --with-package-name="gst-libav 1.0 rpmfusion rpm" \
   --with-package-origin="http://rpmfusion.org/" \
   --with-system-libav
@@ -73,6 +73,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
 
 
 %changelog
+* Wed Nov 30 2016 leigh scott <leigh123linux@googlemail.com> - 1.10.2-1
+- Update to 1.10.2
+
 * Fri Nov 11 2016 Hans de Goede <j.w.r.degoede@gmail.com> - 1.10.0-2
 - Drop no longer needed ignore_vaapi.patch
 
diff --git a/sources b/sources
index d32f065..2dbc5bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a91cea1affe136298db4f6185f78f72  gst-libav-1.10.0.tar.xz
+420d0a32f47ef02cc615f8cf6da1e94d  gst-libav-1.10.2.tar.xz