History

configure: drop yasm support

We started defauling to nasm 8 years ago. We are still compatible with yasm 0.8.0, released in 2009. **15 years ago**. The time has more than come to remove support for it. Maintaining compatibility started cutting into writing new code long ago. We still can't have 2-argument instructions, preprocessor booleans, and all AVX2 code must still be wrapped in ifdefs. Newly added code often breaks this.

Lynne committed 2 years ago

Commit 2f888fb1 parent 73d2cb15 files · +8 −24Browse files

Unified · Split

5 files
  1. Changelog +1 −0
  2. configure +2 −19
  3. doc/developer.texi +1 −1
  4. doc/optimization.txt +2 −2
  5. doc/platform.texi +2 −2
Changelog+1−0
@@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, · 1 unmodified line
2releases are sorted from youngest to oldest.2releases are sorted from youngest to oldest.
3 3
4version <next>:4version <next>:
5- yasm support dropped, users need to use nasm
5 6
6version 7.1:7version 7.1:
7- Raw Captions with Time (RCWT) closed caption demuxer8- Raw Captions with Time (RCWT) closed caption demuxer
configure+2−19
@@ -4415,16 +4415,6 @@ for opt do · 4414 unmodified lines
4415 test $action = enable && warn_if_gets_disabled $list4415 test $action = enable && warn_if_gets_disabled $list
4416 $action $list4416 $action $list
4417 ;;4417 ;;
4418 --enable-yasm|--disable-yasm)
4419 warn "The ${opt} option is only provided for compatibility and will be\n"\
4420 "removed in the future. Use --enable-x86asm / --disable-x86asm instead."
4421 test $opt = --enable-yasm && x86asm=yes || x86asm=no
4422 ;;
4423 --yasmexe=*)
4424 warn "The --yasmexe option is only provided for compatibility and will be\n"\
4425 "removed in the future. Use --x86asmexe instead."
4426 x86asmexe="$optval"
4427 ;;
4428 --enable-?*|--disable-?*)4418 --enable-?*|--disable-?*)
4429 eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')4419 eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
4430 if is_in $option $COMPONENT_LIST; then4420 if is_in $option $COMPONENT_LIST; then
@@ -6445,26 +6435,19 @@ EOF · 2014 unmodified lines
6445 x86asmexe_probe=$16435 x86asmexe_probe=$1
6446 if test_cmd $x86asmexe_probe -v; then6436 if test_cmd $x86asmexe_probe -v; then
6447 x86asmexe=$x86asmexe_probe6437 x86asmexe=$x86asmexe_probe
6448 x86asm_type=nasm
6449 x86asm_debug="-g -F dwarf"6438 x86asm_debug="-g -F dwarf"
6450 X86ASMDEP=6439 X86ASMDEP=
6451 X86ASM_DEPFLAGS='-MD $(@:.o=.d)'6440 X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
6452 elif test_cmd $x86asmexe_probe --version; then
6453 x86asmexe=$x86asmexe_probe
6454 x86asm_type=yasm
6455 x86asm_debug="-g dwarf2"
6456 X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
6457 X86ASM_DEPFLAGS=
6458 fi6441 fi
6459 check_x86asm x86asm "movbe ecx, [5]"6442 check_x86asm x86asm "movbe ecx, [5]"
6460 }6443 }
6461 6444
6462 if ! disabled_any asm mmx x86asm; then6445 if ! disabled_any asm mmx x86asm; then
6463 disable x86asm6446 disable x86asm
6464 for program in $x86asmexe nasm yasm; do6447 for program in $x86asmexe nasm; do
6465 probe_x86asm $program && break6448 probe_x86asm $program && break
6466 done6449 done
6467 disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build."6450 disabled x86asm && die "nasm not found or too old. Use --disable-x86asm for a crippled build."
6468 X86ASMFLAGS="-f $objformat"6451 X86ASMFLAGS="-f $objformat"
6469 test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"6452 test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"
6470 case "$objformat" in6453 case "$objformat" in
doc/developer.texi+1−1
@@ -825,7 +825,7 @@ filters, bitstream filters, parsers. If its not possible to do that, add · 824 unmodified lines
825an explanation why to your patchset, its ok to not test if theres a reason.825an explanation why to your patchset, its ok to not test if theres a reason.
826 826
827@item827@item
828If you added YASM code please check that things still work with --disable-yasm.828If you added NASM code please check that things still work with --disable-x86asm.
829 829
830@item830@item
831Test your code with valgrind and or Address Sanitizer to ensure it's free831Test your code with valgrind and or Address Sanitizer to ensure it's free
doc/optimization.txt+2−2
@@ -188,7 +188,7 @@ Code that depends on data in registries being untouched, should be written as · 187 unmodified lines
188a single __asm__() statement. Ideally, a single function contains only one188a single __asm__() statement. Ideally, a single function contains only one
189__asm__() block.189__asm__() block.
190 190
191Use external asm (nasm/yasm) or inline asm (__asm__()), do not use intrinsics.191Use external asm (nasm) or inline asm (__asm__()), do not use intrinsics.
192The latter requires a good optimizing compiler which gcc is not.192The latter requires a good optimizing compiler which gcc is not.
193 193
194When debugging a x86 external asm compilation issue, if lost in the macro194When debugging a x86 external asm compilation issue, if lost in the macro
@@ -199,7 +199,7 @@ actual lines causing issues. · 4 unmodified lines
199Inline asm vs. external asm199Inline asm vs. external asm
200---------------------------200---------------------------
201Both inline asm (__asm__("..") in a .c file, handled by a compiler such as gcc)201Both inline asm (__asm__("..") in a .c file, handled by a compiler such as gcc)
202and external asm (.s or .asm files, handled by an assembler such as nasm/yasm)202and external asm (.s or .asm files, handled by an assembler such as nasm)
203are accepted in FFmpeg. Which one to use differs per specific case.203are accepted in FFmpeg. Which one to use differs per specific case.
204 204
205- if your code is intended to be inlined in a C function, inline asm is always205- if your code is intended to be inlined in a C function, inline asm is always
doc/platform.texi+2−2
@@ -158,7 +158,7 @@ You will need the following prerequisites: · 157 unmodified lines
158To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from158To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from
159the Visual Studio or Intel Compiler command prompt.159the Visual Studio or Intel Compiler command prompt.
160 160
161Place @code{yasm.exe} somewhere in your @code{PATH}.161Place @code{nasm.exe} somewhere in your @code{PATH}.
162 162
163Next, make sure any other headers and libs you want to use, such as zlib, are163Next, make sure any other headers and libs you want to use, such as zlib, are
164located in a spot that the compiler can see. Do so by modifying the @code{LIB}164located in a spot that the compiler can see. Do so by modifying the @code{LIB}
@@ -301,7 +301,7 @@ These library packages are only available from · 136 unmodified lines
301@uref{http://sourceware.org/cygwinports/, Cygwin Ports}:301@uref{http://sourceware.org/cygwinports/, Cygwin Ports}:
302 302
303@example303@example
304yasm, libSDL-devel, libgsm-devel, libmp3lame-devel,304libSDL-devel, libgsm-devel, libmp3lame-devel,
305speex-devel, libtheora-devel, libxvidcore-devel305speex-devel, libtheora-devel, libxvidcore-devel
306@end example306@end example
307 307

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t