From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 9 Jan 2019 08:39:00 +0000 (+0100)
Subject: Makefile.ffmpeg: upgrade ffmpeg to 4.1, x264 to 20190108, x265 to 2.9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d57bb6192c679bc9f82847e387c31972f28d838;p=thirdparty%2Ftvheadend.git

Makefile.ffmpeg: upgrade ffmpeg to 4.1, x264 to 20190108, x265 to 2.9
---

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 51e2591da..25a24710f 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -44,22 +44,22 @@ BSFS           = h264_mp4toannexb hevc_mp4toannexb
 FILTERS        = yadif format hwupload hwdownload scale null aresample anull
 HWACCELS       =
 
-NASM_VER       = 2.13.03
+NASM_VER       = 2.14.02
 NASM           = nasm-$(NASM_VER)
 NASM_TB        = $(NASM).tar.gz
 NASM_URL       = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VER)/$(NASM_TB)
-NASM_SHA1      = fa15c35b6003518d8165ab507f31af5d3938e91f
+NASM_SHA1      = bfa67d0d33f0c7b00c50d9f1bd33fd4d5df3c5d5
 NASM_DIFFS     = remove-invalid-pure_func-qualifiers.diff
 
-LIBX264        = x264-snapshot-20180906-2245
+LIBX264        = x264-snapshot-20190108-2245
 LIBX264_TB     = $(LIBX264).tar.bz2
 LIBX264_URL    = http://ftp.videolan.org/x264/snapshots/$(LIBX264_TB)
-LIBX264_SHA1   = 454c3c96b7c6df19e36f09fffb2a25a60ec657ed
+LIBX264_SHA1   = 6d216c7892b9c886aa6b18a580698083136e2fdc
 
-LIBX265        = x265_2.8
+LIBX265        = x265_2.9
 LIBX265_TB     = $(LIBX265).tar.gz
 LIBX265_URL    = http://ftp.videolan.org/videolan/x265/$(LIBX265_TB)
-LIBX265_SHA1   = e2ef1ad186d9581239463d4e5177a25bc57b9fc0
+LIBX265_SHA1   = 3c005b4ab409c6f996b36ad88d780ff85fbc9abf
 ifeq ($(CONFIG_PIE),yes)
 LIBX265_DIFFS  = libx265.pie.diff
 else
@@ -97,16 +97,16 @@ LIBOPUS_TB     = $(LIBOPUS).tar.gz
 LIBOPUS_URL    = https://archive.mozilla.org/pub/opus/$(LIBOPUS_TB)
 LIBOPUS_SHA1   = ea74356b762ac466637a40c82cdd3acbc35daa43
 
-FFNVCODEC_VER  = 8.1.24.2
+FFNVCODEC_VER  = 8.2.15.6
 FFNVCODEC      = nv-codec-headers-n$(FFNVCODEC_VER)
 FFNVCODEC_TB   = $(FFNVCODEC).tar.gz
 FFNVCODEC_URL  = https://github.com/FFmpeg/nv-codec-headers/releases/download/n$(FFNVCODEC_VER)/nv-codec-headers-$(FFNVCODEC_VER).tar.gz
-FFNVCODEC_SHA1 = d500263b2fd92a32ac383ac87762648ecf8d325b
+FFNVCODEC_SHA1 = 57eb91aab785b1adeb2d17c95fd1bba32e6f53d9
 
-FFMPEG         = ffmpeg-4.0.2
+FFMPEG         = ffmpeg-4.1
 FFMPEG_TB      = $(FFMPEG).tar.bz2
 FFMPEG_URL     = http://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1    = 7b9deb74b4fcc665c5187dcd057b678e754b43d2
+FFMPEG_SHA1    = dbbecc574c0a57687271165a618353d4ddbd8cfa
 
 # ##############################################################################
 # Library Config
@@ -183,7 +183,7 @@ $(LIB_ROOT)/$(NASM)/.tvh_build: \
 		$(LIB_ROOT)/$(NASM)/.tvh_download
 	cd $(LIB_ROOT)/$(NASM) && $(CONFIGURE_PI) \
 		--libdir=/$(EPREFIX0)/lib
-	INSTALLROOT=$(EBUILDIR) \
+	DESTDIR=$(EBUILDIR) \
 		$(MAKE) -C $(LIB_ROOT)/$(NASM) install
 	@touch $@
 
diff --git a/support/patches/remove-invalid-pure_func-qualifiers.diff b/support/patches/remove-invalid-pure_func-qualifiers.diff
index 575e44e40..568de457f 100644
--- a/support/patches/remove-invalid-pure_func-qualifiers.diff
+++ b/support/patches/remove-invalid-pure_func-qualifiers.diff
@@ -1,27 +1,42 @@
-From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 8 Feb 2018 14:47:08 +0100
-Subject: [PATCH] Remove invalid pure_func qualifiers
-
----
- include/nasmlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git include/nasmlib.h include/nasmlib.h
-index 79e866b..c93cef0 100644
---- include/nasmlib.h
-+++ include/nasmlib.h
-@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn);
-  * seg_init: Initialise the segment-number allocator.
-  * seg_alloc: allocate a hitherto unused segment number.
-  */
--void pure_func seg_init(void);
--int32_t pure_func seg_alloc(void);
-+void seg_init(void);
-+int32_t seg_alloc(void);
+--- include/nasmlib.h.orig	2019-01-09 09:12:53.215611786 +0100
++++ include/nasmlib.h	2019-01-09 09:17:15.318274490 +0100
+@@ -150,7 +150,7 @@
+ #elif defined(HAVE_STRICMP)
+ #define nasm_stricmp stricmp
+ #else
+-int pure_func nasm_stricmp(const char *, const char *);
++int nasm_stricmp(const char *, const char *);
+ #endif
+ 
+ #if defined(HAVE_STRNCASECMP)
+@@ -158,10 +158,10 @@
+ #elif defined(HAVE_STRNICMP)
+ #define nasm_strnicmp strnicmp
+ #else
+-int pure_func nasm_strnicmp(const char *, const char *, size_t);
++int nasm_strnicmp(const char *, const char *, size_t);
+ #endif
+ 
+-int pure_func nasm_memicmp(const char *, const char *, size_t);
++int nasm_memicmp(const char *, const char *, size_t);
+ 
+ #if defined(HAVE_STRSEP)
+ #define nasm_strsep strsep
+@@ -170,7 +170,7 @@
+ #endif
+ 
+ #ifndef HAVE_DECL_STRNLEN
+-size_t pure_func strnlen(const char *, size_t);
++size_t strnlen(const char *, size_t);
+ #endif
+ 
+ /* This returns the numeric value of a given 'digit'. */
+@@ -306,7 +306,7 @@
+ char * safe_alloc nasm_basename(const char *path);
+ char * safe_alloc nasm_catfile(const char *dir, const char *path);
+ 
+-const char * pure_func prefix_name(int);
++const char * prefix_name(int);
  
  /*
-  * many output formats will be able to make use of this: a standard
--- 
-2.14.3
-
+  * Wrappers around fopen()... for future change to a dedicated structure