ffmpeg: Update from 4.4.1 to 5.0

Message ID 20220118185043.1778569-1-marex@denx.de
State New
Headers show
Series ffmpeg: Update from 4.4.1 to 5.0 | expand

Commit Message

Marek Vasut Jan. 18, 2022, 6:50 p.m. UTC
Update ffmpeg to 5.0 , release notes and changelog below:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES
https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0

The avresample has been removed before 5.0 release in ffmpeg commit
420cedd497 ("libavresample: Remove deprecated library")

The ffmpeg 5.0 might be an LTS release, see:
http://www.jbkempf.com/blog/post/2022/FFmpeg-5.0

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alex@linutronix.de>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}            | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb} (95%)

Comments

Alexander Kanavin Jan. 18, 2022, 8:48 p.m. UTC | #1
This update breaks gst-libav, and I have a patch in the works that fixes
that too :)

Alex

On Tue, 18 Jan 2022 at 19:50, Marek Vasut <marex@denx.de> wrote:

> Update ffmpeg to 5.0 , release notes and changelog below:
>
> https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES
> https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0
>
> The avresample has been removed before 5.0 release in ffmpeg commit
> 420cedd497 ("libavresample: Remove deprecated library")
>
> The ffmpeg 5.0 might be an LTS release, see:
> http://www.jbkempf.com/blog/post/2022/FFmpeg-5.0
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexander Kanavin <alex@linutronix.de>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}            | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
>  rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}
> (95%)
>
> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
> b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
> similarity index 95%
> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
> index 3ba07c31d6..4ba5ff4537 100644
> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
> @@ -11,7 +11,6 @@ LICENSE:libavcodec =
> "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LG
>  LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
>  LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
>  LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> -LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
>  LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
>  LICENSE:libpostproc = "GPLv2+"
>  LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> @@ -26,7 +25,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>  SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
>
> file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
>             "
> -SRC_URI[sha256sum] =
> "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
> +SRC_URI[sha256sum] =
> "51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298"
>
>  # Build fails when thumb is enabled:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>  ARM_INSTRUCTION_SET:armv4 = "arm"
> @@ -41,7 +40,7 @@ DEPENDS = "nasm-native"
>
>  inherit autotools pkgconfig
>
> -PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale
> postproc avresample \
> +PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale
> postproc \
>                     alsa bzlib lzma pic pthreads shared theora zlib \
>                     ${@bb.utils.contains('AVAILTUNES', 'mips32r2',
> 'mips32r2', '', d)} \
>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv
> xcb', '', d)}"
> @@ -54,7 +53,6 @@ PACKAGECONFIG[avformat] =
> "--enable-avformat,--disable-avformat"
>  PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
>  PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
>  PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
> -PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
>
>  # features to support
>  PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
> @@ -153,7 +151,6 @@ PACKAGES =+ "libavcodec \
>               libavdevice \
>               libavfilter \
>               libavformat \
> -             libavresample \
>               libavutil \
>               libpostproc \
>               libswresample \
> @@ -163,7 +160,6 @@ FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
>  FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
>  FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
> -FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
>  FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
> @@ -175,7 +171,6 @@ INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
>  INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
>  INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
>  INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
> -INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
>  INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
>  INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
>  INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#160676):
> https://lists.openembedded.org/g/openembedded-core/message/160676
> Mute This Topic: https://lists.openembedded.org/mt/88516624/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Khem Raj Jan. 20, 2022, 8:15 p.m. UTC | #2
there are bunch of failures in meta-openembedded as well  see

https://errors.yoctoproject.org/Errors/Build/138784/

