summaryrefslogtreecommitdiff
path: root/libre/gst-plugins-bad
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2018-12-13 14:12:07 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2018-12-13 14:12:07 -0500
commitd4998684b7e1f666e05625ac5a1de5b5e688da08 (patch)
tree30532497268bebf940a94b5055cdf3d4447dc5d5 /libre/gst-plugins-bad
parentc2222682ea94b2f686c6359cab3ced90fb276e15 (diff)
downloadabslibre-d4998684b7e1f666e05625ac5a1de5b5e688da08.tar.gz
abslibre-d4998684b7e1f666e05625ac5a1de5b5e688da08.tar.bz2
abslibre-d4998684b7e1f666e05625ac5a1de5b5e688da08.zip
gst-plugins-bad-1.14.4-5.par1: rebuild
Diffstat (limited to 'libre/gst-plugins-bad')
-rw-r--r--libre/gst-plugins-bad/PKGBUILD14
-rw-r--r--libre/gst-plugins-bad/missing-includes.diff51
2 files changed, 7 insertions, 58 deletions
diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index 55166e8f7..16a3874c5 100644
--- a/libre/gst-plugins-bad/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=gst-plugins-bad
pkgver=1.14.4
-pkgrel=3
+pkgrel=5
pkgrel+=.par1
pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
url="https://gstreamer.freedesktop.org/"
@@ -19,16 +19,16 @@ depends=(mjpegtools gst-plugins-base-libs curl chromaprint libmms faad2 celt lib
libfdk-aac soundtouch spandsp neon webrtc-audio-processing libdc1394 libmpcdec zvbi
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)
+ 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"
- missing-includes.diff)
+ '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')
sha256sums=('SKIP'
'SKIP'
- 'acf625d58611372532bc76e7276dacd69d2a9f7dee88ed9e2e8ecae0881476a3')
+ '273e8935061be3c951da81231deece84325311f896a7edf985bbf3716c559801')
pkgver() {
cd $pkgname
@@ -38,8 +38,8 @@ pkgver() {
prepare() {
cd $pkgname
- # error: ‘CV_RGB’ was not declared in this scope
- patch -Np1 -i ../missing-includes.diff
+ # libfdk-aac 2.0.0
+ patch -Np1 -i ../gst-fdkaac2.patch
git submodule init
git config --local submodule.common.url "$srcdir/gst-common"
diff --git a/libre/gst-plugins-bad/missing-includes.diff b/libre/gst-plugins-bad/missing-includes.diff
deleted file mode 100644
index f9960cf88..000000000
--- a/libre/gst-plugins-bad/missing-includes.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-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