From cbf062a36ec75d8a11b53244da5a3a2b0af98571 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Mon, 4 Mar 2019 15:05:41 -0500
Subject: gst-plugins-bad-1.14.4-8.par1: rebuild

---
 libre/gst-plugins-bad/PKGBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'libre')

diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index 16a3874c5..4f3d900e5 100644
--- a/libre/gst-plugins-bad/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -6,9 +6,10 @@
 
 pkgname=gst-plugins-bad
 pkgver=1.14.4
-pkgrel=5
+pkgrel=8
 pkgrel+=.par1
-pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
+pkgdesc="GStreamer Multimedia Framework Bad Plugins"
+pkgdesc+=", without nonfree faac support"
 url="https://gstreamer.freedesktop.org/"
 arch=(x86_64)
 arch+=(i686 armv7h)
@@ -17,18 +18,16 @@ depends=(mjpegtools gst-plugins-base-libs curl chromaprint libmms faad2 celt lib
          libmodplug libgme wayland libofa openjpeg2 libwebp libsrtp gnutls sbc rtmpdump libgudev
          libexif libdvdread libvdpau libmpeg2 wildmidi ladspa openal libusb vulkan-icd-loader
          libfdk-aac soundtouch spandsp neon webrtc-audio-processing libdc1394 libmpcdec zvbi
-         openexr libbs2b libnice lcms2 bluez-libs glu srt aom)
+         openexr libbs2b libnice lcms2 bluez-libs glu srt aom x265)
 makedepends=(python gtk-doc autoconf-archive git gobject-introspection gtk3 vulkan-headers
              vulkan-validation-layers librsvg libtiger zbar fluidsynth lilv)
 replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 _commit=566e4ecc223b18fce8bd932f5e4885f41f746dd4 # tags/1.14.4^0
 source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad#commit=$_commit"
-        'gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common'
-        'gst-fdkaac2.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/77.patch')
+        'gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common')
 sha256sums=('SKIP'
-            'SKIP'
-            '273e8935061be3c951da81231deece84325311f896a7edf985bbf3716c559801')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -39,7 +38,9 @@ prepare() {
   cd $pkgname
 
   # libfdk-aac 2.0.0
-  patch -Np1 -i ../gst-fdkaac2.patch
+  git cherry-pick -n \
+    f4fdb9770c76113f38515245fecc5f11b3ace20d \
+    19d34f6b5e1633d5ec4bb2832c58470f0c829cab
 
   git submodule init
   git config --local submodule.common.url "$srcdir/gst-common"
-- 
cgit v1.2.2