diff --git a/mingw-w64-gst-plugins-bad/0004-accept-latest-opencv.patch b/mingw-w64-gst-plugins-bad/0004-accept-latest-opencv.patch new file mode 100644 index 0000000000..cad8b7e45e --- /dev/null +++ b/mingw-w64-gst-plugins-bad/0004-accept-latest-opencv.patch @@ -0,0 +1,11 @@ +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -71,7 +71,7 @@ if opencv_found + endif + + if not opencv_found +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.7.0'], required : false) ++ opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD index f424e95788..2af551dbb5 100644 --- a/mingw-w64-gst-plugins-bad/PKGBUILD +++ b/mingw-w64-gst-plugins-bad/PKGBUILD @@ -75,18 +75,21 @@ makedepends=( source=("${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz"{,.asc} "0001-meson-fix-vulkan.patch" "0002-fix-vulkan-mkenum.patch" - "0003-enable-mediafoundation-plugin.patch") + "0003-enable-mediafoundation-plugin.patch" + "0004-accept-latest-opencv.patch") sha256sums=('f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363' 'SKIP' 'd2e9485b1ae5d5afa764331ee97cea2ef1a6b07c7b658a373f6beef0cc98d69f' '5ca55fdfc4c5d10d2319f83dddac8130c2ffab67b1248d2233cdcb188d5a0fd3' - '5cf2daa1b967112139e780a256957642cd005c25b1572e892d03021d1dec60ef') + '5cf2daa1b967112139e780a256957642cd005c25b1572e892d03021d1dec60ef' + 'ea9e3384dfd43251da617f7525f90260dcfb5e6d55b7d07d6acb0fa21ec9e786') validpgpkeys=('D637032E45B8C6585B9456565D2EEE6F6F349D7C') # Tim Müller prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/0001-meson-fix-vulkan.patch" patch -Np1 -i "${srcdir}/0002-fix-vulkan-mkenum.patch" + patch -Np1 -i "${srcdir}/0004-accept-latest-opencv.patch" # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1882 patch -Np1 -i "${srcdir}/0003-enable-mediafoundation-plugin.patch" @@ -173,9 +176,7 @@ package_gst-plugins-bad-libs() { mkdir -p _plugins/bin mv "${pkgdir}${MINGW_PREFIX}/lib/gstreamer-1.0" _plugins/lib - if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then - mv "${pkgdir}${MINGW_PREFIX}/bin/libgstopencv-1.0-0.dll" _plugins/bin - fi + mv "${pkgdir}${MINGW_PREFIX}/bin/libgstopencv-1.0-0.dll" _plugins/bin } package_gst-plugins-bad() {