diff options
| author | Bradley Sepos <[email protected]> | 2017-11-29 23:07:04 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2017-12-02 15:53:46 -0500 |
| commit | c8111d82275554eeb4e1a676bf082446ce7845eb (patch) | |
| tree | aca52a28343afecafa2b441024cba63780efd762 /contrib/x265 | |
| parent | 866425f4faceec067158a740abe17a6c54a9eb44 (diff) | |
contrib: Update to x265 2.6.
Closes #1029.
Diffstat (limited to 'contrib/x265')
| -rw-r--r-- | contrib/x265/P00-mingw-lib.patch | 11 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 9 |
2 files changed, 5 insertions, 15 deletions
diff --git a/contrib/x265/P00-mingw-lib.patch b/contrib/x265/P00-mingw-lib.patch deleted file mode 100644 index 5c822be0a..000000000 --- a/contrib/x265/P00-mingw-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- x265_2.5/source/x265-extras.h.orig 2017-07-13 07:20:07.000000000 -0400 -+++ x265_2.5/source/x265-extras.h 2017-07-31 13:20:23.000000000 -0400 -@@ -33,7 +33,7 @@ - extern "C" { - #endif - --#if _WIN32 -+#ifdef X265_API_IMPORTS - #define LIBAPI __declspec(dllexport) - #else - #define LIBAPI diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index 5b28b8cac..78a5cb054 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -2,10 +2,11 @@ __deps__ := YASM CMAKE X265_8 X265_10 X265_12 $(eval $(call import.MODULE.defs,X265,x265,$(__deps__))) $(eval $(call import.CONTRIB.defs,X265)) -X265.FETCH.url = https://download.handbrake.fr/contrib/x265_2.5.tar.gz -X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_2.5.tar.gz -X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_2.5.tar.gz -X265.FETCH.sha256 = 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17 +X265.FETCH.url = https://download.handbrake.fr/contrib/x265_2.6.tar.gz +X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_2.6.tar.gz +X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_2.6.tar.gz +X265.FETCH.sha256 = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf +X265.EXTRACT.tarbase = x265_v2.6 # Silence "warning: overriding recipe for target" messages X265.FETCH.target = |