diff options
author | wm4 <wm4@nowhere> | 2014-10-27 18:23:59 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-10-27 18:23:59 +0100 |
commit | a85d34bf9b0570b028533e3f96675fceec49ba86 (patch) | |
tree | 5cc32ff3fccd05c117a8e03edb81f0119fe99431 /README.rst | |
parent | b38387044631aa433ae1612efbe9b1ed1e264b51 (diff) | |
download | mpv-build-a85d34bf9b0570b028533e3f96675fceec49ba86.tar.bz2 mpv-build-a85d34bf9b0570b028533e3f96675fceec49ba86.tar.xz |
Add a simpler way to switch between release and master versions
This remembers the selection, and users are not tricked into
accidentally switching back to the release all the time.
Don't do this for libass, we always use master. (No reason to use a
usually buggy and outdated release.)
We don't do it for fribidi either, because fribidi is just in a
permanent state of bitrotting and brokenness.
Diffstat (limited to 'README.rst')
-rw-r--r-- | README.rst | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -150,18 +150,20 @@ In general, changes to the mpv-build repository itself are relatively safe, keeping branches in sub-repositories might be ok, and making local, uncommitted changes in sub-repositories will break. -Forcing master versions of all parts -==================================== +Forcing master versions for some parts +====================================== The following command can be used to delete all local changes, and to checkout -the current master versions for all parts (libass, ffmpeg, mpv, as well as -mpv-build itself): +the current master version for mpv: - ./update --master + ./use-mpv-master -All local modifications are overwritten (including changes to the scripts), -and git master versions are checked out. Breakages/bugs are to be expected, -because these are untested bleeding-edge development versions of the code. +And run ``./rebuild`` or similar. Use this to switch back to the latest release: + + ./use-mpv-release + +Likewise, you can use ``./use-ffmpeg-master`` and ``./use-ffmpeg-release`` to +switch between git master and the latest FFmpeg release. Use on your own risk. |