Feature `ofa` and `libmms` are no longer available and where removed. Signed-off-by: Claudius Heine <[email protected]> --- ...ialized-warnings-when-compiling-with.patch | 8 +++--- ...-avoid-including-sys-poll.h-directly.patch | 8 +++--- ...-sentinals-for-gst_structure_get-etc.patch | 24 ++++++++--------- ...issing-opencv-data-dir-in-yocto-buil.patch | 25 +++++++++--------- .../0005-msdk-fix-includedir-path.patch | 26 +++++++++---------- ....bb => gstreamer1.0-plugins-bad_1.20.0.bb} | 20 +++++++------- 6 files changed, 54 insertions(+), 57 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.20.0.bb} (91%)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch index 13a673cd50..ae8af094cb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch @@ -7,13 +7,13 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> --- - gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- + subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c +diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c index 2c60ced..e8226d8 100644 ---- a/gst-libs/gst/codecparsers/gstvc1parser.c -+++ b/gst-libs/gst/codecparsers/gstvc1parser.c +--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c ++++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstvc1parser.c @@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size, GstVC1SeqLayer * seqlayer) { diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch index ead6897f67..b1aaff864b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch @@ -9,13 +9,13 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> --- - sys/dvb/gstdvbsrc.c | 2 +- + subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c +diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c index ca6b92a..b2772db 100644 ---- a/sys/dvb/gstdvbsrc.c -+++ b/sys/dvb/gstdvbsrc.c +--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c ++++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c @@ -97,7 +97,7 @@ #include <gst/gst.h> #include <gst/glib-compat-private.h> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch index 88fbc40dcd..a53a840e98 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch @@ -18,15 +18,15 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> --- - sys/decklink/gstdecklink.cpp | 10 +++++----- - sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- - sys/decklink/gstdecklinkvideosink.cpp | 2 +- + subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp | 10 +++++----- + subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- + subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp +diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp b/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp index 4dac7e1..43762ce 100644 ---- a/sys/decklink/gstdecklink.cpp -+++ b/sys/decklink/gstdecklink.cpp +--- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp ++++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.cpp @@ -674,7 +674,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e) "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, "interlace-mode", G_TYPE_STRING, @@ -57,10 +57,10 @@ index 4dac7e1..43762ce 100644 break; case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ -diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp +diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp index 2fef934..c47229a 100644 ---- a/sys/decklink/gstdecklinkaudiosrc.cpp -+++ b/sys/decklink/gstdecklinkaudiosrc.cpp +--- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp ++++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkaudiosrc.cpp @@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self) g_mutex_unlock (&self->input->lock); @@ -70,10 +70,10 @@ index 2fef934..c47229a 100644 gst_object_unref (videosrc); switch (vconn) { -diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp +diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp index e3a6775..f1a5aae 100644 ---- a/sys/decklink/gstdecklinkvideosink.cpp -+++ b/sys/decklink/gstdecklinkvideosink.cpp +--- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp ++++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklinkvideosink.cpp @@ -286,7 +286,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, gpointer user_data) { 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 b816709066..47dbb4b54d 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 @@ -12,38 +12,37 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andrey Zhizhikin <[email protected]> --- - ext/opencv/meson.build | 7 ++++--- + subprojects/gst-plugins-bad/ext/opencv/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +diff --git a/subprojects/gst-plugins-bad/ext/opencv/meson.build b/subprojects/gst-plugins-bad/ext/opencv/meson.build index 0b0b3fc..0ed3344 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -78,20 +78,21 @@ else +--- a/subprojects/gst-plugins-bad/ext/opencv/meson.build ++++ b/subprojects/gst-plugins-bad/ext/opencv/meson.build +@@ -84,20 +84,21 @@ if not opencv_found endif if opencv_found + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + opencv_prefix = opencv_dep.get_variable('prefix') gstopencv_cargs += ['-DOPENCV_PREFIX="' + 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') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') +- r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv', check: false) if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' else -- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV', check: false) ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV', check: false) if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' else -- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') -+ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4', check: false) ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4', check: false) if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' else -- 2.28.0 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch index cb3bb7d361..5cda092353 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch @@ -9,23 +9,23 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Naveen Saini <[email protected]> --- - sys/msdk/meson.build | 2 ++ + subprojects/gst-plugins-bad/sys/msdk/meson.build | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build +diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build index 6346c9451..068f38548 100644 ---- a/sys/msdk/meson.build -+++ b/sys/msdk/meson.build -@@ -40,7 +40,9 @@ endif +--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build ++++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build +@@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' + mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) - mfx_dep = dependency('libmfx', required: false) - if mfx_dep.found() -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') -+ mfx_incdir = pkgconf_sysroot + mfx_incdir - mfx_inc = [] - else - # Old versions of MediaSDK don't provide a pkg-config file + if mfx_dep.found() ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + mfx_incdir = mfx_dep.get_variable('includedir') ++ mfx_incdir = pkgconf_sysroot + mfx_incdir + mfx_inc = [] + use_msdk = true + else -- 2.17.1 diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb index f90dff693d..2e5627cfea 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.bb @@ -4,16 +4,16 @@ DESCRIPTION = "'Bad' GStreamer plugins and helper libraries " HOMEPAGE = "https://gstreamer.freedesktop.org/"; BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues"; -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ - file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ - file://0002-avoid-including-sys-poll.h-directly.patch \ - file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ - file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ - file://0005-msdk-fix-includedir-path.patch \ - " -SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" +require gstreamer1.0-source.inc -S = "${WORKDIR}/gst-plugins-bad-${PV}" +S = "${SRC_BASE}/subprojects/gst-plugins-bad" + +SRC_URI += "file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch;patchdir=${SRC_BASE} \ + file://0002-avoid-including-sys-poll.h-directly.patch;patchdir=${SRC_BASE} \ + file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch;patchdir=${SRC_BASE} \ + file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch;patchdir=${SRC_BASE} \ + file://0005-msdk-fix-includedir-path.patch;patchdir=${SRC_BASE} \ + " LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" @@ -61,7 +61,6 @@ PACKAGECONFIG[gcrypt] = "-Dhls-crypto=libgcrypt,,libgcrypt" PACKAGECONFIG[gl] = "-Dgl=enabled,-Dgl=disabled," PACKAGECONFIG[kms] = "-Dkms=enabled,-Dkms=disabled,libdrm" PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde265" -PACKAGECONFIG[libmms] = "-Dlibmms=enabled,-Dlibmms=disabled,libmms" PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2" PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms" PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" @@ -132,7 +131,6 @@ EXTRA_OEMESON += " \ -Dmplex=disabled \ -Dmusepack=disabled \ -Dnvcodec=disabled \ - -Dofa=disabled \ -Dopenexr=disabled \ -Dopenni2=disabled \ -Dopensles=disabled \ -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160969): https://lists.openembedded.org/g/openembedded-core/message/160969 Mute This Topic: https://lists.openembedded.org/mt/88693643/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
