From 8b079d9d8900b5e410ae77e787483dabf4e9ad6a Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Sat, 20 Jul 2019 12:18:04 -0400 Subject: [PATCH] contrib: Update to x265 3.1.1. --- contrib/x265/A00-animation-tune.patch | 22 --------------------- contrib/x265/module.defs | 10 +++++----- contrib/x265_10bit/A00-animation-tune.patch | 22 --------------------- contrib/x265_10bit/module.defs | 10 +++++----- contrib/x265_12bit/A00-animation-tune.patch | 22 --------------------- contrib/x265_12bit/module.defs | 10 +++++----- contrib/x265_8bit/A00-animation-tune.patch | 22 --------------------- contrib/x265_8bit/module.defs | 10 +++++----- 8 files changed, 20 insertions(+), 108 deletions(-) delete mode 100644 contrib/x265/A00-animation-tune.patch delete mode 100644 contrib/x265_10bit/A00-animation-tune.patch delete mode 100644 contrib/x265_12bit/A00-animation-tune.patch delete mode 100644 contrib/x265_8bit/A00-animation-tune.patch diff --git a/contrib/x265/A00-animation-tune.patch b/contrib/x265/A00-animation-tune.patch deleted file mode 100644 index 1067da43b..000000000 --- a/contrib/x265/A00-animation-tune.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/source/x265.h b/source/x265.h ---- a/source/x265.h -+++ b/source/x265.h -@@ -1835,17 +1835,17 @@ static const char * const x265_preset_na - * with ultrafast mapping to "0" and placebo mapping to "9". This mapping may - * of course change if new presets are added in between, but will always be - * ordered from fastest to slowest. - * - * Warning: the speed of these presets scales dramatically. Ultrafast is a full - * 100 times faster than placebo! - * - * Currently available tunings are: */ --static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "fastdecode", 0 }; -+static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "animation", "fastdecode", 0 }; - - /* returns 0 on success, negative on failure (e.g. invalid preset/tune name). */ - int x265_param_default_preset(x265_param *, const char *preset, const char *tune); - - /* x265_picture_alloc: - * Allocates an x265_picture instance. The returned picture structure is not - * special in any way, but using this method together with x265_picture_free() - * and x265_picture_init() allows some version safety. New picture fields will diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index ac21f799b..fef5f0707 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -2,11 +2,11 @@ __deps__ := 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_3.0.tar.gz -X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz -X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.0.tar.gz -X265.FETCH.sha256 = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 -X265.EXTRACT.tarbase = x265_3.0 +X265.FETCH.url = https://download.handbrake.fr/contrib/x265_3.1.1.tar.gz +X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.1.tar.gz +X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.1.1.tar.gz +X265.FETCH.sha256 = 827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0 +X265.EXTRACT.tarbase = x265_3.1.1 # Silence "warning: overriding recipe for target" messages X265.FETCH.target = diff --git a/contrib/x265_10bit/A00-animation-tune.patch b/contrib/x265_10bit/A00-animation-tune.patch deleted file mode 100644 index 1067da43b..000000000 --- a/contrib/x265_10bit/A00-animation-tune.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/source/x265.h b/source/x265.h ---- a/source/x265.h -+++ b/source/x265.h -@@ -1835,17 +1835,17 @@ static const char * const x265_preset_na - * with ultrafast mapping to "0" and placebo mapping to "9". This mapping may - * of course change if new presets are added in between, but will always be - * ordered from fastest to slowest. - * - * Warning: the speed of these presets scales dramatically. Ultrafast is a full - * 100 times faster than placebo! - * - * Currently available tunings are: */ --static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "fastdecode", 0 }; -+static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "animation", "fastdecode", 0 }; - - /* returns 0 on success, negative on failure (e.g. invalid preset/tune name). */ - int x265_param_default_preset(x265_param *, const char *preset, const char *tune); - - /* x265_picture_alloc: - * Allocates an x265_picture instance. The returned picture structure is not - * special in any way, but using this method together with x265_picture_free() - * and x265_picture_init() allows some version safety. New picture fields will diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs index f6698607d..a4a5916f9 100644 --- a/contrib/x265_10bit/module.defs +++ b/contrib/x265_10bit/module.defs @@ -2,11 +2,11 @@ __deps__ := 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_3.0.tar.gz -X265_10.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz -X265_10.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.0.tar.gz -X265_10.FETCH.sha256 = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 -X265_10.EXTRACT.tarbase = x265_3.0 +X265_10.FETCH.url = https://download.handbrake.fr/contrib/x265_3.1.1.tar.gz +X265_10.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.1.tar.gz +X265_10.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.1.1.tar.gz +X265_10.FETCH.sha256 = 827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0 +X265_10.EXTRACT.tarbase = x265_3.1.1 # Silence "warning: overriding recipe for target" messages X265_10.FETCH.target = diff --git a/contrib/x265_12bit/A00-animation-tune.patch b/contrib/x265_12bit/A00-animation-tune.patch deleted file mode 100644 index 1067da43b..000000000 --- a/contrib/x265_12bit/A00-animation-tune.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/source/x265.h b/source/x265.h ---- a/source/x265.h -+++ b/source/x265.h -@@ -1835,17 +1835,17 @@ static const char * const x265_preset_na - * with ultrafast mapping to "0" and placebo mapping to "9". This mapping may - * of course change if new presets are added in between, but will always be - * ordered from fastest to slowest. - * - * Warning: the speed of these presets scales dramatically. Ultrafast is a full - * 100 times faster than placebo! - * - * Currently available tunings are: */ --static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "fastdecode", 0 }; -+static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "animation", "fastdecode", 0 }; - - /* returns 0 on success, negative on failure (e.g. invalid preset/tune name). */ - int x265_param_default_preset(x265_param *, const char *preset, const char *tune); - - /* x265_picture_alloc: - * Allocates an x265_picture instance. The returned picture structure is not - * special in any way, but using this method together with x265_picture_free() - * and x265_picture_init() allows some version safety. New picture fields will diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs index b7fcfff70..ac84a4647 100644 --- a/contrib/x265_12bit/module.defs +++ b/contrib/x265_12bit/module.defs @@ -2,11 +2,11 @@ __deps__ := 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_3.0.tar.gz -X265_12.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz -X265_12.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.0.tar.gz -X265_12.FETCH.sha256 = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 -X265_12.EXTRACT.tarbase = x265_3.0 +X265_12.FETCH.url = https://download.handbrake.fr/contrib/x265_3.1.1.tar.gz +X265_12.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.1.tar.gz +X265_12.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.1.1.tar.gz +X265_12.FETCH.sha256 = 827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0 +X265_12.EXTRACT.tarbase = x265_3.1.1 # Silence "warning: overriding recipe for target" messages X265_12.FETCH.target = diff --git a/contrib/x265_8bit/A00-animation-tune.patch b/contrib/x265_8bit/A00-animation-tune.patch deleted file mode 100644 index 1067da43b..000000000 --- a/contrib/x265_8bit/A00-animation-tune.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/source/x265.h b/source/x265.h ---- a/source/x265.h -+++ b/source/x265.h -@@ -1835,17 +1835,17 @@ static const char * const x265_preset_na - * with ultrafast mapping to "0" and placebo mapping to "9". This mapping may - * of course change if new presets are added in between, but will always be - * ordered from fastest to slowest. - * - * Warning: the speed of these presets scales dramatically. Ultrafast is a full - * 100 times faster than placebo! - * - * Currently available tunings are: */ --static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "fastdecode", 0 }; -+static const char * const x265_tune_names[] = { "psnr", "ssim", "grain", "zerolatency", "animation", "fastdecode", 0 }; - - /* returns 0 on success, negative on failure (e.g. invalid preset/tune name). */ - int x265_param_default_preset(x265_param *, const char *preset, const char *tune); - - /* x265_picture_alloc: - * Allocates an x265_picture instance. The returned picture structure is not - * special in any way, but using this method together with x265_picture_free() - * and x265_picture_init() allows some version safety. New picture fields will diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs index 88caa4453..7136006ed 100644 --- a/contrib/x265_8bit/module.defs +++ b/contrib/x265_8bit/module.defs @@ -2,11 +2,11 @@ __deps__ := $(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_3.0.tar.gz -X265_8.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz -X265_8.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.0.tar.gz -X265_8.FETCH.sha256 = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 -X265_8.EXTRACT.tarbase = x265_3.0 +X265_8.FETCH.url = https://download.handbrake.fr/contrib/x265_3.1.1.tar.gz +X265_8.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.1.tar.gz +X265_8.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_3.1.1.tar.gz +X265_8.FETCH.sha256 = 827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0 +X265_8.EXTRACT.tarbase = x265_3.1.1 X265_8.build_dir = 8bit X265_8.CONFIGURE.exe = cmake -- 2.40.0