On Tue, Jan 18, 2022 at 12:48 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> This update breaks gst-libav, and I have a patch in the works that fixes that too :)
>
> Alex
>
> On Tue, 18 Jan 2022 at 19:50, Marek Vasut <marex@denx.de> wrote:
>>
>> Update ffmpeg to 5.0 , release notes and changelog below:
>> https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES
>> https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0
>>
>> The avresample has been removed before 5.0 release in ffmpeg commit
>> 420cedd497 ("libavresample: Remove deprecated library")
>>
>> The ffmpeg 5.0 might be an LTS release, see:
>> http://www.jbkempf.com/blog/post/2022/FFmpeg-5.0
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Alexander Kanavin <alex@linutronix.de>
>> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>>  .../ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}            | 9 ++-------
>>  1 file changed, 2 insertions(+), 7 deletions(-)
>>  rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb} (95%)
>>
>> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>> similarity index 95%
>> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>> index 3ba07c31d6..4ba5ff4537 100644
>> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>> @@ -11,7 +11,6 @@ LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LG
>>  LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>>  LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>>  LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>> -LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>>  LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>>  LICENSE:libpostproc = "GPLv2+"
>>  LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>> @@ -26,7 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>>  SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
>>             file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
>>             "
>> -SRC_URI[sha256sum] = "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
>> +SRC_URI[sha256sum] = "51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298"
>>
>>  # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>>  ARM_INSTRUCTION_SET:armv4 = "arm"
>> @@ -41,7 +40,7 @@ DEPENDS = "nasm-native"
>>
>>  inherit autotools pkgconfig
>>
>> -PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
>> +PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \
>>                     alsa bzlib lzma pic pthreads shared theora zlib \
>>                     ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
>>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
>> @@ -54,7 +53,6 @@ PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
>>  PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
>>  PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
>>  PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
>> -PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
>>
>>  # features to support
>>  PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
>> @@ -153,7 +151,6 @@ PACKAGES =+ "libavcodec \
>>               libavdevice \
>>               libavfilter \
>>               libavformat \
>> -             libavresample \
>>               libavutil \
>>               libpostproc \
>>               libswresample \
>> @@ -163,7 +160,6 @@ FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
>>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
>>  FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
>>  FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
>> -FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
>>  FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
>>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
>>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
>> @@ -175,7 +171,6 @@ INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
>>  INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
>>  INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
>>  INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
>> -INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
>>  INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
>>  INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
>>  INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
>> --
>> 2.34.1
>>
>>
>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#160678): https://lists.openembedded.org/g/openembedded-core/message/160678
> Mute This Topic: https://lists.openembedded.org/mt/88516624/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Marek Vasut Jan. 20, 2022, 8:28 p.m. UTC | #3
On 1/20/22 21:15, Khem Raj wrote:
> there are bunch of failures in meta-openembedded as well  see
> 
> https://errors.yoctoproject.org/Errors/Build/138784/

So, how shall we proceed here ?

I suspect Alex will send a patch for the problem detected in oe-core and 
then oe-core with ffmpeg 5.0 won't be broken anymore.

As for the rest of the recipes in meta-openembedded, they will likely be 
catching up to ffmpeg 5.0 over time, so we can either upgrade them, or 
patch them. I suspect the former is more favorable approach.

However, what is not clear to me is whether this breakage in 
meta-openembedded is a blocker for this patch to be applied to oe-core 
(with the fix from Alex), or not ?
Khem Raj Jan. 20, 2022, 8:33 p.m. UTC | #4
On Thu, Jan 20, 2022 at 12:28 PM Marek Vasut <marex@denx.de> wrote:
>
> On 1/20/22 21:15, Khem Raj wrote:
> > there are bunch of failures in meta-openembedded as well  see
> >
> > https://errors.yoctoproject.org/Errors/Build/138784/
>
> So, how shall we proceed here ?
>
> I suspect Alex will send a patch for the problem detected in oe-core and
> then oe-core with ffmpeg 5.0 won't be broken anymore.
>
> As for the rest of the recipes in meta-openembedded, they will likely be
> catching up to ffmpeg 5.0 over time, so we can either upgrade them, or
> patch them. I suspect the former is more favorable approach.

Someone needs to fix them.
as seen this is not a trivial amount of recipes to fix. Generally its cordial to
keep meta-openembedded working for extended testing and CI.

>
> However, what is not clear to me is whether this breakage in
> meta-openembedded is a blocker for this patch to be applied to oe-core
> (with the fix from Alex), or not ?
Alexander Kanavin Jan. 20, 2022, 8:47 p.m. UTC | #5
Not all of these are ffmpeg caused, e.g. picking a few random items shows
they are new meson issues:

https://errors.yoctoproject.org/Errors/Details/622936/
https://errors.yoctoproject.org/Errors/Details/622943/

I think we should also check whether something is abandonware, e.g.
minidlna had its last commit in Nov 2020.

Alex

On Thu, 20 Jan 2022 at 21:33, Khem Raj <raj.khem@gmail.com> wrote:

