mirror of
https://github.com/mpv-player/mpv
synced 2025-01-16 22:37:28 +01:00
Compilation fix hacks: disable libavformat X11 grabber and
move -L flags from _libs_mplayer to _ld_extra git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21623 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6b64c8274e
commit
e77e273b3d
17
configure
vendored
17
configure
vendored
@ -7357,6 +7357,18 @@ else
|
||||
fi
|
||||
echores "$_color_console"
|
||||
|
||||
# linker paths should be the same for mencoder and mplayer
|
||||
_ld_tmp=""
|
||||
for I in $_libs_mplayer ; do
|
||||
_tmp=`echo $I | sed -e s/^-L.*$//`
|
||||
if test -z $_tmp ; then
|
||||
_ld_extra="$I $_ld_extra"
|
||||
else
|
||||
_ld_tmp="$_ld_tmp $I"
|
||||
fi
|
||||
done
|
||||
_libs_mplayer=$_ld_tmp
|
||||
|
||||
#############################################################################
|
||||
echo "Creating config.mak"
|
||||
cat > config.mak << EOF
|
||||
@ -7501,6 +7513,7 @@ CONFIG_AMR_WB=$_amr_wb
|
||||
`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
|
||||
`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
|
||||
`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
|
||||
CONFIG_X11_GRAB_DEVICE_DEMUXER=no
|
||||
CONFIG_FAAC=$_lavc_faac
|
||||
CONFIG_MP3LAME=$_lavc_mp3lame
|
||||
CONFIG_XVID=$_lavc_xvid
|
||||
@ -7892,6 +7905,10 @@ $_def_amr_wb
|
||||
echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/'
|
||||
fi
|
||||
done`
|
||||
// HACK: disable x11 demuxer for now
|
||||
#undef CONFIG_X11_GRAB_DEVICE_DEMUXER
|
||||
#undef ENABLE_X11_GRAB_DEVICE_DEMUXER
|
||||
#define ENABLE_X11_GRAB_DEVICE_DEMUXER 0
|
||||
|
||||
$_def_lavc_faac
|
||||
$_def_lavc_xvid
|
||||
|
Loading…
Reference in New Issue
Block a user