commit: 3907b55b37a0fc3f64b75c016da488313ac4dfb7
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:40:34 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:40:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3907b55b
media-libs/x265: Fix automagic on numactl. Bug #555012.
Package-Manager: portage-2.2.23
media-libs/x265/metadata.xml | 1 +
media-libs/x265/{x265-9999.ebuild => x265-1.8-r1.ebuild} | 13 +++++++++----
media-libs/x265/x265-9999.ebuild | 5 +++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 5178f6f..bfc9f5c 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="10bit">Set output bit depth to 10</flag>
+ <flag name="numa">Build with support for NUMA nodes.</flag>
<flag name="pic">Disable optimized assembly code that is not PIC
friendly</flag>
</use>
</pkgmetadata>
diff --git a/media-libs/x265/x265-9999.ebuild
b/media-libs/x265/x265-1.8-r1.ebuild
similarity index 86%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-1.8-r1.ebuild
index 0d77b71..00f7e5a 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-1.8-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
@@ -21,11 +21,11 @@ HOMEPAGE="http://x265.org/";
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/75"
-IUSE="+10bit pic test"
+SLOT="0/68"
+IUSE="+10bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
@@ -41,12 +41,17 @@ src_unpack() {
fi
}
+src_prepare() {
+ epatch
"${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch"
# bug #510890
+}
+
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")
+ -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-DLIB_INSTALL_DIR="$(get_libdir)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 0d77b71..fbb609d 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -22,10 +22,10 @@ HOMEPAGE="http://x265.org/";
LICENSE="GPL-2"
# subslot = libx265 soname
SLOT="0/75"
-IUSE="+10bit pic test"
+IUSE="+10bit numa pic test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )"
@@ -47,6 +47,7 @@ multilib_src_configure() {
local mycmakeargs=(
$(cmake-utils_use_enable test TESTS)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-DLIB_INSTALL_DIR="$(get_libdir)"
)