> On Thu, Jan 20, 2022 at 12:28 PM Marek Vasut <marex@denx.de> wrote:
> >
> > On 1/20/22 21:15, Khem Raj wrote:
> > > there are bunch of failures in meta-openembedded as well  see
> > >
> > > https://errors.yoctoproject.org/Errors/Build/138784/
> >
> > So, how shall we proceed here ?
> >
> > I suspect Alex will send a patch for the problem detected in oe-core and
> > then oe-core with ffmpeg 5.0 won't be broken anymore.
> >
> > As for the rest of the recipes in meta-openembedded, they will likely be
> > catching up to ffmpeg 5.0 over time, so we can either upgrade them, or
> > patch them. I suspect the former is more favorable approach.
>
> Someone needs to fix them.
> as seen this is not a trivial amount of recipes to fix. Generally its
> cordial to
> keep meta-openembedded working for extended testing and CI.
>
> >
> > However, what is not clear to me is whether this breakage in
> > meta-openembedded is a blocker for this patch to be applied to oe-core
> > (with the fix from Alex), or not ?
>
Alexander Kanavin Jan. 21, 2022, 7:35 p.m. UTC | #6
I'm working on these now.

Alex


On Thu, 20 Jan 2022 at 21:15, Khem Raj <raj.khem@gmail.com> wrote:

> there are bunch of failures in meta-openembedded as well  see
>
> https://errors.yoctoproject.org/Errors/Build/138784/
>
> On Tue, Jan 18, 2022 at 12:48 PM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > This update breaks gst-libav, and I have a patch in the works that fixes
> that too :)
> >
> > Alex
> >
> > On Tue, 18 Jan 2022 at 19:50, Marek Vasut <marex@denx.de> wrote:
> >>
> >> Update ffmpeg to 5.0 , release notes and changelog below:
> >>
> https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES
> >> https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0
> >>
> >> The avresample has been removed before 5.0 release in ffmpeg commit
> >> 420cedd497 ("libavresample: Remove deprecated library")
> >>
> >> The ffmpeg 5.0 might be an LTS release, see:
> >> http://www.jbkempf.com/blog/post/2022/FFmpeg-5.0
> >>
> >> Signed-off-by: Marek Vasut <marex@denx.de>
> >> Cc: Alexander Kanavin <alex@linutronix.de>
> >> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> >> ---
> >>  .../ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}            | 9 ++-------
> >>  1 file changed, 2 insertions(+), 7 deletions(-)
> >>  rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.4.1.bb =>
> ffmpeg_5.0.bb} (95%)
> >>
> >> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
> b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
> >> similarity index 95%
> >> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
> >> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
> >> index 3ba07c31d6..4ba5ff4537 100644
> >> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
> >> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
> >> @@ -11,7 +11,6 @@ LICENSE:libavcodec =
> "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LG
> >>  LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> >>  LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> >>  LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> >> -LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> >>  LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> >>  LICENSE:libpostproc = "GPLv2+"
> >>  LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
> 'GPLv2+', 'LGPLv2.1+', d)}"
> >> @@ -26,7 +25,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> >>  SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
> >>
>  file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
> >>             "
> >> -SRC_URI[sha256sum] =
> "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
> >> +SRC_URI[sha256sum] =
> "51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298"
> >>
> >>  # Build fails when thumb is enabled:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
> >>  ARM_INSTRUCTION_SET:armv4 = "arm"
> >> @@ -41,7 +40,7 @@ DEPENDS = "nasm-native"
> >>
> >>  inherit autotools pkgconfig
> >>
> >> -PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample
> swscale postproc avresample \
> >> +PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample
> swscale postproc \
> >>                     alsa bzlib lzma pic pthreads shared theora zlib \
> >>                     ${@bb.utils.contains('AVAILTUNES', 'mips32r2',
> 'mips32r2', '', d)} \
> >>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv
> xcb', '', d)}"
> >> @@ -54,7 +53,6 @@ PACKAGECONFIG[avformat] =
> "--enable-avformat,--disable-avformat"
> >>  PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
> >>  PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
> >>  PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
> >> -PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
> >>
> >>  # features to support
> >>  PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
> >> @@ -153,7 +151,6 @@ PACKAGES =+ "libavcodec \
> >>               libavdevice \
> >>               libavfilter \
> >>               libavformat \
> >> -             libavresample \
> >>               libavutil \
> >>               libpostproc \
> >>               libswresample \
> >> @@ -163,7 +160,6 @@ FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
> >>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
> >>  FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
> >>  FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
> >> -FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
> >>  FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
> >>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
> >>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
> >> @@ -175,7 +171,6 @@ INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
> >>  INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
> >>  INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
> >>  INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
> >> -INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
> >>  INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
> >>  INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
> >>  INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
> >> --
> >> 2.34.1
> >>
> >>
> >>
> >>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#160678):
> https://lists.openembedded.org/g/openembedded-core/message/160678
> > Mute This Topic: https://lists.openembedded.org/mt/88516624/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
Alexander Kanavin Jan. 21, 2022, 9:41 p.m. UTC | #7
I have now sent out the meson 0.61 fixes for meta-oe. They're all of the
same type, and could be done quickly.

