summaryrefslogtreecommitdiff
path: root/media-plugins/gst-plugins-opencv
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-01-04 01:27:12 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-01-04 01:27:12 +0000
commit3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree44068672445b1418489aed82de58df3c470289e7 /media-plugins/gst-plugins-opencv
parent0f15659d48c193027158492acb726297501202c5 (diff)
gentoo resync : 04.01.2022
Diffstat (limited to 'media-plugins/gst-plugins-opencv')
-rw-r--r--media-plugins/gst-plugins-opencv/Manifest3
-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.ebuild6
3 files changed, 20 insertions, 3 deletions
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 94b7bcdbf897..93c8b7c8f850 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,6 +1,7 @@
AUX gst-plugins-bad-1.18.4-use-system-libs-opencv.patch 2030 BLAKE2B 16b83f0a34878a523e65ebe862e9100be969a318a9dfcac64b742eca68c017cdab3d6e44b3091c683842da79384f23a320bf777711818f63688b293c8521b38f SHA512 58cfb2dc849ec18f413f642b5125a920ec8c98c628bcf1b568b73a7f2681e921dd9a77832b4186f9abb4a60c689f17d249339cf82fd38f78d626b4b4cef9f8c7
+AUX gst-plugins-bad-1.18.4-volatile-glib.patch 594 BLAKE2B 87a72ca19869d2a46a33a3d866763943e58f1bece5f2b0495e9a2f808e8c0b92d2415014f9739de4aa995c946922fbd1cac4a5669d4b403876500d1028b342fe SHA512 4672e774c2ed721ecc068e40cab63c8ff31df117025939b59ceb46a8e7998c1aa857e339902f86f2ad6fa690ee2ce23419ff5fde508d6e3d4972ee6feb4c076f
DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
EBUILD gst-plugins-opencv-1.16.3.ebuild 719 BLAKE2B a4e976bec3993a280be39f01ebbc3f638c30ea480c5b2f8b2a30db8a5737524ebbafd7c52d6978210d89b4c4623c844a239f2148e82d900d87894f106b6adb21 SHA512 e8177d5e96db887ece39786677a92733096ee0c17c0452e621331a5c01187275b1a4a77896f81e24befe7f4ed6bf2d8db55dedaa5a0cabd167616a6a6b4cd7a1
-EBUILD gst-plugins-opencv-1.18.4-r2.ebuild 656 BLAKE2B 34e9279139f834c186859d6a5a32861d5afc4807bed5c6c6e008d0970134880c398923bf5b0cfb5842147004e57e36256fc7f34e27fa5f93ccd81c55a671d1b8 SHA512 652a2239cd1032c0208c084694e56767c2c5dbd65b1744c7fa38e2a04fdf3877b41e581b45fdd1d580f3f673bd773b039e7dd1bc07984f3bb3d17e4aaf0408d2
+EBUILD gst-plugins-opencv-1.18.4-r2.ebuild 786 BLAKE2B f37b38dda3c2e7eae57a946175be78d2086d16c167e399c916cae102f469cff229b5b83500cda217766cedf91f344298e43776d0f291478ee9742ef2881eb0a0 SHA512 b1e3cdc9d0bf229151728f3349fc391522c5d77f5df946771b2abac129195abaaca81610a574fcdf80e8d458ff8db1be71e23f41bf88e8deb0889bb6f5e6aa74
MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
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..4f2765d79b8d 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
@@ -3,8 +3,8 @@
EAPI=7
GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer-meson
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit gstreamer-meson python-any-r1
DESCRIPTION="OpenCV elements for GStreamer"
KEYWORDS="~amd64 ~x86"
@@ -16,9 +16,11 @@ RDEPEND="
<media-libs/opencv-4.6.0
"
DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+ "${FILESDIR}"/gst-plugins-bad-${PV}-volatile-glib.patch
)
src_prepare() {