Message ID | 20220202134233.2091916-5-ch@denx.de |
---|---|
State | New |
Headers | show |
Series | Update gstreamer recipes to 1.19.90 | expand |
Hi, Claudius There are some new options on the gstreamer bad that are not updated on this patch. more precisely what will be done to use the new gpl option ? # License-related feature options option('gpl', type: 'feature', value: 'disabled', yield: true, description: 'Allow build plugins that have (A)GPL-licensed dependencies') Claudius Heine <ch@denx.de> escreveu no dia quarta, 2/02/2022 à(s) 13:43: > Features `libmms` and `ofa` where removed upstream. > > Patches where rebased. > > Signed-off-by: Claudius Heine <ch@denx.de> > --- > ...missing-opencv-data-dir-in-yocto-buil.patch | 17 ++++++++--------- > .../0005-msdk-fix-includedir-path.patch | 18 +++++++++--------- > ....bb => gstreamer1.0-plugins-bad_1.19.90.bb} | 4 +--- > 3 files changed, 18 insertions(+), 21 deletions(-) > rename meta/recipes-multimedia/gstreamer/{ > gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.19.90.bb} > (97%) > > 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..2b9854b45e 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 > @@ -19,31 +19,30 @@ diff --git a/ext/opencv/meson.build > b/ext/opencv/meson.build > index 0b0b3fc..0ed3344 100644 > --- a/ext/opencv/meson.build > +++ b/ext/opencv/meson.build > -@@ -78,20 +78,21 @@ else > +@@ -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..5a89be79d0 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 > @@ -16,16 +16,16 @@ diff --git a/sys/msdk/meson.build > b/sys/msdk/meson.build > index 6346c9451..068f38548 100644 > --- a/sys/msdk/meson.build > +++ b/sys/msdk/meson.build > -@@ -40,7 +40,9 @@ endif > +@@ -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.19.90.bb > similarity index 97% > 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.19.90.bb > index f90dff693d..21ab28cc92 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb > +++ b/meta/recipes-multimedia/gstreamer/ > gstreamer1.0-plugins-bad_1.19.90.bb > @@ -11,7 +11,7 @@ SRC_URI = " > https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad > > file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ > file://0005-msdk-fix-includedir-path.patch \ > " > -SRC_URI[sha256sum] = > "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" > +SRC_URI[sha256sum] = > "817cde39be30609e562c5b99d0e40527d58bd2319bc7a46eb8bec27f713f55ca" > > S = "${WORKDIR}/gst-plugins-bad-${PV}" > > @@ -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 > >
On 2022-02-02 18:57, Jose Quaresma wrote: > Hi, Claudius > > There are some new options on the gstreamer bad that are not updated on > this patch. > more precisely what will be done to use the new gpl option ? Hmm... I am not sure. `gpl` probably needs to be added because we already have `faad` and others which require it. I will at least that in v2. For all other features I am open to suggestions about which should be added. regards, Claudius
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..2b9854b45e 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 @@ -19,31 +19,30 @@ diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index 0b0b3fc..0ed3344 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build -@@ -78,20 +78,21 @@ else +@@ -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..5a89be79d0 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 @@ -16,16 +16,16 @@ diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index 6346c9451..068f38548 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build -@@ -40,7 +40,9 @@ endif +@@ -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.19.90.bb similarity index 97% 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.19.90.bb index f90dff693d..21ab28cc92 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.19.90.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://0005-msdk-fix-includedir-path.patch \ " -SRC_URI[sha256sum] = "a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e" +SRC_URI[sha256sum] = "817cde39be30609e562c5b99d0e40527d58bd2319bc7a46eb8bec27f713f55ca" S = "${WORKDIR}/gst-plugins-bad-${PV}" @@ -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 \
Features `libmms` and `ofa` where removed upstream. Patches where rebased. Signed-off-by: Claudius Heine <ch@denx.de> --- ...missing-opencv-data-dir-in-yocto-buil.patch | 17 ++++++++--------- .../0005-msdk-fix-includedir-path.patch | 18 +++++++++--------- ....bb => gstreamer1.0-plugins-bad_1.19.90.bb} | 4 +--- 3 files changed, 18 insertions(+), 21 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.18.5.bb => gstreamer1.0-plugins-bad_1.19.90.bb} (97%)