diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2015-10-10 00:13:13 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2015-10-10 00:14:45 +0100 |
| commit | 44dbc153044190dd74b0b69f318bbf5a4c1dce2d (patch) | |
| tree | 5cc9c5255bad76f7987158e1ebad93b41fea524b | |
| parent | media-libs/x265: Sync with upstream (diff) | |
| download | portage-44dbc153044190dd74b0b69f318bbf5a4c1dce2d.tar.xz | |
media-libs/x265: Add patch to disable automagic march setup
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | media-libs/x265/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/x265/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/x265/files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch | 28 | ||||
| -rw-r--r-- | media-libs/x265/x265-1.7.ebuild | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/media-libs/x265-1.7 | 2 |
5 files changed, 41 insertions, 3 deletions
diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog index 2ce8e782..ba8bbb21 100644 --- a/media-libs/x265/ChangeLog +++ b/media-libs/x265/ChangeLog @@ -1,3 +1,8 @@ + 09 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh> + +files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch, + x265-1.7.ebuild: + media-libs/x265: Add patch to disable automagic march setup + *x265-1.7 (09 Oct 2015) 09 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh> +x265-1.7.ebuild, diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index 5b53492f..136f5f9b 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -1,4 +1,5 @@ +AUX 1.7-build-Disable-march-selection-from-CMakeLists.txt.patch 852 SHA256 b94fe4a6912cd118028e560dac7c2561641f49ec37361233bb769fca090538bd WHIRLPOOL 5d78f182b2aee6ff3516716d31c6a0bfbbc11677485981bc11801c3adc87654f1ab44563aa31a4b84f1ab171b6aad2bcf5d2625e22e0166a277ba1e086410881 DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744 -EBUILD x265-1.7.ebuild 2096 SHA256 de2d0e4dacb31690f919555e6f3e4c04516c693fd8c05e5eb8de3821656c02e5 WHIRLPOOL 40f155c1ba59ef58c1fb13e96a9225c3681a51b5c561cf569ff4d4c81f8fac7653e8beb9d0e98659019476efadeb355b3378b6b684a1a4474ed2fb9b737b61f1 -MISC ChangeLog 451 SHA256 9d0294daf2f5ce99d9176b9bcfcb15872ab11cf0a69d7c1fd0ac00643838c1fe WHIRLPOOL df93837ddf0168d50e1a5b40cd6d93f0979588d8cdc9d97040801c3ac0e41a6fd2c4a74728b4a589828dd1546531ac16b07e4b81b0b239a2ae65854bfc78e168 +EBUILD x265-1.7.ebuild 2199 SHA256 edec878b2ea9718a7d41b1bc5a62bc9492a9bd5290e1893879bc69473815b145 WHIRLPOOL 34151484c4b1881882ab373026fcc37c19feae1096be9a6c3226f21f2373af2fbcf037c091ea3c158ab9c01d646095bec4bb42bfa91319acbaeea51b262a930c +MISC ChangeLog 658 SHA256 a025b2d56e7d755cf708bc42cf8879da7ae2eb9fdcd76981934bd289f4b42d46 WHIRLPOOL afb8eac7833a5a5c7ba1f369a54cb09520d1bd81130914a96ca936a8267ef621299272fa3d3627e3d51e8c6bf6d13bf1f0a38e2e53a4100cc780fe77a613a28b MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6 diff --git a/media-libs/x265/files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch b/media-libs/x265/files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch new file mode 100644 index 00000000..7121e5fd --- /dev/null +++ b/media-libs/x265/files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch @@ -0,0 +1,28 @@ +From 1793fdd78fa3dd925834b89ce7ae95007ce06107 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 + +--- + 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/x265-1.7.ebuild b/media-libs/x265/x265-1.7.ebuild index 332f6551..7de4ae5f 100644 --- a/media-libs/x265/x265-1.7.ebuild +++ b/media-libs/x265/x265-1.7.ebuild @@ -43,6 +43,10 @@ src_unpack() { fi } +src_prepare() { + epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" +} + multilib_src_configure() { append-cflags -fPIC append-cxxflags -fPIC diff --git a/metadata/md5-cache/media-libs/x265-1.7 b/metadata/md5-cache/media-libs/x265-1.7 index 065c4a1b..f789e2bd 100644 --- a/metadata/md5-cache/media-libs/x265-1.7 +++ b/metadata/md5-cache/media-libs/x265-1.7 @@ -9,4 +9,4 @@ LICENSE=GPL-2 SLOT=0/59 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.7.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.7.tar.gz _eclasses_=cmake-multilib e82cd2608890af2e6a4965cc715b0135 cmake-utils f474224ef49d530640a43a04ae94928e eutils 43da5163ba106e87d22d2e7d6d67537f flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d -_md5_=1eca14ddfe39bc8565e3d8793972da9e +_md5_=63db52b72e3e30f13f54b46a44932f8a |