mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 15:49:36 +02:00
ffmpeg: update 7.1.1 -> 8.0
libpostproc removed upstream. License-update: formatting. (From OE-Core rev: 4ab049c30ca125f19b7547e627251a2dafbebee7) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9061704a74
commit
3174e5864d
@@ -12,19 +12,19 @@ LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-
|
|||||||
LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
LICENSE:libpostproc = "GPL-2.0-or-later"
|
|
||||||
LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
LICENSE_FLAGS = "commercial"
|
LICENSE_FLAGS = "commercial"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||||
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
|
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||||
file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
|
file://COPYING.LGPLv2.1;md5=eed22b3456132611e3d4aa7a7ec64dac \
|
||||||
file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
|
file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
|
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1"
|
SRC_URI[sha256sum] = "b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e"
|
||||||
|
|
||||||
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
|
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
|
||||||
ARM_INSTRUCTION_SET:armv4 = "arm"
|
ARM_INSTRUCTION_SET:armv4 = "arm"
|
||||||
@@ -32,15 +32,14 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
|
|||||||
ARM_INSTRUCTION_SET:armv6 = "arm"
|
ARM_INSTRUCTION_SET:armv6 = "arm"
|
||||||
|
|
||||||
# Should be API compatible with libav (which was a fork of ffmpeg)
|
# Should be API compatible with libav (which was a fork of ffmpeg)
|
||||||
# libpostproc was previously packaged from a separate recipe
|
PROVIDES = "libav"
|
||||||
PROVIDES = "libav libpostproc"
|
|
||||||
|
|
||||||
DEPENDS:append:x86 = " nasm-native"
|
DEPENDS:append:x86 = " nasm-native"
|
||||||
DEPENDS:append:x86-64 = " nasm-native"
|
DEPENDS:append:x86-64 = " nasm-native"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \
|
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale \
|
||||||
alsa bzlib lzma theora zlib \
|
alsa bzlib lzma theora zlib \
|
||||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
|
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
|
||||||
|
|
||||||
@@ -51,7 +50,6 @@ PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec"
|
|||||||
PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
|
PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
|
||||||
PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
|
PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
|
||||||
PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
|
PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
|
||||||
PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
|
|
||||||
|
|
||||||
# features to support
|
# features to support
|
||||||
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
|
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
|
||||||
@@ -154,7 +152,6 @@ PACKAGES =+ "libavcodec \
|
|||||||
libavfilter \
|
libavfilter \
|
||||||
libavformat \
|
libavformat \
|
||||||
libavutil \
|
libavutil \
|
||||||
libpostproc \
|
|
||||||
libswresample \
|
libswresample \
|
||||||
libswscale \
|
libswscale \
|
||||||
${PN}-examples"
|
${PN}-examples"
|
||||||
@@ -164,7 +161,6 @@ FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
|
|||||||
FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
|
FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
|
||||||
FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
|
FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
|
||||||
FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
|
FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
|
||||||
FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
|
|
||||||
FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
|
FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
|
||||||
FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
|
FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
|
||||||
FILES:${PN}-examples = "${datadir}/${BPN}/examples"
|
FILES:${PN}-examples = "${datadir}/${BPN}/examples"
|
||||||
Reference in New Issue
Block a user