On Wed, May 5, 2021 at 8:20 AM Alexander Kanavin <[email protected]> wrote: > > Drop mips64_cpu_detection.patch as upstream > has changed the code in a way that's difficult > to rebase. >
Trevor was working on it and he has being trying to fix it for mips case as well. So lets leave this to him > Signed-off-by: Alexander Kanavin <[email protected]> > --- > .../ffmpeg/ffmpeg/mips64_cpu_detection.patch | 32 ------------------- > .../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} | 3 +- > 2 files changed, 1 insertion(+), 34 deletions(-) > delete mode 100644 > meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch > rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} > (98%) > > diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch > b/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch > deleted file mode 100644 > index 69429af8f0..0000000000 > --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -It will add -mips64r6 and -mips64r2 to cmdline which will > -cause conflicts > - > -in OE we user mips32r2 and mips64r2 for mips arch versions > -so there is no benefit of detecting it automatically by > -poking at tools especially in cross env > - > -Fixes errors like > - > -linking -mnan=2008 module with previous -mnan=legacy modules > -failed to merge target specific data of file > - > --Khem > -Upstream-Status: Inappropriate [OE-Specific] > - > -Index: ffmpeg-3.1.1/configure > -=================================================================== > ---- ffmpeg-3.1.1.orig/configure > -+++ ffmpeg-3.1.1/configure > -@@ -5220,12 +5220,9 @@ elif enabled mips; then > - > - # Enable minimum ISA based on selected options > - if enabled mips64; then > -- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, > $0, 1"' '-mips64r6' > - enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, > 0, 1"' '-mips64r2' > - disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags > mips64r1 '"daddi $0, $0, 0"' '-mips64' > - else > -- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, > 0"' '-mips32r6' > -- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' > '-mips32r5' > - enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, > 0, 1"' '-mips32r2' > - disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && > check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' > - fi > diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb > b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb > similarity index 98% > rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb > rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb > index 08be38ca50..19a8e58370 100644 > --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb > +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb > @@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = > "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" > > SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ > - file://mips64_cpu_detection.patch \ > > file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ > " > -SRC_URI[sha256sum] = > "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb" > +SRC_URI[sha256sum] = > "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909" > > # Build fails when thumb is enabled: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 > ARM_INSTRUCTION_SET_armv4 = "arm" > -- > 2.31.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151338): https://lists.openembedded.org/g/openembedded-core/message/151338 Mute This Topic: https://lists.openembedded.org/mt/82607035/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
