summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-12-28 01:17:44 +0000
committerSam James <sam@gentoo.org>2021-12-28 01:24:38 +0000
commit11f22dbd44047fa6ff4a011e2d42c6f9799fa5b3 (patch)
tree1bd5b810111b71a1b88d4e1cf4ad4acd27b0e731 /media-plugins
parentsys-apps/mcstrans: stabilize SELinux userspace 3.3 (diff)
downloadgentoo-11f22dbd44047fa6ff4a011e2d42c6f9799fa5b3.tar.gz
gentoo-11f22dbd44047fa6ff4a011e2d42c6f9799fa5b3.tar.bz2
gentoo-11f22dbd44047fa6ff4a011e2d42c6f9799fa5b3.zip
media-plugins/gst-plugins-opencv: fix build with newer glib
Closes: https://bugs.gentoo.org/805944 Closes: https://bugs.gentoo.org/826702 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch14
-rw-r--r--media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild1
2 files changed, 15 insertions, 0 deletions
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch
new file mode 100644
index 000000000000..63e26eaa5cdb
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/826702
+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2155/diffs?commit_id=68858358544dd3b7e20663f731db22fd74a78a45 (cherry-picked relevant part)
+
+--- a/ext/opencv/gstcvdilateerode.cpp
++++ b/ext/opencv/gstcvdilateerode.cpp
+@@ -87,7 +87,7 @@ static void gst_cv_dilate_erode_get_property (GObject * object, guint prop_id,
+ GType
+ gst_cv_dilate_erode_get_type (void)
+ {
+- static volatile gsize opencv_dilate_erode_type = 0;
++ static gsize opencv_dilate_erode_type = 0;
+
+ if (g_once_init_enter (&opencv_dilate_erode_type)) {
+ GType _type;
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
index f1e18c62e1e4..02f6c5c78873 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+ "${FILESDIR}"/gst-plugins-bad-${PV}-volatile-glib.patch
)
src_prepare() {