The remaining failures from the list are:
- folks (not in meta-oe layers)
- minidlna, libvncserver, mpd, opencv (ffmpeg 5.0 api errors, each recipe
needs individual attention)

Alex

On Fri, 21 Jan 2022 at 20:35, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> I'm working on these now.
>
> Alex
>
>
> On Thu, 20 Jan 2022 at 21:15, Khem Raj <raj.khem@gmail.com> wrote:
>
>> there are bunch of failures in meta-openembedded as well  see
>>
>> https://errors.yoctoproject.org/Errors/Build/138784/
>>
>> On Tue, Jan 18, 2022 at 12:48 PM Alexander Kanavin
>> <alex.kanavin@gmail.com> wrote:
>> >
>> > This update breaks gst-libav, and I have a patch in the works that
>> fixes that too :)
>> >
>> > Alex
>> >
>> > On Tue, 18 Jan 2022 at 19:50, Marek Vasut <marex@denx.de> wrote:
>> >>
>> >> Update ffmpeg to 5.0 , release notes and changelog below:
>> >>
>> https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES
>> >> https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0
>> >>
>> >> The avresample has been removed before 5.0 release in ffmpeg commit
>> >> 420cedd497 ("libavresample: Remove deprecated library")
>> >>
>> >> The ffmpeg 5.0 might be an LTS release, see:
>> >> http://www.jbkempf.com/blog/post/2022/FFmpeg-5.0
>> >>
>> >> Signed-off-by: Marek Vasut <marex@denx.de>
>> >> Cc: Alexander Kanavin <alex@linutronix.de>
>> >> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
>> >> ---
>> >>  .../ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}            | 9
>> ++-------
>> >>  1 file changed, 2 insertions(+), 7 deletions(-)
>> >>  rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.4.1.bb =>
>> ffmpeg_5.0.bb} (95%)
>> >>
>> >> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>> b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>> >> similarity index 95%
>> >> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>> >> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>> >> index 3ba07c31d6..4ba5ff4537 100644
>> >> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>> >> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>> >> @@ -11,7 +11,6 @@ LICENSE:libavcodec =
>> "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LG
>> >>  LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>> 'GPLv2+', 'LGPLv2.1+', d)}"
>> >>  LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>> 'GPLv2+', 'LGPLv2.1+', d)}"
>> >>  LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>> 'GPLv2+', 'LGPLv2.1+', d)}"
>> >> -LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>> 'GPLv2+', 'LGPLv2.1+', d)}"
>> >>  LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>> 'GPLv2+', 'LGPLv2.1+', d)}"
>> >>  LICENSE:libpostproc = "GPLv2+"
>> >>  LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>> 'GPLv2+', 'LGPLv2.1+', d)}"
>> >> @@ -26,7 +25,7 @@ LIC_FILES_CHKSUM =
>> "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>> >>  SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
>> >>
>>  file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
>> >>             "
>> >> -SRC_URI[sha256sum] =
>> "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
>> >> +SRC_URI[sha256sum] =
>> "51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298"
>> >>
>> >>  # Build fails when thumb is enabled:
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>> >>  ARM_INSTRUCTION_SET:armv4 = "arm"
>> >> @@ -41,7 +40,7 @@ DEPENDS = "nasm-native"
>> >>
>> >>  inherit autotools pkgconfig
>> >>
>> >> -PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample
>> swscale postproc avresample \
>> >> +PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample
>> swscale postproc \
>> >>                     alsa bzlib lzma pic pthreads shared theora zlib \
>> >>                     ${@bb.utils.contains('AVAILTUNES', 'mips32r2',
>> 'mips32r2', '', d)} \
>> >>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv
>> xcb', '', d)}"
>> >> @@ -54,7 +53,6 @@ PACKAGECONFIG[avformat] =
>> "--enable-avformat,--disable-avformat"
>> >>  PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
>> >>  PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
>> >>  PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
>> >> -PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
>> >>
>> >>  # features to support
>> >>  PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
>> >> @@ -153,7 +151,6 @@ PACKAGES =+ "libavcodec \
>> >>               libavdevice \
>> >>               libavfilter \
>> >>               libavformat \
>> >> -             libavresample \
>> >>               libavutil \
>> >>               libpostproc \
>> >>               libswresample \
>> >> @@ -163,7 +160,6 @@ FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
>> >>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
>> >>  FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
>> >>  FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
>> >> -FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
>> >>  FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
>> >>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
>> >>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
>> >> @@ -175,7 +171,6 @@ INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
>> >>  INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
>> >>  INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
>> >>  INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
>> >> -INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
>> >>  INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
>> >>  INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
>> >>  INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
>> >> --
>> >> 2.34.1
>> >>
>> >>
>> >>
>> >>
>> >
>> >
>> >
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#160850):
> https://lists.openembedded.org/g/openembedded-core/message/160850
> Mute This Topic: https://lists.openembedded.org/mt/88516624/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Alexander Kanavin Jan. 22, 2022, 9:47 p.m. UTC | #8
I have sent additional patches for the four ffmpeg related issues.

