summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb)16
1 files changed, 6 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb
index 5a86ad563f..ecaced7690 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb
@@ -12,19 +12,19 @@ LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-
12LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}" 12LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
13LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}" 13LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
14LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}" 14LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
15LICENSE:libpostproc = "GPL-2.0-or-later"
16LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}" 15LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
17LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}" 16LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
18LICENSE_FLAGS = "commercial" 17LICENSE_FLAGS = "commercial"
19 18
20LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 19LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
21 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ 20 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
22 file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ 21 file://COPYING.LGPLv2.1;md5=eed22b3456132611e3d4aa7a7ec64dac \
23 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 22 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
23 "
24 24
25SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" 25SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
26 26
27SRC_URI[sha256sum] = "733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1" 27SRC_URI[sha256sum] = "b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e"
28 28
29# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 29# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
30ARM_INSTRUCTION_SET:armv4 = "arm" 30ARM_INSTRUCTION_SET:armv4 = "arm"
@@ -32,15 +32,14 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
32ARM_INSTRUCTION_SET:armv6 = "arm" 32ARM_INSTRUCTION_SET:armv6 = "arm"
33 33
34# Should be API compatible with libav (which was a fork of ffmpeg) 34# Should be API compatible with libav (which was a fork of ffmpeg)
35# libpostproc was previously packaged from a separate recipe 35PROVIDES = "libav"
36PROVIDES = "libav libpostproc"
37 36
38DEPENDS:append:x86 = " nasm-native" 37DEPENDS:append:x86 = " nasm-native"
39DEPENDS:append:x86-64 = " nasm-native" 38DEPENDS:append:x86-64 = " nasm-native"
40 39
41inherit autotools pkgconfig 40inherit autotools pkgconfig
42 41
43PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \ 42PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale \
44 alsa bzlib lzma theora zlib \ 43 alsa bzlib lzma theora zlib \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" 44 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
46 45
@@ -51,7 +50,6 @@ PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec"
51PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat" 50PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
52PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample" 51PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
53PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale" 52PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
54PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
55 53
56# features to support 54# features to support
57PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 55PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
@@ -154,7 +152,6 @@ PACKAGES =+ "libavcodec \
154 libavfilter \ 152 libavfilter \
155 libavformat \ 153 libavformat \
156 libavutil \ 154 libavutil \
157 libpostproc \
158 libswresample \ 155 libswresample \
159 libswscale \ 156 libswscale \
160 ${PN}-examples" 157 ${PN}-examples"
@@ -164,7 +161,6 @@ FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
164FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}" 161FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
165FILES:libavformat = "${libdir}/libavformat${SOLIBS}" 162FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
166FILES:libavutil = "${libdir}/libavutil${SOLIBS}" 163FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
167FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
168FILES:libswresample = "${libdir}/libswresample${SOLIBS}" 164FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
169FILES:libswscale = "${libdir}/libswscale${SOLIBS}" 165FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
170FILES:${PN}-examples = "${datadir}/${BPN}/examples" 166FILES:${PN}-examples = "${datadir}/${BPN}/examples"