diff options
author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2016-09-03 15:29:29 +0100 |
---|---|---|
committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2016-09-04 00:07:43 +0100 |
commit | 676c23935f8bed8c25e82c43bc9eb0237fd1a4f8 (patch) | |
tree | 10c981ae904b339dd7369d7f4e352ad528c8a549 /media-libs | |
parent | flx/flx: Refresh patches (diff) | |
download | portage-676c23935f8bed8c25e82c43bc9eb0237fd1a4f8.tar.xz |
media-libs/x265: Drop x32 patches
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/x265/Manifest | 4 | ||||
-rw-r--r-- | media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch | 35 | ||||
-rw-r--r-- | media-libs/x265/metadata.xml | 11 | ||||
-rw-r--r-- | media-libs/x265/x265-1.8.ebuild | 94 |
4 files changed, 0 insertions, 144 deletions
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest deleted file mode 100644 index 20a5b9f1..00000000 --- a/media-libs/x265/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 1.8-build-Disable-march-selection-from-CMakeLists.txt.patch 1136 SHA256 42ef279f98bee2791a49112297cbc1a1a27432ab7345e54f848dcda9afd61f4b WHIRLPOOL 5a7acebfc8dee4f3cf77a817eafe1487ec55051cd82bc6ac961419f270610570d54ec3e60f3cf9d4257e5379a76efa9d68f59a746bdfe2e3ef2986198b43020a -DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb -EBUILD x265-1.8.ebuild 2207 SHA256 ac9e8c859ee6d919f51e376599267cc4d7ad4dfc0072077135c34c938005f673 WHIRLPOOL 7e1580860846c6405ff56a82017bb6f56351db5da1b84236a0c6de0512c1e429c69f3e387dfe6b8ee03c867e5372c72a1f9167d48a61f99a3768575087b027da -MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6 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 33ee2546..00000000 --- a/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/metadata.xml b/media-libs/x265/metadata.xml deleted file mode 100644 index f62a466f..00000000 --- a/media-libs/x265/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>video</herd> - <maintainer> - <email>media-video@gentoo.org</email> - </maintainer> - <use> - <flag name="10bit">Set output bit depth to 10.</flag> - </use> -</pkgmetadata> diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild deleted file mode 100644 index 3cb337ae..00000000 --- a/media-libs/x265/x265-1.8.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-multilib multilib flag-o-matic - -if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" -else - SRC_URI=" - https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz - http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" - -LICENSE="GPL-2" -# subslot = libx265 soname -SLOT="0/68" -IUSE="+10bit test" - -ASM_DEPEND=">=dev-lang/yasm-1.2.0" -RDEPEND="" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} )" - -ASM_MULTILIB_ABIS="abi_x86_32 abi_x86_64" - -src_unpack() { - if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source - else - unpack ${A} - export S="$(echo "${WORKDIR}/${PN}_"*"/source")" - fi -} - -src_prepare() { - epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" -} - -multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC - local mycmakeargs=( - $(cmake-utils_use_enable test TESTS) - $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") - -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF") - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - if has ${MULTILIB_ABI_FLAG} ${ASM_MULTILIB_ABIS} ; then - mycmakeargs+=( "-DENABLE_ASSEMBLY=ON" ) - else - mycmakeargs+=( "-DENABLE_ASSEMBLY=OFF" ) - fi - - if [ "${ABI}" = x86 ] ; then - use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)" - mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF ) - fi - - cmake-utils_src_configure -} - -src_configure() { - multilib_parallel_foreach_abi multilib_src_configure -} - -multilib_src_test() { - if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then - cd "${BUILD_DIR}/test" || die - for i in TestBench ; do - ./${i} || die - done - fi -} - -src_test() { - multilib_foreach_abi multilib_src_test -} - -src_install() { - cmake-multilib_src_install - dodoc -r "${S}/../doc/"* -} |