Ticket #22282: libaom-3.13.1-nasm3-1.patch

File libaom-3.13.1-nasm3-1.patch, 743 bytes (added by zeckma, 12 months ago)

Fixes libaom configuration with nasm-3.01

  • build/cmake/aom_optimization.cmake 

    diff -Naur libaom-3.13.1/build/cmake/aom_optimization.cmake libaom-3.13.1.mod/build/cmake/aom_optimization.cmake
    old new  
    213213# the -Ox argument (multipass optimization).
    214214function(test_nasm)
    215215  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
    216                   OUTPUT_VARIABLE nasm_helptext)
     216                  OUTPUT_VARIABLE nasm_hf)
     217  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO
     218                  OUTPUT_VARIABLE nasm_ho)
     219  set(nasm_helptext "${nasm_hf};${nasm_ho}")
    217220
    218221  if(NOT "${nasm_helptext}" MATCHES "-Ox")
    219222    message(