diff options
author | Rodrigo Bezerra | 2019-01-19 16:44:51 -0300 |
---|---|---|
committer | Rodrigo Bezerra | 2019-01-19 16:44:51 -0300 |
commit | f2dcb2b5424d73fa53a58d9e124c7c064f1865ed (patch) | |
tree | 940c3642b85a106f82c6c2692da054bae5d6994f | |
parent | c9053b46d124c6e41db911f3f67f25409f8053b1 (diff) | |
download | aur-f2dcb2b5424d73fa53a58d9e124c7c064f1865ed.tar.gz |
Add patch for lib32-libfdk-aac 2.0.0
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | missing-includes.diff | 51 |
3 files changed, 9 insertions, 60 deletions
@@ -1,7 +1,7 @@ pkgbase = lib32-gst-plugins-bad pkgdesc = GStreamer Multimedia Framework Bad Plugins (32-bit) pkgver = 1.14.4 - pkgrel = 2 + pkgrel = 3 url = https://gstreamer.freedesktop.org/ arch = x86_64 license = LGPL @@ -69,10 +69,10 @@ pkgbase = lib32-gst-plugins-bad depends = gst-plugins-bad source = git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad#commit=566e4ecc223b18fce8bd932f5e4885f41f746dd4 source = gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common - source = missing-includes.diff + source = gst-fdkaac2.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/77.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = acf625d58611372532bc76e7276dacd69d2a9f7dee88ed9e2e8ecae0881476a3 + sha256sums = 273e8935061be3c951da81231deece84325311f896a7edf985bbf3716c559801 pkgname = lib32-gst-plugins-bad @@ -4,7 +4,7 @@ _basename=gst-plugins-bad pkgname=lib32-gst-plugins-bad pkgver=1.14.4 -pkgrel=2 +pkgrel=3 pkgdesc="GStreamer Multimedia Framework Bad Plugins (32-bit)" url="https://gstreamer.freedesktop.org/" arch=(x86_64) @@ -22,11 +22,11 @@ makedepends=(autoconf-archive git gobject-introspection lib32-gtk3 lib32-librsvg python vulkan-headers lib32-vulkan-validation-layers) _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 $_basename @@ -37,8 +37,8 @@ pkgver() { prepare() { cd $_basename - # 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/missing-includes.diff b/missing-includes.diff deleted file mode 100644 index f9960cf886fe..000000000000 --- a/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 |