Alex

On Fri, 21 Jan 2022 at 22:41, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> I have now sent out the meson 0.61 fixes for meta-oe. They're all of the
> same type, and could be done quickly.
>
> The remaining failures from the list are:
> - folks (not in meta-oe layers)
> - minidlna, libvncserver, mpd, opencv (ffmpeg 5.0 api errors, each recipe
> needs individual attention)
>
> Alex
>
> On Fri, 21 Jan 2022 at 20:35, Alexander Kanavin via lists.openembedded.org
> <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
>
>> I'm working on these now.
>>
>> Alex
>>
>>
>> On Thu, 20 Jan 2022 at 21:15, Khem Raj <raj.khem@gmail.com> wrote:
>>
>>> there are bunch of failures in meta-openembedded as well  see
>>>
>>> https://errors.yoctoproject.org/Errors/Build/138784/
>>>
>>> On Tue, Jan 18, 2022 at 12:48 PM Alexander Kanavin
>>> <alex.kanavin@gmail.com> wrote:
>>> >
>>> > This update breaks gst-libav, and I have a patch in the works that
>>> fixes that too :)
>>> >
>>> > Alex
>>> >
>>> > On Tue, 18 Jan 2022 at 19:50, Marek Vasut <marex@denx.de> wrote:
>>> >>
>>> >> Update ffmpeg to 5.0 , release notes and changelog below:
>>> >>
>>> https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES
>>> >> https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0
>>> >>
>>> >> The avresample has been removed before 5.0 release in ffmpeg commit
>>> >> 420cedd497 ("libavresample: Remove deprecated library")
>>> >>
>>> >> The ffmpeg 5.0 might be an LTS release, see:
>>> >> http://www.jbkempf.com/blog/post/2022/FFmpeg-5.0
>>> >>
>>> >> Signed-off-by: Marek Vasut <marex@denx.de>
>>> >> Cc: Alexander Kanavin <alex@linutronix.de>
>>> >> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> >> ---
>>> >>  .../ffmpeg/{ffmpeg_4.4.1.bb => ffmpeg_5.0.bb}            | 9
>>> ++-------
>>> >>  1 file changed, 2 insertions(+), 7 deletions(-)
>>> >>  rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.4.1.bb =>
>>> ffmpeg_5.0.bb} (95%)
>>> >>
>>> >> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>>> b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>>> >> similarity index 95%
>>> >> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>>> >> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>>> >> index 3ba07c31d6..4ba5ff4537 100644
>>> >> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
>>> >> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
>>> >> @@ -11,7 +11,6 @@ LICENSE:libavcodec =
>>> "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LG
>>> >>  LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>>> 'GPLv2+', 'LGPLv2.1+', d)}"
>>> >>  LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>>> 'GPLv2+', 'LGPLv2.1+', d)}"
>>> >>  LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>>> 'GPLv2+', 'LGPLv2.1+', d)}"
>>> >> -LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG',
>>> 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>>> >>  LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl',
>>> 'GPLv2+', 'LGPLv2.1+', d)}"
>>> >>  LICENSE:libpostproc = "GPLv2+"
>>> >>  LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG',
>>> 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
>>> >> @@ -26,7 +25,7 @@ LIC_FILES_CHKSUM =
>>> "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>>> >>  SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
>>> >>
>>>  file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
>>> >>             "
>>> >> -SRC_URI[sha256sum] =
>>> "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
>>> >> +SRC_URI[sha256sum] =
>>> "51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298"
>>> >>
>>> >>  # Build fails when thumb is enabled:
>>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
>>> >>  ARM_INSTRUCTION_SET:armv4 = "arm"
>>> >> @@ -41,7 +40,7 @@ DEPENDS = "nasm-native"
>>> >>
>>> >>  inherit autotools pkgconfig
>>> >>
>>> >> -PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample
>>> swscale postproc avresample \
>>> >> +PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample
>>> swscale postproc \
>>> >>                     alsa bzlib lzma pic pthreads shared theora zlib \
>>> >>                     ${@bb.utils.contains('AVAILTUNES', 'mips32r2',
>>> 'mips32r2', '', d)} \
>>> >>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11',
>>> 'xv xcb', '', d)}"
>>> >> @@ -54,7 +53,6 @@ PACKAGECONFIG[avformat] =
>>> "--enable-avformat,--disable-avformat"
>>> >>  PACKAGECONFIG[swresample] =
>>> "--enable-swresample,--disable-swresample"
>>> >>  PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
>>> >>  PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
>>> >> -PACKAGECONFIG[avresample] =
>>> "--enable-avresample,--disable-avresample"
>>> >>
>>> >>  # features to support
>>> >>  PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
>>> >> @@ -153,7 +151,6 @@ PACKAGES =+ "libavcodec \
>>> >>               libavdevice \
>>> >>               libavfilter \
>>> >>               libavformat \
>>> >> -             libavresample \
>>> >>               libavutil \
>>> >>               libpostproc \
>>> >>               libswresample \
>>> >> @@ -163,7 +160,6 @@ FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
>>> >>  FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
>>> >>  FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
>>> >>  FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
>>> >> -FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
>>> >>  FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
>>> >>  FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
>>> >>  FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
>>> >> @@ -175,7 +171,6 @@ INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
>>> >>  INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
>>> >>  INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
>>> >>  INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
>>> >> -INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
>>> >>  INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
>>> >>  INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
>>> >>  INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
>>> >> --
>>> >> 2.34.1
>>> >>
>>> >>
>>> >>
>>> >>
>>> >
>>> >
>>> >
>>>
>>
>>
>>
>>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#160851):
> https://lists.openembedded.org/g/openembedded-core/message/160851
> Mute This Topic: https://lists.openembedded.org/mt/88516624/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Patch

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
similarity index 95%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
index 3ba07c31d6..4ba5ff4537 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb
@@ -11,7 +11,6 @@  LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LG
 LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
 LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
 LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
-LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
 LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
 LICENSE:libpostproc = "GPLv2+"
 LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
@@ -26,7 +25,7 @@  LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
            "
-SRC_URI[sha256sum] = "eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
+SRC_URI[sha256sum] = "51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET:armv4 = "arm"
@@ -41,7 +40,7 @@  DEPENDS = "nasm-native"
 
 inherit autotools pkgconfig
 
-PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
+PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \
                    alsa bzlib lzma pic pthreads shared theora zlib \
                    ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
@@ -54,7 +53,6 @@  PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
 PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
 PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
 PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
-PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
 
 # features to support
 PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
@@ -153,7 +151,6 @@  PACKAGES =+ "libavcodec \
              libavdevice \
              libavfilter \
              libavformat \
-             libavresample \
              libavutil \
              libpostproc \
              libswresample \
@@ -163,7 +160,6 @@  FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
 FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
 FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
 FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
-FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
 FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
 FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
 FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
@@ -175,7 +171,6 @@  INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
 INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
 INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
 INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
-INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
 INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
 INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
 INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"