contrib: Update to x265 2.6.

Closes #1029.

8 files changed, 20 insertions, 60 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 =
diff --git a/contrib/x265_10bit/P00-mingw-lib.patch b/contrib/x265_10bit/P00-mingw-lib.patch
deleted file mode 100644
index 5c822be0a..000000000
--- a/contrib/x265_10bit/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_10bit/module.defs b/contrib/x265_10bit/module.defs
index b7aac7ca1..eb21965aa 100644
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -2,10 +2,11 @@ __deps__ := YASM CMAKE X265_8
 $(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_10))
 
-X265_10.FETCH.url     = https://download.handbrake.fr/contrib/x265_2.5.tar.gz
-X265_10.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_2.5.tar.gz
-X265_10.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_2.5.tar.gz
-X265_10.FETCH.sha256  = 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17
+X265_10.FETCH.url     = https://download.handbrake.fr/contrib/x265_2.6.tar.gz
+X265_10.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_2.6.tar.gz
+X265_10.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_2.6.tar.gz
+X265_10.FETCH.sha256  = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
+X265_10.EXTRACT.tarbase = x265_v2.6
 
 # Silence "warning: overriding recipe for target" messages
 X265_10.FETCH.target =
diff --git a/contrib/x265_12bit/P00-mingw-lib.patch b/contrib/x265_12bit/P00-mingw-lib.patch
deleted file mode 100644
index 5c822be0a..000000000
--- a/contrib/x265_12bit/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_12bit/module.defs b/contrib/x265_12bit/module.defs
index 6f565f186..e2e434016 100644
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -2,10 +2,11 @@ __deps__ := YASM CMAKE X265_8
 $(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_12))
 
-X265_12.FETCH.url     = https://download.handbrake.fr/contrib/x265_2.5.tar.gz
-X265_12.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_2.5.tar.gz
-X265_12.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_2.5.tar.gz
-X265_12.FETCH.sha256  = 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17
+X265_12.FETCH.url     = https://download.handbrake.fr/contrib/x265_2.6.tar.gz
+X265_12.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_2.6.tar.gz
+X265_12.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_2.6.tar.gz
+X265_12.FETCH.sha256  = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
+X265_12.EXTRACT.tarbase = x265_v2.6
 
 # Silence "warning: overriding recipe for target" messages
 X265_12.FETCH.target =
diff --git a/contrib/x265_8bit/P00-mingw-lib.patch b/contrib/x265_8bit/P00-mingw-lib.patch
deleted file mode 100644
index 5c822be0a..000000000
--- a/contrib/x265_8bit/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_8bit/module.defs b/contrib/x265_8bit/module.defs
index df4e9b0a7..284e3baa0 100644
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -2,10 +2,11 @@ __deps__ := YASM CMAKE
 $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_8))
 
-X265_8.FETCH.url     = https://download.handbrake.fr/contrib/x265_2.5.tar.gz
-X265_8.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_2.5.tar.gz
-X265_8.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_2.5.tar.gz
-X265_8.FETCH.sha256  = 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17
+X265_8.FETCH.url     = https://download.handbrake.fr/contrib/x265_2.6.tar.gz
+X265_8.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_2.6.tar.gz
+X265_8.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_2.6.tar.gz
+X265_8.FETCH.sha256  = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
+X265_8.EXTRACT.tarbase = x265_v2.6
 
 X265_8.build_dir             = 8bit
 X265_8.CONFIGURE.exe         = cmake