From 64751ccb1088040887e41fca700a35cba5e5021d Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 4 Aug 2018 21:48:40 -0500
Subject: gst-plugins-bad-debug-1.14.12-1.parabola1: updating version

---
 libre/gst-plugins-bad/PKGBUILD              | 17 ++++++----
 libre/gst-plugins-bad/missing-includes.diff | 51 +++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 libre/gst-plugins-bad/missing-includes.diff

(limited to 'libre/gst-plugins-bad')

diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index 355123007..62ab6fb17 100644
--- a/libre/gst-plugins-bad/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 pkgname=gst-plugins-bad
-pkgver=1.14.1
-pkgrel=2.parabola1
+pkgver=1.14.12
+pkgrel=1.parabola1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 url="https://gstreamer.freedesktop.org/"
 arch=(i686 x86_64 armv7h)
@@ -16,16 +16,18 @@ 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)
+         openexr libbs2b libnice lcms2 bluez-libs glu srt aom)
 makedepends=(python gtk-doc autoconf-archive git gobject-introspection gtk3 vulkan-headers
              vulkan-validation-layers librsvg libtiger zbar fluidsynth lilv opencv)
 replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
-_commit=fd178617d0fc3bed781d566def792f90d7825d01 # tags/1.14.1^0
+_commit=513ef5efdf85f9af4a016e8ae69f28cf16c9ec58 # tags/1.14.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")
+        "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common"
+        missing-includes.diff)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            'acf625d58611372532bc76e7276dacd69d2a9f7dee88ed9e2e8ecae0881476a3')
 
 pkgver() {
   cd $pkgname
@@ -35,6 +37,9 @@ pkgver() {
 prepare() {
   cd $pkgname
 
+  # error: ‘CV_RGB’ was not declared in this scope
+  patch -Np1 -i ../missing-includes.diff
+
   git submodule init
   git config --local submodule.common.url "$srcdir/gst-common"
   git submodule update
diff --git a/libre/gst-plugins-bad/missing-includes.diff b/libre/gst-plugins-bad/missing-includes.diff
new file mode 100644
index 000000000..f9960cf88
--- /dev/null
+++ b/libre/gst-plugins-bad/missing-includes.diff
@@ -0,0 +1,51 @@
+Submodule common f0c2dc9aa..ed78bee43:
+  > valgrind suppressions: ignore any error triggered by */ld*.so
+  > gtk-doc-plugins.mak: sort xml inspect files
+diff --git i/ext/opencv/MotionCells.cpp w/ext/opencv/MotionCells.cpp
+index f85989e11..e75191308 100644
+--- i/ext/opencv/MotionCells.cpp
++++ w/ext/opencv/MotionCells.cpp
+@@ -52,6 +52,7 @@
+ #include <errno.h>
+ #include "MotionCells.h"
+ #include <opencv2/imgproc/imgproc_c.h>
++#include <opencv2/imgproc/imgproc.hpp>
+ 
+ MotionCells::MotionCells ()
+ {
+diff --git i/ext/opencv/gsthanddetect.cpp w/ext/opencv/gsthanddetect.cpp
+index 60fd5be72..aadbc03de 100644
+--- i/ext/opencv/gsthanddetect.cpp
++++ w/ext/opencv/gsthanddetect.cpp
+@@ -63,6 +63,7 @@
+ /* element header */
+ #include "gsthanddetect.h"
+ #include <opencv2/imgproc/imgproc_c.h>
++#include <opencv2/imgproc.hpp>
+ 
+ GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug);
+ #define GST_CAT_DEFAULT gst_handdetect_debug
+diff --git i/ext/opencv/gstsegmentation.cpp w/ext/opencv/gstsegmentation.cpp
+index d52476e7d..fd3abb507 100644
+--- i/ext/opencv/gstsegmentation.cpp
++++ w/ext/opencv/gstsegmentation.cpp
+@@ -92,6 +92,7 @@
+ 
+ #include "gstsegmentation.h"
+ #include <opencv2/imgproc/imgproc_c.h>
++#include <opencv2/imgproc.hpp>
+ 
+ GST_DEBUG_CATEGORY_STATIC (gst_segmentation_debug);
+ #define GST_CAT_DEFAULT gst_segmentation_debug
+diff --git i/ext/opencv/gsttemplatematch.cpp w/ext/opencv/gsttemplatematch.cpp
+index f39208dc2..50197f23d 100644
+--- i/ext/opencv/gsttemplatematch.cpp
++++ w/ext/opencv/gsttemplatematch.cpp
+@@ -64,6 +64,7 @@
+ #include "../../gst-libs/gst/gst-i18n-plugin.h"
+ #include "gsttemplatematch.h"
+ #include <opencv2/imgproc/imgproc_c.h>
++#include <opencv2/imgproc.hpp>
+ 
+ GST_DEBUG_CATEGORY_STATIC (gst_template_match_debug);
+ #define GST_CAT_DEFAULT gst_template_match_debug
-- 
cgit v1.2.3