gentoo auto-resync : 31:05:2023 - 03:22:19

9 files changed, 148 insertions, 21 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2911637c4cb6..97501d37853b 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index c257fc17738a..a3eb57fe3cb4 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,7 +1,5 @@
 DIST gst-plugins-bad-1.18.6.tar.xz 5652788 BLAKE2B d877c8b6d39b67de957f180fbcc942fc658631dfc75b90f342f088e58c4655b1591651fbcd2a98259c95f0a7e830bb0ec67f65eb87d4b13c9f2adc733da7f12f SHA512 78731e0db04afd3dcdd5c5ea84df4e096a5db121fd9cb6eb79197844482a3b36b2764a664f171f80c809e6182ceae2350113d47f3f7c684d2d88f752bc092baf
 DIST gst-plugins-bad-1.20.6.tar.xz 6244344 BLAKE2B 50c8d62b486541c0ee71d69f1debb18c7dcd02afe562f6d337f8648cf69a492ac47dcf250e4e6b1c6a7d518237431639c25601f9935996724cb9f73beffa27e8 SHA512 c1f2be9351dc12d9290f715ac529dc03572617fb65c50755927e01cb9307b9e806b6204b5b2f85c29a8fc3d8ca7695767a316fb387eac465e9e93bcae5d39ff5
-DIST gst-plugins-bad-1.22.3.tar.xz 5523924 BLAKE2B 8015098ac2d19546de58cebdbe29fd7fbb2c7f076bf775564d7b862ed99a59968a2f751ff1137534d178fea5cf1c2022e53e4159ca2e5d3bf71c9fa4663be4f5 SHA512 1512e26111174ea4a9da26203a635e7ec7673ea5b6ca8dae8aaa8a20ffae36c9b68904d669344a8efc31f751093a00e22d2a1f1affcdd037f162493441c77628
 EBUILD gst-plugins-libmms-1.18.6.ebuild 410 BLAKE2B dd4d00c912fd50463caeff6a4f154287a83bfa5cb850174dd70dfd9227652ec25822208515c3884a0b9ea4b404ae6245d3b1f8e7da788bc9ba5d9b15db19e132 SHA512 186a7ca2d4da01759d6f99359e85cf2ae1012bab9623346e40dfbac35c2b1be233f06084fa23664de180f9071887c1ffe4d51a616cd5c14457af3db3ef6ef5a4
 EBUILD gst-plugins-libmms-1.20.6.ebuild 414 BLAKE2B 28d39410193f1c6b9d08ef70bb6cce8ae5ba60aa27cc129e965360f093c2dd9479aa8abe852c9a2b93c2158fdff0a574a80253810fb1db7947270e88a3877edd SHA512 0fffd773b122da4adcd7cc082f1ee36cdb707d2b7e1b456af0dd5f920ee8689e2f0f6b57305df713f738e87ea1dfcf4d1505bbd151d017314e8e4de742363edc
-EBUILD gst-plugins-libmms-1.22.3.ebuild 414 BLAKE2B 28d39410193f1c6b9d08ef70bb6cce8ae5ba60aa27cc129e965360f093c2dd9479aa8abe852c9a2b93c2158fdff0a574a80253810fb1db7947270e88a3877edd SHA512 0fffd773b122da4adcd7cc082f1ee36cdb707d2b7e1b456af0dd5f920ee8689e2f0f6b57305df713f738e87ea1dfcf4d1505bbd151d017314e8e4de742363edc
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.22.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.22.3.ebuild
deleted file mode 100644
index 856f382daac1..000000000000
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.22.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer-meson
-
-DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 59154dceabfc..aaa2c18c5c80 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,4 +1,5 @@
 AUX gst-plugins-bad-1.20.1-use-system-libs-opencv.patch 2383 BLAKE2B 351d9a5b8060fb2dd5fe94237f5bddb14a217d88af5c95db8badb71c7d816453850946f11cf6435d5fb8c2a318aa2b853b06cba78fc016d1ccf68fe6f23383b6 SHA512 36b2810e1e58feb490f249040eed1d10b1e8395551c427628e2a3b3de28b1a8ec523b7c3cde675423be34c31f7cb5e2e986bf36b252bd5e07385e6801b22177c
