Update x265 to 3.6

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index aa1cc737a77b72841f48c12b65137e8aedd9580f..8ce6be1dba9bf2c37a9db0cd70e772a04c0ed8f7 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -57,11 +57,11 @@ LIBX264_TB     = $(LIBX264).tar.bz2
 LIBX264_URL    = https://code.videolan.org/videolan/x264/-/archive/$(LIBX264_VER)/$(LIBX264_TB)
 LIBX264_SHA1   = eeca87def74d390669dbc8a98c49012305bc9b99
 
-LIBX265_VER    = 3.5
+LIBX265_VER    = 3.6
 LIBX265        = x265_$(LIBX265_VER)
 LIBX265_TB     = $(LIBX265).tar.gz
 LIBX265_URL    = https://bitbucket.org/multicoreware/x265_git/downloads/$(LIBX265_TB)
-LIBX265_SHA1   = dc8e70f441991289a9a34fd37e1649d59435bfae
+LIBX265_SHA1   = 51fc4592a9f1e340d87a51233361cc5a3ffd739d
 ifeq ($(CONFIG_PIE),yes)
 LIBX265_DIFFS  = libx265.pie.diff
 else

diff --git a/support/patches/libx265.pie.diff b/support/patches/libx265.pie.diff
index b4fec58799a905eac7fa09bc5523b8eaf00fe59b..9fbb6ea0e0eddf1d16ff30d7a3b857b18eea626d 100644 (file)
--- a/support/patches/libx265.pie.diff
+++ b/support/patches/libx265.pie.diff
@@ -1,7 +1,7 @@
 diff -urN ../x265_2.0.pic/source/CMakeLists.txt ./source/CMakeLists.txt
 --- ../x265_2.0.pic/source/CMakeLists.txt      2016-07-30 08:57:07.632539944 +0200
 +++ ./source/CMakeLists.txt    2016-08-08 12:12:39.539380667 +0200
-@@ -168,7 +168,7 @@
+@@ -229,7 +229,7 @@
      add_definitions(-D__STDC_LIMIT_MACROS=1)
      add_definitions(-std=gnu++98)
      if(ENABLE_PIC)
@@ -10,28 +10,48 @@ diff -urN ../x265_2.0.pic/source/CMakeLists.txt ./source/CMakeLists.txt
      endif(ENABLE_PIC)
      if(NATIVE_BUILD)
          if(INTEL_CXX)
-@@ -240,19 +240,19 @@ if(GCC)
+@@ -249,11 +249,11 @@
      endif()
      if(ARM AND CROSS_COMPILE_ARM)
-         if(ARM64)
--            set(ARM_ARGS -fPIC)
-+            set(ARM_ARGS -fPIE)
-         else()
--            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
-+            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIE)
-         endif()
          message(STATUS "cross compile arm")
+-              set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
++              set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIE)
      elseif(ARM)
-         if(ARM64)
--            set(ARM_ARGS -fPIC)
-+            set(ARM_ARGS -fPIE)
+         find_package(Neon)
+         if(CPU_HAS_NEON)
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIE)
+             add_definitions(-DHAVE_NEON)
+         else()
+             set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+@@ -265,25 +265,25 @@
+         find_package(SVE2)
+         if(CPU_HAS_SVE2 OR CROSS_COMPILE_SVE2)
+             message(STATUS "Found SVE2")
+-              set(ARM_ARGS -O3 -march=armv8-a+sve2 -fPIC -flax-vector-conversions)
++              set(ARM_ARGS -O3 -march=armv8-a+sve2 -fPIE -flax-vector-conversions)
+             add_definitions(-DHAVE_SVE2)
+             add_definitions(-DHAVE_SVE)
+             add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE2
+         elseif(CPU_HAS_SVE OR CROSS_COMPILE_SVE)
+             message(STATUS "Found SVE")
+-              set(ARM_ARGS -O3 -march=armv8-a+sve -fPIC -flax-vector-conversions)
++              set(ARM_ARGS -O3 -march=armv8-a+sve -fPIE -flax-vector-conversions)
+             add_definitions(-DHAVE_SVE)
+             add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE
+         elseif(CPU_HAS_NEON)
+             message(STATUS "Found NEON")
+-            set(ARM_ARGS -fPIC -flax-vector-conversions)
++            set(ARM_ARGS -fPIE -flax-vector-conversions)
              add_definitions(-DHAVE_NEON)
          else()
-             find_package(Neon)
-             if(CPU_HAS_NEON)
--                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
-+                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIE)
-                 add_definitions(-DHAVE_NEON)
-             else()
-                 set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
-                 set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+-            set(ARM_ARGS -fPIC -flax-vector-conversions)
++            set(ARM_ARGS -fPIE -flax-vector-conversions)
+         endif()        
+     endif()
+       if(ENABLE_PIC)
+-      list(APPEND ARM_ARGS -DPIC)
++      list(APPEND ARM_ARGS -DPIE)
+       endif()
+     add_definitions(${ARM_ARGS})
+     if(FPROFILE_GENERATE)