gentoo resync : 29.12.2022

2 files changed, 0 insertions, 95 deletions

diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
deleted file mode 100644
index 721ea3830932..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-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/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
deleted file mode 100644
index 63e26eaa5cdb..000000000000
--- a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-volatile-glib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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;