configure: testcard-extras - move to testcard2

The sdl_mixer audio capture has gone and there remains just TTF, which
can be considered as an optional feature for testcard2.

.github/scripts/environment.sh

@@ -72,7 +72,7 @@ export FEATURES="\
  --enable-speexdsp\
  --enable-swmix\
  --enable-libswscale\
- --enable-testcard-extras=all\
+ --enable-testcard2=ttf\
  --enable-text\
  --enable-video-mixer\
  --enable-vulkan\

configure.ac

@@ -1740,59 +1740,59 @@ ENSURE_FEATURE_PRESENT([$blank_req], [$blank], [Blank dep not found (libswscale)
 # -------------------------------------------------------------------------------------------------
 # Testcard stuff
 # -------------------------------------------------------------------------------------------------
-AC_ARG_ENABLE(testcard-extras,
-      AS_HELP_STRING([--enable-testcard-extras[=ttf|all]], [enable testcard addons - audio and testcard2 (default is auto)]
+AC_ARG_ENABLE(testcard2,
+      AS_HELP_STRING([--enable-testcard2@<:@=@<:@no@:>@ttf@:>@], [enable testcard2 (default is auto)]
       [This includes testcard2 (optionally with TTF).]
-      [Requires: SDL(2)_ttf (optional)]),
-    [testcard_extras_req=$enableval],
-    [testcard_extras_req=$build_default]
+      [Requires: SDL_ttf (optional)]),
+    [testcard2_req=$enableval],
+    [testcard2_req=$build_default]
     )
 
 FOUND_SDL_TTF=no
-testcard2_req=auto
-testcard_sdl_ttf_req=auto
-
 testcard2=no
-testcard_sdl_ttf=no
+testcard2_sdl_ttf_req=auto
 
-if test $testcard_extras_req = "no"; then
-        testcard2_req=no
-        testcard_sdl2_ttf_req=no
-fi
-if test $testcard_extras_req = "yes"; then
-        testcard2_req=yes
-fi
-if expr "x$testcard_extras_req" : 'x.*all' >/dev/null; then
-        testcard_sdl_ttf_req=yes
-fi
-if expr "x$testcard_extras_req" : 'x.*ttf' >/dev/null; then
-        testcard_sdl_ttf_req=yes
-fi
+case "${testcard2_req?}" in
+        auto|no|yes)
+                ;;
+        ttf)
+                testcard2_req=yes
+                testcard2_sdl_ttf_req=yes
+                ;;
+        nottf)
+                testcard2_req=yes
+                testcard2_sdl_ttf_req=no
+                ;;
+        *)
+                AC_MSG_ERROR([Wrong option for testcard2 $testcard2_req!]);
+                ;;
+esac
 
 if test $testcard2_req != no
 then
         TESTCARD2_OBJ="src/video_capture/testcard2.o"
-        if test "$sdl_version" -lt 3; then
-                PKG_CHECK_MODULES([SDL_TTF], [SDL${sdl_ver_suffix}_ttf],
-                                  [FOUND_SDL_TTF=yes], [FOUND_SDL_TTF=no])
-        else
-                PKG_CHECK_MODULES([SDL_TTF], [sdl${sdl_ver_suffix}-ttf],
-                                  [FOUND_SDL_TTF=yes], [FOUND_SDL_TTF=no])
+        if test "${testcard2_sdl_ttf_req?}" != no; then
+                if test "${sdl_version?}" -lt 3; then
+                        PKG_CHECK_MODULES([SDL_TTF], [SDL${sdl_ver_suffix}_ttf],
+                                          [FOUND_SDL_TTF=yes], [FOUND_SDL_TTF=no])
+                else
+                        PKG_CHECK_MODULES([SDL_TTF], [sdl${sdl_ver_suffix}-ttf],
+                                          [FOUND_SDL_TTF=yes], [FOUND_SDL_TTF=no])
+                fi
+                SDL_TTF_LIBS=$(remove_mwindows "${SDL_TTF_LIBS?}")
+                if test "${FOUND_SDL_TTF?}" = yes
+                then
+                        TESTCARD2_LIB="${TESTCARD2_LIB-} ${SDL_TTF_LIBS?}"
+                        AC_DEFINE([HAVE_LIBSDL_TTF], [1], [Build testcard2 with TTF support])
+                fi
         fi
-        SDL_TTF_LIBS=$(remove_mwindows "$SDL_TTF_LIBS")
-        if test "$FOUND_SDL_TTF" = yes
-        then
-                TESTCARD2_LIB="$TESTCARD2_LIB $SDL_TTF_LIBS"
-                AC_DEFINE([HAVE_LIBSDL_TTF], [1], [Build testcard2 with TTF support])
-        fi
-        add_module vidcap_testcard2 "$TESTCARD2_OBJ" "$TESTCARD2_LIB"
+        add_module vidcap_testcard2 "${TESTCARD2_OBJ?}" "${TESTCARD2_LIB-}"
         testcard2=yes
 fi
 
-if { test $testcard2_req = yes && test $testcard2 = no ;} \
-                || { test $testcard_sdl_ttf_req = yes && test $FOUND_SDL_TTF = no ;} ; then
-        AC_MSG_ERROR([Testcard2 dependencies not found])
-fi
+# ensuring testcard2 itself unneeded - no dependencies
+ENSURE_FEATURE_PRESENT([${testcard2_sdl_ttf_req?}], [${FOUND_SDL_TTF?}],
+                       [SDL_ttf for testcard2 not found])
 
 # -------------------------------------------------------------------------------------------------
 # libavcodec hw-accelerated decoding support
@@ -3675,7 +3675,7 @@ RESULT=`add_column "$RESULT" "SDP over HTTP" $sdp_http $?`
 RESULT=`add_column "$RESULT" "Spout" $spout $?`
 RESULT=`add_column "$RESULT" "Swscale support" $libswscale $?`
 RESULT=`add_column "$RESULT" "Syphon" $syphon $?`
-RESULT=`add_column "$RESULT" "Testcard extras (TTF: $FOUND_SDL_TTF)" \
+RESULT=`add_column "$RESULT" "Testcard2 (TTF: $FOUND_SDL_TTF)" \
 $testcard2 $?`
 RESULT=`add_column "$RESULT" "Text postprocess and filter" $text $?`
 RESULT=`end_section "$RESULT"`