+AUX gst-plugins-bad-1.22.3-use-system-libs-opencv.patch 2624 BLAKE2B 3dc25233b48a290af78793e439c5220be1e8a8f47a06f61f723a33b1817e740e46a60ba699432a95430715bcb0ca6d4f69375276ff3bf3688c57966b110bf224 SHA512 d51c3cbfeed6b6021a2a132aa5a10fdfad597a50512bbb9f1ca7aaca58a294311cc2f386da2c3c15fdfac52408b8a1d582a33d82205edc61970d086fb69af406
 DIST gst-plugins-bad-1.20.3.tar.xz 6222824 BLAKE2B 01aae59adbe76b8e50a49fb8bb8037e6f3aa93cbc2b658aab05ebbf30f8d1aef98c1981712caa39e3c9d08f1e0c9d76f2f874f7d2fdd994b3a0735b2809eafdf SHA512 cfcf126eabff550455decd7054a269b73489708c10a6b6090dddb5fde29bfba07ed330c339927ff170e025fa3a08d2ffb822322dc3798679366207a54132c71b
 DIST gst-plugins-bad-1.20.4.tar.xz 6229992 BLAKE2B 2cd276cec9991e2ca7367a43024d7aee43adaa185a4a06ec08d1e736e72333f7f38cb54257120b9a313feb1fdc285a50d456b4c1fb33627d83acfcd3ece20687 SHA512 31b28d4a1bbecf021a90f2aa49dd344ccea12533b65f3bf3a8426ca2175469fff7b7f8e08af7d3d22c18db2fe48b9d5fbea2b325d296aee04b019cebef1eaec4
 DIST gst-plugins-bad-1.20.5.tar.xz 6237720 BLAKE2B bf379da420d1f7f148cf51373f6f2d0800685487c8bdb7a768e79e0a2e4f1721053922be9321958b4ce318de12ea390de4cd89c345329ac41dd0425815e0e7f6 SHA512 4b4603d755d17a0fa072d771521bdcbf554fc9abdc8105b9d9189062e5725ae2989f430e1de77363a69d8c969ecbf15e73e9c478fabe8efac83b2d9b1b0a4a0a
@@ -8,5 +9,5 @@ EBUILD gst-plugins-opencv-1.20.3.ebuild 720 BLAKE2B 9a678748ad38136b07b0d300def0
 EBUILD gst-plugins-opencv-1.20.4.ebuild 723 BLAKE2B eaa32051977543a70f4d043d23fd5cd10178e625f2e499bb897213a6f8de2d32335f068afc078661d17903577d150808b40af8d2f742dd2ba89d7e1276f548c9 SHA512 94fcd8f2dfb90c13ec7e4fbee6032ed268344e5aded5cc8597012d758bfb5a79200992241c5764a0544cf00743f176f2323c601e68de9a3f3399aead9c0fc26a
 EBUILD gst-plugins-opencv-1.20.5.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
 EBUILD gst-plugins-opencv-1.20.6.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
