RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

VERSION: rename to MPV_VERSION to avoid standard library header conflict 

Root directory is added to include directories and `VERSION` conflicts
with `#include <version>` which is standard library header.
This commit is contained in:
Kacper Michajłow 2024-06-10 21:00:33 +02:00
parent 2ad6566e51
commit e17b5c635e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/release-policy.md
View File

@ -24,7 +24,7 @@ While on master:
- Update the `RELEASE_NOTES` file, replacing the previous release notes. - Update the `RELEASE_NOTES` file, replacing the previous release notes.
- Update the `VERSION` file. - Update the `MPV_VERSION` file.
- Update `DOCS/client-api-changes.rst` (in particular, update the last version - Update `DOCS/client-api-changes.rst` (in particular, update the last version
number if necessary) number if necessary)
@ -43,7 +43,7 @@ While on master:
- Create a new GitHub release using the content of `RELEASE_NOTES` related to - Create a new GitHub release using the content of `RELEASE_NOTES` related to
the new version. the new version.
- Readd -UNKNOWN suffix to version in `VERSION` file. - Readd -UNKNOWN suffix to version in `MPV_VERSION` file.
If necessary (to e.g. exclude commits already on master), the release can If necessary (to e.g. exclude commits already on master), the release can
be done on a branch with different commit history. The release branch **must** be done on a branch with different commit history. The release branch **must**

0
VERSION → MPV_VERSION
View File

2
TOOLS/osxbundle.py
View File

@ -47,7 +47,7 @@ def sign_bundle(binary_name):
def bundle_version(src_path): def bundle_version(src_path):
version = 'UNKNOWN' version = 'UNKNOWN'
version_path = os.path.join(src_path, 'VERSION') version_path = os.path.join(src_path, 'MPV_VERSION')
if os.path.exists(version_path): if os.path.exists(version_path):
x = open(version_path) x = open(version_path)
version = x.read() version = x.read()

2
meson.build
View File

@ -1,7 +1,7 @@
project('mpv', project('mpv',
'c', 'c',
license: ['GPL2+', 'LGPL2.1+'], license: ['GPL2+', 'LGPL2.1+'],
version: files('./VERSION'), version: files('./MPV_VERSION'),
meson_version: '>=0.62.0', meson_version: '>=0.62.0',
default_options: [ default_options: [
'backend_max_links=16', 'backend_max_links=16',