Always compile x265 as PIC

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 46b061a524cdede8ce4ddfec7899223cbb94d21b..3066e4cb6973d7db3feb0986f52d92cd3712ee48 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -62,11 +62,7 @@ LIBX265        = x265_$(LIBX265_VER)
 LIBX265_TB     = $(LIBX265).tar.gz
 LIBX265_URL    = https://bitbucket.org/multicoreware/x265_git/downloads/$(LIBX265_TB)
 LIBX265_SHA1   = 51fc4592a9f1e340d87a51233361cc5a3ffd739d
-ifeq ($(CONFIG_PIE),yes)
-LIBX265_DIFFS  = libx265.pie.diff
-else
 LIBX265_DIFFS  = libx265.pic.diff
-endif
 LIBX265_DIFFS  += libx265-silence.patch
 
 LIBVPX_VER     = 1.14.0

diff --git a/support/patches/libx265.pie.diff b/support/patches/libx265.pie.diff
deleted file mode 100644 (file)
index 9fbb6ea..0000000
--- a/support/patches/libx265.pie.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-@@ -229,7 +229,7 @@
-     add_definitions(-D__STDC_LIMIT_MACROS=1)
-     add_definitions(-std=gnu++98)
-     if(ENABLE_PIC)
--         add_definitions(-fPIC)
-+         add_definitions(-fPIE)
-     endif(ENABLE_PIC)
-     if(NATIVE_BUILD)
-         if(INTEL_CXX)
-@@ -249,11 +249,11 @@
-     endif()
-     if(ARM AND CROSS_COMPILE_ARM)
-         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)
-         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()
--            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)