diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-multimedia/ffmpeg | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-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.bb | 72 |
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/" | |||
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | 7 | ||
8 | LICENSE = "BSD & GPLv2+ & LGPLv2.1+ & MIT" | 8 | LICENSE = "BSD & GPLv2+ & LGPLv2.1+ & MIT" |
9 | LICENSE_${PN} = "GPLv2+" | 9 | LICENSE:${PN} = "GPLv2+" |
10 | LICENSE_libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 10 | LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
11 | LICENSE_libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 11 | LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
12 | LICENSE_libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 12 | LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
13 | LICENSE_libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 13 | LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
14 | LICENSE_libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 14 | LICENSE:libavresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
15 | LICENSE_libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 15 | LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
16 | LICENSE_libpostproc = "GPLv2+" | 16 | LICENSE:libpostproc = "GPLv2+" |
17 | LICENSE_libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 17 | LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
18 | LICENSE_libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" | 18 | LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPLv2+', 'LGPLv2.1+', d)}" |
19 | LICENSE_FLAGS = "commercial" | 19 | LICENSE_FLAGS = "commercial" |
20 | 20 | ||
21 | LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 21 | LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
@@ -35,9 +35,9 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ | |||
35 | SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909" | 35 | SRC_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 |
38 | ARM_INSTRUCTION_SET_armv4 = "arm" | 38 | ARM_INSTRUCTION_SET:armv4 = "arm" |
39 | ARM_INSTRUCTION_SET_armv5 = "arm" | 39 | ARM_INSTRUCTION_SET:armv5 = "arm" |
40 | ARM_INSTRUCTION_SET_armv6 = "arm" | 40 | ARM_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 | ||
130 | EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" | 130 | EXTRA_OECONF:append:linux-gnux32 = " --disable-asm" |
131 | 131 | ||
132 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" | 132 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" |
133 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" | 133 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" |
134 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" | 134 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" |
135 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" | 135 | EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" |
136 | EXTRA_OECONF_append_mips = " --extra-libs=-latomic --disable-mips32r5 --disable-mipsdsp --disable-mipsdspr2 \ | 136 | EXTRA_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" |
138 | EXTRA_OECONF_append_riscv32 = " --extra-libs=-latomic" | 138 | EXTRA_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 | ||
143 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 143 | LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
144 | 144 | ||
145 | EXTRA_OEMAKE = "V=1" | 145 | EXTRA_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 |
152 | do_compile_prepend_class-target() { | 152 | do_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 | ||
166 | FILES_libavcodec = "${libdir}/libavcodec${SOLIBS}" | 166 | FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}" |
167 | FILES_libavdevice = "${libdir}/libavdevice${SOLIBS}" | 167 | FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}" |
168 | FILES_libavfilter = "${libdir}/libavfilter${SOLIBS}" | 168 | FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}" |
169 | FILES_libavformat = "${libdir}/libavformat${SOLIBS}" | 169 | FILES:libavformat = "${libdir}/libavformat${SOLIBS}" |
170 | FILES_libavresample = "${libdir}/libavresample${SOLIBS}" | 170 | FILES:libavresample = "${libdir}/libavresample${SOLIBS}" |
171 | FILES_libavutil = "${libdir}/libavutil${SOLIBS}" | 171 | FILES:libavutil = "${libdir}/libavutil${SOLIBS}" |
172 | FILES_libpostproc = "${libdir}/libpostproc${SOLIBS}" | 172 | FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}" |
173 | FILES_libswresample = "${libdir}/libswresample${SOLIBS}" | 173 | FILES:libswresample = "${libdir}/libswresample${SOLIBS}" |
174 | FILES_libswscale = "${libdir}/libswscale${SOLIBS}" | 174 | FILES: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) |
177 | INSANE_SKIP_${MLPREFIX}libavcodec = "textrel" | 177 | INSANE_SKIP:${MLPREFIX}libavcodec = "textrel" |
178 | INSANE_SKIP_${MLPREFIX}libavdevice = "textrel" | 178 | INSANE_SKIP:${MLPREFIX}libavdevice = "textrel" |
179 | INSANE_SKIP_${MLPREFIX}libavfilter = "textrel" | 179 | INSANE_SKIP:${MLPREFIX}libavfilter = "textrel" |
180 | INSANE_SKIP_${MLPREFIX}libavformat = "textrel" | 180 | INSANE_SKIP:${MLPREFIX}libavformat = "textrel" |
181 | INSANE_SKIP_${MLPREFIX}libavutil = "textrel" | 181 | INSANE_SKIP:${MLPREFIX}libavutil = "textrel" |
182 | INSANE_SKIP_${MLPREFIX}libavresample = "textrel" | 182 | INSANE_SKIP:${MLPREFIX}libavresample = "textrel" |
183 | INSANE_SKIP_${MLPREFIX}libswscale = "textrel" | 183 | INSANE_SKIP:${MLPREFIX}libswscale = "textrel" |
184 | INSANE_SKIP_${MLPREFIX}libswresample = "textrel" | 184 | INSANE_SKIP:${MLPREFIX}libswresample = "textrel" |
185 | INSANE_SKIP_${MLPREFIX}libpostproc = "textrel" | 185 | INSANE_SKIP:${MLPREFIX}libpostproc = "textrel" |