| Message ID | 20250326063647.1941-7-leimaohui@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/7] gst-devtools: upgrade 1.24.12 -> 1.26.0 | expand |
Hi Lei, leimaohui via lists.openembedded.org <leimaohui= fujitsu.com@lists.openembedded.org> escreveu (quarta, 26/03/2025 à(s) 06:37): > From: Lei Maohui <leihaohui@fujitsu.com> > > Couple these two together since 1.26.0 version of gstpython add depends on > "analytics" plugin of gstbad > > When build 1.26.0 gstreamer1.0-python, issue occurs: > > |../../../../../../workspace/sources/gstreamer1.0-python/meson.build:23:13: > ERROR: Dependency "gstreamer-analytics-1.0" not found, tried pkgconfig > > Source code: > | $ vi workspace/sources/gstreamer1.0-python/meson.build > | 23 gstbad_dep = dependency('gstreamer-analytics-1.0', version :gst_req, > | 24 fallback : []) > > Signed-off-by: Lei Maohui <leihaohui@fujitsu.com> > --- > ...issing-opencv-data-dir-in-yocto-buil.patch | 27 ++++++++++--------- > ....bb => gstreamer1.0-plugins-bad_1.26.0.bb} | 5 ++-- > ...24.12.bb => gstreamer1.0-python_1.26.0.bb} | 4 +-- > 3 files changed, 20 insertions(+), 16 deletions(-) > rename meta/recipes-multimedia/gstreamer/{ > gstreamer1.0-plugins-bad_1.24.12.bb => gstreamer1.0-plugins-bad_1.26.0.bb} > (97%) > rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.24.12.bb > => gstreamer1.0-python_1.26.0.bb} (88%) > > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > index 4d0d0e2693..49be4c1eb4 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > @@ -1,6 +1,6 @@ > -From bd389203124592cfd91fb020ea05a5e4ad1c1394 Mon Sep 17 00:00:00 2001 > -From: Andrey Zhizhikin <andrey.z@gmail.com> > -Date: Mon, 27 Jan 2020 10:22:35 +0000 > +From 11a08e3f3135b649b68714c77670c37559f3a33c Mon Sep 17 00:00:00 2001 > +From: Lei Maohui <leimaohui@fujitsu.com> > +Date: Tue, 25 Mar 2025 00:55:27 +0000 > What is the reason to change the author of this patch? Jose Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build > > When Yocto build is performed, opencv searches for data dir using simple > @@ -17,16 +17,19 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> > 1 file changed, 3 insertions(+) > > diff --git a/gst-libs/gst/opencv/meson.build > b/gst-libs/gst/opencv/meson.build > -index 1d337f1..f47939a 100644 > +index 64e913e..42a0958 100644 > --- a/gst-libs/gst/opencv/meson.build > +++ b/gst-libs/gst/opencv/meson.build > -@@ -52,6 +52,9 @@ if opencv_found > - # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format > string is not a string literal [-Werror,-Wformat-nonliteral] > - gstopencv_cargs += > cxx.get_supported_arguments(['-Wno-missing-include-dirs', > '-Wno-format-nonliteral']) > +@@ -61,6 +61,9 @@ gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix > + '"'] > + # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format > string is not a string literal [-Werror,-Wformat-nonliteral] > + gstopencv_cargs += > cxx.get_supported_arguments(['-Wno-missing-include-dirs', > '-Wno-format-nonliteral']) > > -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; > print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() > -+ opencv_prefix = pkgconf_sysroot + opencv_prefix > ++pkgconf_sysroot = run_command(python3, '-c', 'import os; > print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() > ++opencv_prefix = pkgconf_sysroot + opencv_prefix > + > - # Check the data dir used by opencv for its xml data files > - # Use prefix from pkg-config to be compatible with cross-compilation > - r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: > false) > + # Check the data dir used by opencv for its xml data files > + # Use prefix from pkg-config to be compatible with cross-compilation > + fsmod = import('fs') > +-- > +2.43.0 > + > diff --git a/meta/recipes-multimedia/gstreamer/ > gstreamer1.0-plugins-bad_1.24.12.bb b/meta/recipes-multimedia/gstreamer/ > gstreamer1.0-plugins-bad_1.26.0.bb > similarity index 97% > rename from meta/recipes-multimedia/gstreamer/ > gstreamer1.0-plugins-bad_1.24.12.bb > rename to meta/recipes-multimedia/gstreamer/ > gstreamer1.0-plugins-bad_1.26.0.bb > index 91d9150359..8970afdcef 100644 > --- a/meta/recipes-multimedia/gstreamer/ > gstreamer1.0-plugins-bad_1.24.12.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb > @@ -10,7 +10,7 @@ SRC_URI = " > https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad > file://0002-avoid-including-sys-poll.h-directly.patch \ > > file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ > " > -SRC_URI[sha256sum] = > "3d386af3d1dbd1a06c74a6251250c269b481e703f0e3255ba89ef6c1e063afea" > +SRC_URI[sha256sum] = > "f8287a84c5f66368a5a50da5f969994a02c47f20220ffe1ca3154193e65af216" > > S = "${WORKDIR}/gst-plugins-bad-${PV}" > > @@ -28,10 +28,11 @@ PACKAGECONFIG ??= " \ > ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} > \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ > bz2 closedcaption curl dash dtls hls openssl sbc smoothstreaming \ > - sndfile ttml uvch264 webp \ > + sndfile ttml uvch264 webp analytics \ > ${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'rsvg', d)} \ > " > > +PACKAGECONFIG[analytics] = > "-Danalyticsoverlay=enabled,-Danalyticsoverlay=disabled," > PACKAGECONFIG[aom] = "-Daom=enabled,-Daom=disabled,aom" > PACKAGECONFIG[assrender] = > "-Dassrender=enabled,-Dassrender=disabled,libass" > PACKAGECONFIG[avtp] = "-Davtp=enabled,-Davtp=disabled,libavtp" > diff --git a/meta/recipes-multimedia/gstreamer/ > gstreamer1.0-python_1.24.12.bb b/meta/recipes-multimedia/gstreamer/ > gstreamer1.0-python_1.26.0.bb > similarity index 88% > rename from meta/recipes-multimedia/gstreamer/ > gstreamer1.0-python_1.24.12.bb > rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb > index f62cb159c2..04c96a879f 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb > @@ -8,9 +8,9 @@ LICENSE = "LGPL-2.1-or-later" > LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" > > SRC_URI = " > https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" > -SRC_URI[sha256sum] = > "d679e2ca3e655a7328627c4670c324fc22f588d2cb8ecd2fa7a6a42df51132cc" > +SRC_URI[sha256sum] = > "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db" > > -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" > +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject > gstreamer1.0-plugins-bad" > RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base > python3-pygobject" > > PNREAL = "gst-python" > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#213634): > https://lists.openembedded.org/g/openembedded-core/message/213634 > Mute This Topic: https://lists.openembedded.org/mt/111912607/5052612 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > quaresma.jose@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
>What is the reason to change the author of this patch? >Jose Oh, sorry for the mistake, I will change the author back in next version From: Jose Quaresma <quaresma.jose@gmail.com> Sent: Wednesday, March 26, 2025 7:40 PM To: Lei, Maohui/雷 茂慧 <leimaohui@fujitsu.com> Cc: Anuj Mittal <anuj.mittal@intel.com>; openembedded-core@lists.openembedded.org; Lei Maohui <leihaohui@fujitsu.com> Subject: Re: [OE-core] [PATCH v2 7/7] gstreamer1.0-{plugins-bad, python}: upgrade 1.24.12 -> 1.26.0 Hi Lei, leimaohui via lists.openembedded.org<http://lists.openembedded.org> <leimaohui=fujitsu.com@lists.openembedded.org<mailto:fujitsu.com@lists.openembedded.org>> escreveu (quarta, 26/03/2025 à(s) 06:37): From: Lei Maohui <leihaohui@fujitsu.com<mailto:leihaohui@fujitsu.com>> Couple these two together since 1.26.0 version of gstpython add depends on "analytics" plugin of gstbad When build 1.26.0 gstreamer1.0-python, issue occurs: |../../../../../../workspace/sources/gstreamer1.0-python/meson.build:23:13: ERROR: Dependency "gstreamer-analytics-1.0" not found, tried pkgconfig Source code: | $ vi workspace/sources/gstreamer1.0-python/meson.build | 23 gstbad_dep = dependency('gstreamer-analytics-1.0', version :gst_req, | 24 fallback : []) Signed-off-by: Lei Maohui <leihaohui@fujitsu.com<mailto:leihaohui@fujitsu.com>> --- ...issing-opencv-data-dir-in-yocto-buil.patch | 27 ++++++++++--------- ....bb => gstreamer1.0-plugins-bad_1.26.0.bb<http://gstreamer1.0-plugins-bad_1.26.0.bb>} | 5 ++-- ...24.12.bb<http://24.12.bb> => gstreamer1.0-python_1.26.0.bb<http://gstreamer1.0-python_1.26.0.bb>} | 4 +-- 3 files changed, 20 insertions(+), 16 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.24.12.bb<http://gstreamer1.0-plugins-bad_1.24.12.bb> => gstreamer1.0-plugins-bad_1.26.0.bb<http://gstreamer1.0-plugins-bad_1.26.0.bb>} (97%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.24.12.bb<http://gstreamer1.0-python_1.24.12.bb> => gstreamer1.0-python_1.26.0.bb<http://gstreamer1.0-python_1.26.0.bb>} (88%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch index 4d0d0e2693..49be4c1eb4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -1,6 +1,6 @@ -From bd389203124592cfd91fb020ea05a5e4ad1c1394 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com<mailto:andrey.z@gmail.com>> -Date: Mon, 27 Jan 2020 10:22:35 +0000 +From 11a08e3f3135b649b68714c77670c37559f3a33c Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com<mailto:leimaohui@fujitsu.com>> +Date: Tue, 25 Mar 2025 00:55:27 +0000 What is the reason to change the author of this patch? Jose Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build When Yocto build is performed, opencv searches for data dir using simple @@ -17,16 +17,19 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com<mailto:quaresma.jose@gmail.com>> 1 file changed, 3 insertions(+) diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build -index 1d337f1..f47939a 100644 +index 64e913e..42a0958 100644 --- a/gst-libs/gst/opencv/meson.build +++ b/gst-libs/gst/opencv/meson.build -@@ -52,6 +52,9 @@ if opencv_found - # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] - gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) +@@ -61,6 +61,9 @@ gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] + gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() -+ opencv_prefix = pkgconf_sysroot + opencv_prefix ++pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() ++opencv_prefix = pkgconf_sysroot + opencv_prefix + - # Check the data dir used by opencv for its xml data files - # Use prefix from pkg-config to be compatible with cross-compilation - r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation + fsmod = import('fs') +-- +2.43.0 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.12.bb<http://gstreamer1.0-plugins-bad_1.24.12.bb> b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb<http://gstreamer1.0-plugins-bad_1.26.0.bb> similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.12.bb<http://gstreamer1.0-plugins-bad_1.24.12.bb> rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb<http://gstreamer1.0-plugins-bad_1.26.0.bb> index 91d9150359..8970afdcef 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.12.bb<http://gstreamer1.0-plugins-bad_1.24.12.bb> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb<http://gstreamer1.0-plugins-bad_1.26.0.bb> @@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "3d386af3d1dbd1a06c74a6251250c269b481e703f0e3255ba89ef6c1e063afea" +SRC_URI[sha256sum] = "f8287a84c5f66368a5a50da5f969994a02c47f20220ffe1ca3154193e65af216" S = "${WORKDIR}/gst-plugins-bad-${PV}" @@ -28,10 +28,11 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES<mailto:$%7b@bb.utils.contains('DISTRO_FEATURES>', 'wayland', 'wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES<mailto:$%7b@bb.utils.contains('DISTRO_FEATURES>', 'opengl', 'gl', '', d)} \ bz2 closedcaption curl dash dtls hls openssl sbc smoothstreaming \ - sndfile ttml uvch264 webp \ + sndfile ttml uvch264 webp analytics \ ${@bb.utils.contains('TUNE_FEATURES<mailto:$%7b@bb.utils.contains('TUNE_FEATURES>', 'mx32', '', 'rsvg', d)} \ " +PACKAGECONFIG[analytics] = "-Danalyticsoverlay=enabled,-Danalyticsoverlay=disabled," PACKAGECONFIG[aom] = "-Daom=enabled,-Daom=disabled,aom" PACKAGECONFIG[assrender] = "-Dassrender=enabled,-Dassrender=disabled,libass" PACKAGECONFIG[avtp] = "-Davtp=enabled,-Davtp=disabled,libavtp" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb<http://gstreamer1.0-python_1.24.12.bb> b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb<http://gstreamer1.0-python_1.26.0.bb> similarity index 88% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb<http://gstreamer1.0-python_1.24.12.bb> rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb<http://gstreamer1.0-python_1.26.0.bb> index f62cb159c2..04c96a879f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb<http://gstreamer1.0-python_1.24.12.bb> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb<http://gstreamer1.0-python_1.26.0.bb> @@ -8,9 +8,9 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz<https://gstreamer.freedesktop.org/src/$%7BPNREAL%7D/$%7BPNREAL%7D-$%7BPV%7D.tar.xz>" -SRC_URI[sha256sum] = "d679e2ca3e655a7328627c4670c324fc22f588d2cb8ecd2fa7a6a42df51132cc" +SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject gstreamer1.0-plugins-bad" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" PNREAL = "gst-python" -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#213634): https://lists.openembedded.org/g/openembedded-core/message/213634 Mute This Topic: https://lists.openembedded.org/mt/111912607/5052612 Group Owner: openembedded-core+owner@lists.openembedded.org<mailto:openembedded-core%2Bowner@lists.openembedded.org> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [quaresma.jose@gmail.com<mailto:quaresma.jose@gmail.com>] -=-=-=-=-=-=-=-=-=-=-=- -- Best regards, José Quaresma
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch index 4d0d0e2693..49be4c1eb4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -1,6 +1,6 @@ -From bd389203124592cfd91fb020ea05a5e4ad1c1394 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Mon, 27 Jan 2020 10:22:35 +0000 +From 11a08e3f3135b649b68714c77670c37559f3a33c Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Tue, 25 Mar 2025 00:55:27 +0000 Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build When Yocto build is performed, opencv searches for data dir using simple @@ -17,16 +17,19 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> 1 file changed, 3 insertions(+) diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build -index 1d337f1..f47939a 100644 +index 64e913e..42a0958 100644 --- a/gst-libs/gst/opencv/meson.build +++ b/gst-libs/gst/opencv/meson.build -@@ -52,6 +52,9 @@ if opencv_found - # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] - gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) +@@ -61,6 +61,9 @@ gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] + gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() -+ opencv_prefix = pkgconf_sysroot + opencv_prefix ++pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() ++opencv_prefix = pkgconf_sysroot + opencv_prefix + - # Check the data dir used by opencv for its xml data files - # Use prefix from pkg-config to be compatible with cross-compilation - r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation + fsmod = import('fs') +-- +2.43.0 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.12.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.12.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb index 91d9150359..8970afdcef 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.12.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.bb @@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "3d386af3d1dbd1a06c74a6251250c269b481e703f0e3255ba89ef6c1e063afea" +SRC_URI[sha256sum] = "f8287a84c5f66368a5a50da5f969994a02c47f20220ffe1ca3154193e65af216" S = "${WORKDIR}/gst-plugins-bad-${PV}" @@ -28,10 +28,11 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ bz2 closedcaption curl dash dtls hls openssl sbc smoothstreaming \ - sndfile ttml uvch264 webp \ + sndfile ttml uvch264 webp analytics \ ${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'rsvg', d)} \ " +PACKAGECONFIG[analytics] = "-Danalyticsoverlay=enabled,-Danalyticsoverlay=disabled," PACKAGECONFIG[aom] = "-Daom=enabled,-Daom=disabled,aom" PACKAGECONFIG[assrender] = "-Dassrender=enabled,-Dassrender=disabled,libass" PACKAGECONFIG[avtp] = "-Davtp=enabled,-Davtp=disabled,libavtp" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb similarity index 88% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb index f62cb159c2..04c96a879f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.12.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.bb @@ -8,9 +8,9 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d679e2ca3e655a7328627c4670c324fc22f588d2cb8ecd2fa7a6a42df51132cc" +SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject gstreamer1.0-plugins-bad" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" PNREAL = "gst-python"