diff options
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch | 21 | ||||
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb) | 9 |
2 files changed, 20 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch index 2b4ca0e9b9..7d0a06f85b 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch @@ -1,4 +1,4 @@ -From 24a58d70cbb3997e471366bd5afe54be9007bfb1 Mon Sep 17 00:00:00 2001 +From 4a891e1eddbf63f32fe769b5bff289f6748abf45 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 10 Nov 2020 15:32:14 +0000 Subject: [PATCH] libavutil: include assembly with full path from source root @@ -6,8 +6,9 @@ Subject: [PATCH] libavutil: include assembly with full path from source root Otherwise nasm writes the full host-specific paths into .o output, which breaks binary reproducibility. -Upstream-Status: Submitted [by email to jamrial@gmail.com,ffmpeg-devel@ffmpeg.org] +Upstream-Status: Submitted [http://ffmpeg.org/pipermail/ffmpeg-devel/2022-January/291781.html] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- libavutil/x86/cpuid.asm | 2 +- libavutil/x86/emms.asm | 2 +- @@ -15,7 +16,8 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> libavutil/x86/float_dsp.asm | 2 +- libavutil/x86/lls.asm | 2 +- libavutil/x86/pixelutils.asm | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) + libavutil/x86/tx_float.asm | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm index c3f7866..766f77f 100644 @@ -95,3 +97,16 @@ index 36c57c5..8b45ead 100644 SECTION .text +diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm +index 4d2283f..ea39f21 100644 +--- a/libavutil/x86/tx_float.asm ++++ b/libavutil/x86/tx_float.asm +@@ -29,7 +29,7 @@ + ; replace some shuffles with vblends? + ; avx512 split-radix + +-%include "x86util.asm" ++%include "libavutil/x86/x86util.asm" + + %if ARCH_X86_64 + %define ptr resq diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.1.bb b/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" |