diff options
| author | Rodeo <[email protected]> | 2013-05-17 17:01:44 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-05-17 17:01:44 +0000 |
| commit | 031a9105179a08acdbfcd786ada6f43389c9fd3f (patch) | |
| tree | 0d94861e244d4fdf275fc788dfd636bae78ca7c8 | |
| parent | 87b4f3319314ff7dbb33ca0097b5cf2cc65da7af (diff) | |
x264: hardcode the version string so that the full and correct x264 version is used in encoder/set.c, regardless of the tarball (full git repo vs. git archive) or where HandBrake is built from (source tarball vs. svn or git checkout).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5461 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/x264/A00-version-string.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch new file mode 100644 index 000000000..dcd4ec628 --- /dev/null +++ b/contrib/x264/A00-version-string.patch @@ -0,0 +1,23 @@ +diff --git a/x264.h b/x264.h +index e5a1600..f635d9e 100644 +--- a/x264.h ++++ b/x264.h +@@ -41,7 +41,17 @@ + + #include "x264_config.h" + +-#define X264_BUILD 130 ++/* ++ * Define the full version explicitly so that it survives a git --archive. ++ * ++ * Patch will break every time X264_BUILD changes, so that we don't forget to ++ * update it ;-) ++ */ ++#ifdef X264_VERSION ++#undef X264_VERSION ++#endif ++#define X264_BUILD 130 ++#define X264_VERSION " r2273 b3065e6" + + /* Application developers planning to link against a shared library version of + * libx264 from a Microsoft Visual Studio or similar development environment |