diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-31 03:22:19 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-31 03:22:19 +0100 |
commit | 3810dd6a469ba3e0014a390d92f1fc220dd20c3b (patch) | |
tree | b7dd01f1153f84e36981e0ae398c7e047d878cc4 /media-plugins/gst-plugins-opencv | |
parent | 2f210c93c08515a806199783aabe37d12a0197cb (diff) |
gentoo auto-resync : 31:05:2023 - 03:22:19
Diffstat (limited to 'media-plugins/gst-plugins-opencv')
-rw-r--r-- | media-plugins/gst-plugins-opencv/Manifest | 3 | ||||
-rw-r--r-- | media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch | 99 | ||||
-rw-r--r-- | media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild (renamed from media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild) | 8 |
3 files changed, 105 insertions, 5 deletions
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 |