summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-multimedia/ffmpeg
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb72
1 files changed, 36 insertions, 36 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
index 02af257d0f..89c75f4250 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
@@ -6,16 +6,16 @@ HOMEPAGE = "https://www.ffmpeg.org/"
6SECTION = "libs" 6SECTION = "libs"
7 7
8LICENSE = "BSD & GPLv2+ & LGPLv2.1+ & MIT" 8LICENSE = "BSD & GPLv2+ & LGPLv2.1+ & MIT"
9LICENSE_${PN} = "GPLv2+" 9LICENSE:${PN} = "GPLv2+"
10LICENSE_libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 10LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
11LICENSE_libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 11LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
12LICENSE_libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 12LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
13LICENSE_libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 13LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
14LICENSE_libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 14LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
15LICENSE_libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 15LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
16LICENSE_libpostproc = "GPLv2+" 16LICENSE:libpostproc = "GPLv2+"
17LICENSE_libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 17LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
18LICENSE_libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" 18LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}"
19LICENSE_FLAGS = "commercial" 19LICENSE_FLAGS = "commercial"
20 20
21LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 21LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -35,9 +35,9 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
35SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909" 35SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
36 36
37# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 37# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
38ARM_INSTRUCTION_SET_armv4 = "arm" 38ARM_INSTRUCTION_SET:armv4 = "arm"
39ARM_INSTRUCTION_SET_armv5 = "arm" 39ARM_INSTRUCTION_SET:armv5 = "arm"
40ARM_INSTRUCTION_SET_armv6 = "arm" 40ARM_INSTRUCTION_SET:armv6 = "arm"
41 41
42# Should be API compatible with libav (which was a fork of ffmpeg) 42# Should be API compatible with libav (which was a fork of ffmpeg)
43# libpostproc was previously packaged from a separate recipe 43# libpostproc was previously packaged from a separate recipe
@@ -127,20 +127,20 @@ EXTRA_OECONF = " \
127 --pkg-config=pkg-config \ 127 --pkg-config=pkg-config \
128" 128"
129 129
130EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" 130EXTRA_OECONF:append:linux-gnux32 = " --disable-asm"
131 131
132EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" 132EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
133EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" 133EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}"
134EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" 134EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', '--disable-mips64r6 --disable-mips32r6', '', d)}"
135EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" 135EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
136EXTRA_OECONF_append_mips = " --extra-libs=-latomic --disable-mips32r5 --disable-mipsdsp --disable-mipsdspr2 \ 136EXTRA_OECONF:append:mips = " --extra-libs=-latomic --disable-mips32r5 --disable-mipsdsp --disable-mipsdspr2 \
137 --disable-loongson2 --disable-loongson3 --disable-mmi --disable-msa --disable-msa2" 137 --disable-loongson2 --disable-loongson3 --disable-mmi --disable-msa --disable-msa2"
138EXTRA_OECONF_append_riscv32 = " --extra-libs=-latomic" 138EXTRA_OECONF:append:riscv32 = " --extra-libs=-latomic"
139 139
140# gold crashes on x86, another solution is to --disable-asm but thats more hacky 140# gold crashes on x86, another solution is to --disable-asm but thats more hacky
141# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684 141# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
142 142
143LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 143LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
144 144
145EXTRA_OEMAKE = "V=1" 145EXTRA_OEMAKE = "V=1"
146 146
@@ -149,7 +149,7 @@ do_configure() {
149} 149}
150 150
151# patch out build host paths for reproducibility 151# patch out build host paths for reproducibility
152do_compile_prepend_class-target() { 152do_compile:prepend:class-target() {
153 sed -i -e "s,${WORKDIR},,g" ${B}/config.h 153 sed -i -e "s,${WORKDIR},,g" ${B}/config.h
154} 154}
155 155
@@ -163,23 +163,23 @@ PACKAGES =+ "libavcodec \
163 libswresample \ 163 libswresample \
164 libswscale" 164 libswscale"
165 165
166FILES_libavcodec = "${libdir}/libavcodec${SOLIBS}" 166FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
167FILES_libavdevice = "${libdir}/libavdevice${SOLIBS}" 167FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
168FILES_libavfilter = "${libdir}/libavfilter${SOLIBS}" 168FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
169FILES_libavformat = "${libdir}/libavformat${SOLIBS}" 169FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
170FILES_libavresample = "${libdir}/libavresample${SOLIBS}" 170FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
171FILES_libavutil = "${libdir}/libavutil${SOLIBS}" 171FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
172FILES_libpostproc = "${libdir}/libpostproc${SOLIBS}" 172FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
173FILES_libswresample = "${libdir}/libswresample${SOLIBS}" 173FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
174FILES_libswscale = "${libdir}/libswscale${SOLIBS}" 174FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
175 175
176# ffmpeg disables PIC on some platforms (e.g. x86-32) 176# ffmpeg disables PIC on some platforms (e.g. x86-32)
177INSANE_SKIP_${MLPREFIX}libavcodec = "textrel" 177INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
178INSANE_SKIP_${MLPREFIX}libavdevice = "textrel" 178INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
179INSANE_SKIP_${MLPREFIX}libavfilter = "textrel" 179INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
180INSANE_SKIP_${MLPREFIX}libavformat = "textrel" 180INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
181INSANE_SKIP_${MLPREFIX}libavutil = "textrel" 181INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
182INSANE_SKIP_${MLPREFIX}libavresample = "textrel" 182INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
183INSANE_SKIP_${MLPREFIX}libswscale = "textrel" 183INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
184INSANE_SKIP_${MLPREFIX}libswresample = "textrel" 184INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
185INSANE_SKIP_${MLPREFIX}libpostproc = "textrel" 185INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"