-EBUILD gst-plugins-opencv-1.22.3.ebuild 702 BLAKE2B d76d193b47119a3d079bc577c4cfa59e6df09c048b8b96a67556b979a5d81b8ca8beed38e1c397a87c5851fdb833e6c3f894c9575594cb8b02a149cf1a566b0e SHA512 ba1dc1f050ee1b0c3a5255ebf94f1c998a7e7c7174745034f3b52f9f3f1eddcb3aca9588076d4e555cdd333492dac0f910cb1079bd89b63cdee76f0c59854bb9
+EBUILD gst-plugins-opencv-1.22.3-r1.ebuild 696 BLAKE2B 3996404e3eb653f6cfefc148e3463a9e1a8f88bca78615e4b62dd633c4acb86aa827777fbede0935b76c031a94df0e495c92c63347626579ad5d3270d0f0ca5b SHA512 173907c0def07fd939710c63d5f23b6d7865c7e8235b137d4d0179d74b9e01834fcde21b97272d7c7299e7d59bc5d89d02c559f793ff3fb2f400a29f93385df9
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
new file mode 100644
index 000000000000..cb05c45c2c31
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
@@ -0,0 +1,99 @@
+libgstopencv.so is "normally" installed by gst-plugins-bad, but we want it to
+be part of our gst-plugins-opencv package (installing it as part of gst-plugins-bad
+would at least be confusing, and also not ideal given it'd have to depend on opencv,
+even though we have gst-plugins-opencv).
+
+bad currently doesn't have a way to allow disabling everything but the opencv
+plugin bit, so that's what this patch does as a hack. It only keeps the bare
+minimum to build the opencv helper (i.e. disable everything that gst-plugins-bad
+does to not collide, but keep opencv).
+
+TODO: replace this with something more maintainable, e.g. possible hacks
+with submodules or creating a drop-in meson.build in the ebuild to just build
+the plugin & helper libs.
+--- a/ext/meson.build
++++ b/ext/meson.build
+@@ -64,7 +64,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('wayland')
+ subdir('webrtc')
+ subdir('webrtcdsp')
+ subdir('webp')
+--- a/gst-libs/gst/meson.build
++++ b/gst-libs/gst/meson.build
+@@ -1,24 +1 @@
+-subdir('uridownloader')
+-
+-subdir('adaptivedemux')
+-subdir('audio')
+-subdir('basecamerabinsrc')
+-subdir('codecparsers')
+-subdir('codecs')
+-subdir('d3d11')
+-# cuda can depend on d3d11
+-subdir('cuda')
+-subdir('insertbin')
+-subdir('interfaces')
+-subdir('isoff')
+-subdir('mpegts')
+ subdir('opencv')
+-subdir('play')
+-subdir('player')
+-subdir('sctp')
+-subdir('transcoder')
+-subdir('va')
+-subdir('vulkan')
+-subdir('wayland')
+-subdir('webrtc')
+-subdir('winrt')
+--- a/meson.build
++++ b/meson.build
+@@ -530,23 +530,10 @@ pkgconfig_variables = ['exec_prefix=${prefix}',
+ 
+ pkgconfig_subdirs = ['gstreamer-1.0']
+ 
+-pkgconfig.generate(
+-  libraries : [gst_dep],
+-  variables : pkgconfig_variables,
+-  subdirs : pkgconfig_subdirs,
+-  name : 'gstreamer-plugins-bad-1.0',
+-  description : 'Streaming media framework, bad plugins libraries',
+-)
+-
+ gpl_allowed = get_option('gpl').allowed()
+ 
+ subdir('gst-libs')
+-subdir('gst')
+-subdir('sys')
+ subdir('ext')
+-subdir('tests')
+-subdir('data')
+-subdir('tools')
+ 
+ if have_orcc
+   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
+--- a/sys/meson.build
++++ b/sys/meson.build
+@@ -18,7 +18,6 @@ subdir('msdk')
+ subdir('nvcodec')
+ subdir('opensles')
+ subdir('qsv')
+-subdir('shm')
+ subdir('tinyalsa')
+ subdir('uvch264')
+ subdir('v4l2codecs')
+diff --git a/ext/meson.build b/ext/meson.build
+index ebf7e3b..4124917 100644
+--- a/ext/meson.build
++++ b/ext/meson.build
+@@ -64,8 +64,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('webrtc')
+-subdir('webrtcdsp')
+ subdir('webp')
+ subdir('wildmidi')
+ subdir('wpe')
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
index 1356163c0ab0..dd4e9c41a067 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GST_ORG_MODULE=gst-plugins-bad
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit gstreamer-meson python-any-r1
 
 DESCRIPTION="OpenCV elements for GStreamer"
@@ -16,9 +16,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
-#PATCHES=(
-#	"${FILESDIR}"/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
-#)
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-plugins/gst-plugins-va/Manifest b/media-plugins/gst-plugins-va/Manifest
new file mode 100644
index 000000000000..944cf64f1e41
--- /dev/null
+++ b/media-plugins/gst-plugins-va/Manifest
@@ -0,0 +1,3 @@
+DIST gst-plugins-bad-1.22.3.tar.xz 5523924 BLAKE2B 8015098ac2d19546de58cebdbe29fd7fbb2c7f076bf775564d7b862ed99a59968a2f751ff1137534d178fea5cf1c2022e53e4159ca2e5d3bf71c9fa4663be4f5 SHA512 1512e26111174ea4a9da26203a635e7ec7673ea5b6ca8dae8aaa8a20ffae36c9b68904d669344a8efc31f751093a00e22d2a1f1affcdd037f162493441c77628
+EBUILD gst-plugins-va-1.22.3.ebuild 964 BLAKE2B e069ea6d2cfb4e76048aea3e9ce59b87ccdfa879a434e57816393f25d36f92510c01fac07b8d2aa44a659a387c4b885de10d5bef38c5bfbfcf496b1f91f992b1 SHA512 43c2c3dcc64594d55bb01849d98f9eef003982a74ddf79eb8ff170dc79103d65a89eb0b876f90358e054f1dcc2fe54c55113184e119bfb8b0242b697d52c820d
+MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-plugins/gst-plugins-va/gst-plugins-va-1.22.3.ebuild b/media-plugins/gst-plugins-va/gst-plugins-va-1.22.3.ebuild
new file mode 100644
index 000000000000..5793c7281a02
--- /dev/null
+++ b/media-plugins/gst-plugins-va/gst-plugins-va-1.22.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..11} )
+GST_ORG_MODULE=gst-plugins-bad
+GST_PLUGINS_ENABLED="va"
+inherit gstreamer-meson python-any-r1
+
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="~amd64"
+IUSE="+introspection +orc"
+
+# Baseline requirement for libva is 1.6, but 1.10 gets more features
+RDEPEND="
+	>=media-libs/libva-1.10[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+"
diff --git a/media-plugins/gst-plugins-va/metadata.xml b/media-plugins/gst-plugins-va/metadata.xml
new file mode 100644
index 000000000000..629bc56e9d9f
--- /dev/null
+++ b/media-plugins/gst-plugins-va/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+</pkgmetadata>