Skip to content

Commit

Permalink
configure: rename file option to vidcap-file
Browse files Browse the repository at this point in the history
file alone is not much specific (also not always known from context if
its meant file vidcap or some file in a generic meaning)
  • Loading branch information
MartinPulec committed Aug 9, 2023
1 parent 3250a68 commit 0c237e4
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/Linux/arm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ APPNAME=UltraGrid-latest-${ARCH}.AppImage

set -- --enable-plugins --enable-openssl --enable-soxr --enable-speexdsp # general
set -- "$@" --enable-alsa --enable-jack --enable-jack-transport # audio
set -- "$@" --enable-decklink --enable-file --enable-ndi --enable-rtsp --enable-screen=x11 --enable-swmix --enable-v4l2 --enable-ximea # vcap
set -- "$@" --enable-decklink --enable-ndi --enable-rtsp --enable-screen=x11 --enable-swmix --enable-v4l2 --enable-vidcap-file --enable-ximea # vcap
set -- "$@" --enable-caca --enable-gl-display --enable-panogl_disp --enable-sdl # display
set -- "$@" --enable-libavcodec --enable-rtdxt --enable-libswscale --enable-uyvy # compression
set -- "$@" --enable-blank --enable-holepunch --enable-natpmp --enable-pcp --enable-resize --enable-scale --enable-sdp-http --enable-testcard-extras --enable-text --enable-video-mixer --enable-zfec # extras (pp. etc)
Expand Down
40 changes: 39 additions & 1 deletion .github/scripts/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,45 @@ export CHANNEL TAG VERSION

printf '%b' "CHANNEL=$CHANNEL\nTAG=$TAG\nVERSION=$VERSION\n" >> "$GITHUB_ENV"

export FEATURES="--enable-option-checking=fatal --with-live555=/usr/local --enable-aja --enable-blank --enable-caca --enable-cineform --enable-decklink --enable-file --enable-gl --enable-gl-display --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-resize --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-screen --enable-sdl=2 --enable-sdl_mixer --enable-sdp-http --enable-soxr --enable-speexdsp --enable-swmix --enable-libswscale --enable-testcard-extras=all --enable-text --enable-video-mixer --enable-vulkan --enable-ximea --enable-zfec"
export FEATURES="--enable-option-checking=fatal --with-live555=/usr/local\
--enable-aja\
--enable-blank\
--enable-caca\
--enable-cineform\
--enable-decklink\
--enable-gl\
--enable-gl-display\
--enable-holepunch\
--enable-jack\
--enable-jack-transport\
--enable-libavcodec\
--enable-natpmp\
--enable-ndi\
--enable-openssl\
--enable-pcp\
--enable-portaudio\
--enable-qt\
--enable-resize\
--enable-rtdxt\
--enable-rtsp\
--enable-rtsp-server\
--enable-scale\
--enable-screen\
--enable-sdl=2\
--enable-sdl_mixer\
--enable-sdp-http\
--enable-soxr\
--enable-speexdsp\
--enable-swmix\
--enable-libswscale\
--enable-testcard-extras=all\
--enable-text\
--enable-vidcap-file\
--enable-video-mixer\
--enable-vulkan\
--enable-ximea\
--enable-zfec\
"
CUDA_FEATURES="--enable-cuda_dxt --enable-gpujpeg --enable-ldgm-gpu --enable-uyvy"
case "$RUNNER_OS" in
Linux)
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1723,11 +1723,11 @@ ENSURE_FEATURE_PRESENT([$libavcodec_req], [$libavcodec], [Libavcodec not found])
# File input
# -------------------------------------------------------------------------------------------------
file=no
AC_ARG_ENABLE(file,
[ --disable-file disable file input support (default is auto)]
[ Requires: libavcodec libavformat libavutil libswscale],
[file_req=$enableval],
[file_req=$build_default]
AC_ARG_ENABLE(vidcap-file,
AS_HELP_STRING([--disable-vidcap-file], [disable file input support (default is auto)]
[Requires: libavcodec libavformat libavutil libswscale]),
[file_req=$enableval],
[file_req=$build_default]
)

if test $file_req != no && test $libavcodec = yes && test $libswscale = yes; then
Expand Down

0 comments on commit 0c237e4

Please sign in to comment.