Commit 8fdee3ee authored by Michael Niedermayer's avatar Michael Niedermayer

Revert 4 commits to configure which broke dependency handling

Revert "configure: Don't enable examples when --disable-everything is used"
reverted as the problematic commit will be reverted too
This reverts commit 02dfa64c.

Revert "Merge commit 'a2bb771a'"
This reverts commit e8ebcb00, reversing
changes made to 3bff005b.

Revert "Merge commit '21c750f2'"
This reverts commit 470bfab4, reversing
changes made to f97ee815.

Revert "Revert "configure: Revert recent changes to disable-everything""
This reverts commit f97ee815.
Reviewed-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
Immediate commit suggested by BBB
parent 6eaad752
...@@ -579,15 +579,8 @@ enable(){ ...@@ -579,15 +579,8 @@ enable(){
set_all yes $* set_all yes $*
} }
check_requested() {
for var; do
eval test "x\$${var#!}_requested" = "xyes" && die "${var%%_*} cannot be enabled"
done
}
disable(){ disable(){
set_all no $* set_all no $*
check_requested $*
} }
enable_weak(){ enable_weak(){
...@@ -638,32 +631,6 @@ enable_deep_weak(){ ...@@ -638,32 +631,6 @@ enable_deep_weak(){
done done
} }
do_enable_deep_force(){
for var; do
enabled $var && continue
eval sel="\$${var}_deps\ \$${var}_deps_any\ \$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
pushvar var
enable_deep_force $sel
popvar var
done
}
enable_deep_force(){
do_enable_deep_force $*
for var; do
is_in $var $ALL_COMPONENTS $COMPONENT_LIST $LIBRARY_LIST && enable $var
done
}
request(){
disable $* # force the refresh of the dependencies
for var; do
enable ${var}_requested
done
enable_deep_force $*
enable $*
}
enabled(){ enabled(){
test "${1#!}" = "$1" && op='=' || op=!= test "${1#!}" = "$1" && op='=' || op=!=
eval test "x\$${1#!}" $op "xyes" eval test "x\$${1#!}" $op "xyes"
...@@ -723,7 +690,7 @@ do_check_deps(){ ...@@ -723,7 +690,7 @@ do_check_deps(){
append allopts $cfg append allopts $cfg
eval dep_all="\$${cfg}_deps" eval dep_all="\$${cfg}_deps"
eval dep_any="\$${cfg}_deps_any\ \$${cfg}_select_any" eval dep_any="\$${cfg}_deps_any"
eval dep_sel="\$${cfg}_select" eval dep_sel="\$${cfg}_select"
eval dep_sgs="\$${cfg}_suggest" eval dep_sgs="\$${cfg}_suggest"
eval dep_ifa="\$${cfg}_if" eval dep_ifa="\$${cfg}_if"
...@@ -2860,7 +2827,7 @@ tls_schannel_protocol_deps="schannel" ...@@ -2860,7 +2827,7 @@ tls_schannel_protocol_deps="schannel"
tls_schannel_protocol_select="tcp_protocol" tls_schannel_protocol_select="tcp_protocol"
tls_securetransport_protocol_deps="securetransport" tls_securetransport_protocol_deps="securetransport"
tls_securetransport_protocol_select="tcp_protocol" tls_securetransport_protocol_select="tcp_protocol"
tls_protocol_select_any="tls_schannel_protocol tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol" tls_protocol_deps_any="tls_schannel_protocol tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol"
udp_protocol_select="network" udp_protocol_select="network"
udplite_protocol_select="network" udplite_protocol_select="network"
unix_protocol_deps="sys_un_h" unix_protocol_deps="sys_un_h"
...@@ -3047,7 +3014,10 @@ cpu="generic" ...@@ -3047,7 +3014,10 @@ cpu="generic"
intrinsics="none" intrinsics="none"
# configurable options # configurable options
enable $PROGRAM_LIST
enable $DOCUMENT_LIST enable $DOCUMENT_LIST
enable $EXAMPLE_LIST
enable $(filter_out avresample $LIBRARY_LIST)
enable stripping enable stripping
enable asm enable asm
...@@ -3168,6 +3138,12 @@ ALL_COMPONENTS=" ...@@ -3168,6 +3138,12 @@ ALL_COMPONENTS="
$PROTOCOL_LIST $PROTOCOL_LIST
" "
for n in $COMPONENT_LIST; do
v=$(toupper ${n%s})_LIST
eval enable \$$v
eval ${n}_if_any="\$$v"
done
enable $ARCH_EXT_LIST enable $ARCH_EXT_LIST
die_unknown(){ die_unknown(){
...@@ -3234,11 +3210,10 @@ for opt do ...@@ -3234,11 +3210,10 @@ for opt do
disable $PROGRAM_LIST disable $PROGRAM_LIST
;; ;;
--disable-everything) --disable-everything)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
enable_deep_force $(filter_out avresample $LIBRARY_LIST) $PROGRAM_LIST
;; ;;
--disable-all) --disable-all)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
disable $LIBRARY_LIST $PROGRAM_LIST doc disable $LIBRARY_LIST $PROGRAM_LIST doc
enable avutil enable avutil
;; ;;
...@@ -3255,7 +3230,6 @@ for opt do ...@@ -3255,7 +3230,6 @@ for opt do
is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt" is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt"
eval list=\$$(toupper $thing)_LIST eval list=\$$(toupper $thing)_LIST
name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing} name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing}
test $action = enable && action="request"
list=$(filter "$name" $list) list=$(filter "$name" $list)
[ "$list" = "" ] && warn "Option $opt did not match anything" [ "$list" = "" ] && warn "Option $opt did not match anything"
$action $list $action $list
...@@ -3263,10 +3237,9 @@ for opt do ...@@ -3263,10 +3237,9 @@ for opt do
--enable-?*|--disable-?*) --enable-?*|--disable-?*)
eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g') eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
if is_in $option $COMPONENT_LIST; then if is_in $option $COMPONENT_LIST; then
test $action = enable && action="enable_deep_force" test $action = disable && action=unset
eval $action \$$(toupper ${option%s})_LIST eval $action \$$(toupper ${option%s})_LIST
elif is_in $option $CMDLINE_SELECT; then elif is_in $option $CMDLINE_SELECT; then
test $action = enable && action="request"
$action $option $action $option
else else
die_unknown $opt die_unknown $opt
...@@ -3303,15 +3276,11 @@ done ...@@ -3303,15 +3276,11 @@ done
disabled logging && logfile=/dev/null disabled logging && logfile=/dev/null
# Enable the default components if not disabled explicitly
enable_weak $(filter_out avresample $LIBRARY_LIST) $PROGRAM_LIST
# Disable all the library-specific components if the library itself # Disable all the library-specific components if the library itself
# is disabled, see AVCODEC_LIST and following _LIST variables. # is disabled, see AVCODEC_LIST and following _LIST variables.
disable_components(){ disable_components(){
disabled ${1} && disable_weak $( disabled ${1} && disable $(
eval components="\$$(toupper ${1})_COMPONENTS" eval components="\$$(toupper ${1})_COMPONENTS"
map 'eval echo \${$(toupper ${v%s})_LIST}' $components map 'eval echo \${$(toupper ${v%s})_LIST}' $components
) )
...@@ -3319,25 +3288,6 @@ disable_components(){ ...@@ -3319,25 +3288,6 @@ disable_components(){
map 'disable_components $v' $LIBRARY_LIST map 'disable_components $v' $LIBRARY_LIST
echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
# Mark components that had not been enabled/disabled explicitly
# as enabled
for n in $COMPONENT_LIST; do
v=$(toupper ${n%s})_LIST
eval enable_weak \$$v
eval ${n}_if_any="\$$v"
done
# Make so that disabled libraries are enabled if a component
# of them is requested
for n in $LIBRARY_LIST; do
v=$(toupper ${n})_COMPONENTS
eval ${n}_if_any="\$$v"
done
echo "# $0 $FFMPEG_CONFIGURATION" > $logfile echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
set >> $logfile set >> $logfile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment