From e44a1174713d05d8ffdf7ff550d9aec5493632a8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 16 Aug 2017 18:32:57 +0000
Subject: [PATCH] extra/gst-plugins-bad to 1.12.2-3

---
 extra/gst-plugins-bad/PKGBUILD | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/extra/gst-plugins-bad/PKGBUILD b/extra/gst-plugins-bad/PKGBUILD
index 4a5a43ef7..20a339340 100644
--- a/extra/gst-plugins-bad/PKGBUILD
+++ b/extra/gst-plugins-bad/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=gst-plugins-bad
 pkgver=1.12.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GStreamer Multimedia Framework Bad Plugins"
 url="https://gstreamer.freedesktop.org/"
 arch=(i686 x86_64)
@@ -23,13 +23,9 @@ makedepends=(python gobject-introspection gtk-doc git autoconf-archive vulkan-he
              fluidsynth lilv opencv openexr)
 _commit=0a4f4f7c2d0185c91ac3c768a8e8d20dc292f8ee  # tags/1.12.2^0
 source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad#commit=$_commit"
-        "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common"
-        'https://github.com/GStreamer/gst-plugins-bad/commit/15f24fef53a955c7c76fc966302cb0453732e657.patch' # OpenJPEG 2.2 support
-        'https://github.com/GStreamer/gst-plugins-bad/commit/df4c6385aa0739d59e83916d32b704de9b9f3d40.patch') # OpenJPEG 2.2 support
+        "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common")
 sha256sums=('SKIP'
-            'SKIP'
-            'c1b18a2d7008b4a9a50f4bbf9e758ccc1777cf0d4399826f059de4685f587fc0'
-            '5c2dbc5738c3466e523ec2872edc39ef6ed1f4217eda149df984e40202674ab9')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -39,8 +35,8 @@ pkgver() {
 prepare() {
   cd $pkgname
 
-  patch -Np1 -i ../15f24fef53a955c7c76fc966302cb0453732e657.patch
-  patch -Np1 -i ../df4c6385aa0739d59e83916d32b704de9b9f3d40.patch
+  # OpenJPEG 2.2 support
+  git cherry-pick -n 15f24fef53 df4c6385aa
 
   git submodule init
   git config --local submodule.common.url "$srcdir/gst-common"