[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/, media-plugins/gst-plugins-opencv/files/

[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/, media-plugins/gst-plugins-opencv/files/

[Sam James]

commit:     11f22dbd44047fa6ff4a011e2d42c6f9799fa5b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 01:17:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 01:24:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f22dbd

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 <AT> gentoo.org>

 .../files/gst-plugins-bad-1.18.4-volatile-glib.patch       | 14 ++++++++++++++
 .../gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild |  1 +
 2 files changed, 15 insertions(+)

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() {

[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/, media-plugins/gst-plugins-opencv/files/

[Sam James]

commit:     ba4c6afadf9a9bf5a3e404d9e2c1a22120d6c8ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 00:56:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 00:56:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4c6afa

media-plugins/gst-plugins-opencv: fix DuplicateFiles

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...plugins-bad-1.18.6-use-system-libs-opencv.patch | 81 ----------------------
 .../gst-plugins-opencv-1.18.6.ebuild               |  2 +-
 2 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-use-system-libs-opencv.patch
deleted file mode 100644
index 721ea3830932..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.6-use-system-libs-opencv.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 245245841d3117d81cff1b560b7ac4b1aad1aa78
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date:   Sat Jul 3 19:29:01 2021 +0300
-
-    Patch gst-plugins-bad 1.18.4 to also install opencv integration libs
-    
-    Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-
-diff --git a/ext/meson.build b/ext/meson.build
-index 2cbddbf82..c70a07bbe 100644
---- a/ext/meson.build
-+++ b/ext/meson.build
-@@ -58,7 +58,6 @@ subdir('ttml')
- subdir('voaacenc')
- subdir('voamrwbenc')
- subdir('vulkan')
--subdir('wayland')
- subdir('webrtc')
- subdir('webrtcdsp')
- subdir('webp')
-diff --git a/gst-libs/gst/meson.build b/gst-libs/gst/meson.build
-index 6cbed6c6c..d44943189 100644
---- a/gst-libs/gst/meson.build
-+++ b/gst-libs/gst/meson.build
-@@ -1,18 +1 @@
--subdir('uridownloader')
--
--subdir('adaptivedemux')
--subdir('audio')
--subdir('basecamerabinsrc')
--subdir('codecparsers')
--subdir('codecs')
--subdir('insertbin')
--subdir('interfaces')
--subdir('isoff')
--subdir('mpegts')
- subdir('opencv')
--subdir('player')
--subdir('sctp')
--subdir('transcoder')
--subdir('vulkan')
--subdir('wayland')
--subdir('webrtc')
-diff --git a/meson.build b/meson.build
-index e456c32da..cfa265061 100644
---- a/meson.build
-+++ b/meson.build
-@@ -462,13 +462,8 @@ if get_option('default_library') == 'shared'
- endif
- 
- subdir('gst-libs')
--subdir('gst')
- subdir('sys')
- subdir('ext')
--subdir('tests')
--subdir('data')
--subdir('tools')
--subdir('pkgconfig')
- 
- if have_orcc
-   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
-@@ -496,7 +491,6 @@ endif
- # xgettext is optional (on Windows for instance)
- if find_program('xgettext', required : get_option('nls')).found()
-   cdata.set('ENABLE_NLS', 1)
--  subdir('po')
- endif
- 
- subdir('scripts')
-diff --git a/sys/meson.build b/sys/meson.build
-index cf39e5770..31d943d4b 100644
---- a/sys/meson.build
-+++ b/sys/meson.build
-@@ -17,7 +17,6 @@ subdir('mediafoundation')
- subdir('msdk')
- subdir('nvcodec')
- subdir('opensles')
--subdir('shm')
- subdir('tinyalsa')
- subdir('uvch264')
- subdir('v4l2codecs')

diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild
index 904148f98a98..771ca9bca0a2 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.6.ebuild
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+	"${FILESDIR}"/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
 )
 
 src_prepare() {