diff options
author | Alexis Ballier <aballier@gentoo.org> | 2017-02-24 09:55:07 +0100 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2017-02-24 09:59:34 +0100 |
commit | 14baa3374376db3e76f3cb8573d967c1dd416680 (patch) | |
tree | 69f937785800743e2cdc39af8ea6aaa4b58fc6bd /media-libs/x265/files | |
parent | dev-vcs/tortoisehg: Removed old. (diff) | |
download | gentoo-14baa3374376db3e76f3cb8573d967c1dd416680.tar.gz gentoo-14baa3374376db3e76f3cb8573d967c1dd416680.tar.bz2 gentoo-14baa3374376db3e76f3cb8573d967c1dd416680.zip |
media-libs/x265: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'media-libs/x265/files')
-rw-r--r-- | media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch | 37 | ||||
-rw-r--r-- | media-libs/x265/files/1.8-extralibs_order.patch | 29 |
2 files changed, 0 insertions, 66 deletions
diff --git a/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch b/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch deleted file mode 100644 index a2e8f0d0477b..000000000000 --- a/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bitbucket.org/multicoreware/x265/pull-requests/21 - -From e89069148db716d30fb81c798d0cfd83250a9f5a Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sat, 10 Oct 2015 00:05:41 +0100 -Subject: [PATCH] build: Disable -march selection from CMakeLists.txt - -x32 arch as defined on https://sites.google.com/site/x32abi is neither -X86 nor X64, then forcing -march=i686 leads to build failure as wrong --march is used. - -Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong - -As a global sanity sake, disable all forced -march in CMakeLists ---- - source/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 764d5f2..fbc0d49 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -167,14 +167,7 @@ if(GCC) - if(NATIVE_BUILD) - if(INTEL_CXX) - add_definitions(-xhost) -- else() -- add_definitions(-march=native) - endif() -- elseif(X86 AND NOT X64) -- add_definitions(-march=i686) -- endif() -- if(ARM) -- add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp) - endif() - if(FPROFILE_GENERATE) - if(INTEL_CXX) diff --git a/media-libs/x265/files/1.8-extralibs_order.patch b/media-libs/x265/files/1.8-extralibs_order.patch deleted file mode 100644 index e30c0f96573c..000000000000 --- a/media-libs/x265/files/1.8-extralibs_order.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bitbucket.org/multicoreware/x265/pull-requests/22 - -Link EXTRA_LIB before PLATFORM_LIBS since they're static libraries and as-needed -might drop required libraries if they come after. - -Index: x265_11047/source/CMakeLists.txt -=================================================================== ---- x265_11047.orig/source/CMakeLists.txt -+++ x265_11047/source/CMakeLists.txt -@@ -455,6 +455,9 @@ option(ENABLE_SHARED "Build shared libra - if(ENABLE_SHARED) - add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS} - ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>) -+ if(EXTRA_LIB) -+ target_link_libraries(x265-shared ${EXTRA_LIB}) -+ endif() - target_link_libraries(x265-shared ${PLATFORM_LIBS}) - if(MSVC) - set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265) -@@ -480,9 +483,6 @@ if(ENABLE_SHARED) - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${BIN_INSTALL_DIR}) - endif() -- if(EXTRA_LIB) -- target_link_libraries(x265-shared ${EXTRA_LIB}) -- endif() - if(LINKER_OPTIONS) - # set_target_properties can't do list expansion - string(REPLACE ";" " " LINKER_OPTION_STR "${LINKER_OPTIONS}") |