From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E760213888F for ; Thu, 15 Oct 2015 16:40:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1086421C00C; Thu, 15 Oct 2015 16:40:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A050821C00C for ; Thu, 15 Oct 2015 16:40:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C7803409E6 for ; Thu, 15 Oct 2015 16:40:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECEEEB81 for ; Thu, 15 Oct 2015 16:40:19 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1444927186.04e534d294b0e5fc030c2a5bc4a784f0d9b00e30.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x265/metadata.xml media-libs/x265/x265-1.8-r1.ebuild media-libs/x265/x265-1.8-r2.ebuild media-libs/x265/x265-9999.ebuild X-VCS-Directories: media-libs/x265/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 04e534d294b0e5fc030c2a5bc4a784f0d9b00e30 X-VCS-Branch: master Date: Thu, 15 Oct 2015 16:40:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 91607654-64b0-4379-be06-c2c4f46420d2 X-Archives-Hash: b74f95bd9a531acd647cdc9d04db3cc4 commit: 04e534d294b0e5fc030c2a5bc4a784f0d9b00e30 Author: Alexis Ballier gentoo org> AuthorDate: Thu Oct 15 16:39:16 2015 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Oct 15 16:39:46 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e534d2 media-libs/x265: Add support for 8, 10 & 12bit simultaneous support. Rework the ebuild on top of multilib-minimal, use multibuild to build the 8, 10 & 12 bit variant, and use upstream documented way to build a library capable of producing 8 (default), 10 or 12 bits HEVC files. Package-Manager: portage-2.2.23 media-libs/x265/metadata.xml | 3 +- media-libs/x265/x265-1.8-r1.ebuild | 95 -------------------- media-libs/x265/x265-1.8-r2.ebuild | 175 +++++++++++++++++++++++++++++++++++++ media-libs/x265/x265-9999.ebuild | 116 ++++++++++++++++++++---- 4 files changed, 275 insertions(+), 114 deletions(-) diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml index bfc9f5c..86339aa 100644 --- a/media-libs/x265/metadata.xml +++ b/media-libs/x265/metadata.xml @@ -6,7 +6,8 @@ media-video@gentoo.org - Set output bit depth to 10 + Add support for producing 10bits HEVC. + Add support for producing 12bits HEVC. Build with support for NUMA nodes. Disable optimized assembly code that is not PIC friendly diff --git a/media-libs/x265/x265-1.8-r1.ebuild b/media-libs/x265/x265-1.8-r1.ebuild deleted file mode 100644 index 00f7e5a..0000000 --- a/media-libs/x265/x265-1.8-r1.ebuild +++ /dev/null @@ -1,95 +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 ~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 numa pic test" - -ASM_DEPEND=">=dev-lang/yasm-1.2.0" -RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} )" - -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" # 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)" - ) - - 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 ) - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - - cmake-utils_src_configure -} - -src_configure() { - multilib_parallel_foreach_abi multilib_src_configure -} - -multilib_src_test() { - if [ -x "${BUILD_DIR}/test/TestBench" ] ; then - "${BUILD_DIR}/test/TestBench" || die - else - einfo "Unit tests check only assembly, and you do not seem to have any." - einfo "Skipping tests." - fi -} - -src_test() { - multilib_foreach_abi multilib_src_test -} - -src_install() { - cmake-multilib_src_install - dodoc -r "${S}/../doc/"* -} diff --git a/media-libs/x265/x265-1.8-r2.ebuild b/media-libs/x265/x265-1.8-r2.ebuild new file mode 100644 index 0000000..a93ea1d --- /dev/null +++ b/media-libs/x265/x265-1.8-r2.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils multilib-minimal multilib multibuild 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 ~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 12bit numa pic test" + +ASM_DEPEND=">=dev-lang/yasm-1.2.0" +RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + abi_x86_32? ( ${ASM_DEPEND} ) + abi_x86_64? ( ${ASM_DEPEND} )" + +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" # bug #510890 +} + +# By default, the library and the encoder is configured for only one output bit +# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC +# files with a different bit depth, which is annoying. However, upstream +# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all +# that together so that the resulting library can produce all three of them +# instead of only one. +# The API requires the bit depth parameter, so that libx265 can then chose which +# variant of the encoder to use. +# To achieve this, we have to build one (static) library for each non-main +# variant, and link it into the main library. +# Upstream documents using the 8bit variant as main library, hence we do not +# allow disabling it: "main" *MUST* come last in the following list. + +x265_get_variants() { + local variants="" + use 12bit && variants+="main12 " + use 10bit && variants+="main10 " + variants+="main" + echo "${variants}" +} + +x265_variant_src_configure() { + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + + local mycmakeargs=( "${myabicmakeargs[@]}" ) + case "${MULTIBUILD_VARIANT}" in + "main12") + mycmakeargs+=( + -DHIGH_BIT_DEPTH=ON + -DEXPORT_C_API=OFF + -DENABLE_SHARED=OFF + -DENABLE_CLI=OFF + -DMAIN12=ON + ) + if [[ ${ABI} = x86 ]] ; then + mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi + ;; + "main10") + mycmakeargs+=( + -DHIGH_BIT_DEPTH=ON + -DEXPORT_C_API=OFF + -DENABLE_SHARED=OFF + -DENABLE_CLI=OFF + ) + if [[ ${ABI} = x86 ]] ; then + mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi + ;; + "main") + if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then + local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) + unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] + local liblist="" + for v in "${myvariants[@]}" ; do + ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die + liblist+="libx265_${v}.a;" + done + mycmakeargs+=( + -DEXTRA_LIB="${liblist}" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=$(usex 10bit) + -DLINKED_12BIT=$(usex 12bit) + ) + fi + ;; + *) + die "Unknown variant: ${MULTIBUILD_VARIANT}";; + esac + cmake-utils_src_configure + popd >/dev/null || die +} + +multilib_src_configure() { + append-cflags -fPIC + append-cxxflags -fPIC + local myabicmakeargs=( + $(cmake-utils_use_enable test TESTS) + $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON) + -DLIB_INSTALL_DIR="$(get_libdir)" + ) + + if [[ ${ABI} = x86 ]] ; then + # Bug #528202 + if use pic ; then + ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi + elif [[ ${ABI} = x32 ]] ; then + # bug #510890 + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi + + local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) + multibuild_foreach_variant x265_variant_src_configure +} + +multilib_src_compile() { + local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) + multibuild_foreach_variant cmake-utils_src_compile +} + +x265_variant_src_test() { + if [ -x "${BUILD_DIR}/test/TestBench" ] ; then + "${BUILD_DIR}/test/TestBench" || die + else + einfo "Unit tests check only assembly." + einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}" + einfo "Skipping tests." + fi +} + +multilib_src_test() { + local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) + multibuild_foreach_variant x265_variant_src_test +} + +multilib_src_install() { + # Install only "main" variant since the others are already linked into it. + local MULTIBUILD_VARIANTS=( "main" ) + multibuild_foreach_variant cmake-utils_src_install +} + +multilib_src_install_all() { + dodoc -r "${S}/../doc/"* +} diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index fbb609d..21f4143 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-multilib multilib flag-o-matic +inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic if [[ ${PV} = 9999* ]]; then inherit mercurial @@ -21,8 +21,8 @@ HOMEPAGE="http://x265.org/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/75" -IUSE="+10bit numa pic test" +SLOT="0/68" +IUSE="+10bit 12bit numa pic test" ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" @@ -41,51 +41,131 @@ src_unpack() { fi } +# By default, the library and the encoder is configured for only one output bit +# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC +# files with a different bit depth, which is annoying. However, upstream +# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all +# that together so that the resulting library can produce all three of them +# instead of only one. +# The API requires the bit depth parameter, so that libx265 can then chose which +# variant of the encoder to use. +# To achieve this, we have to build one (static) library for each non-main +# variant, and link it into the main library. +# Upstream documents using the 8bit variant as main library, hence we do not +# allow disabling it: "main" *MUST* come last in the following list. + +x265_get_variants() { + local variants="" + use 12bit && variants+="main12 " + use 10bit && variants+="main10 " + variants+="main" + echo "${variants}" +} + +x265_variant_src_configure() { + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + + local mycmakeargs=( "${myabicmakeargs[@]}" ) + case "${MULTIBUILD_VARIANT}" in + "main12") + mycmakeargs+=( + -DHIGH_BIT_DEPTH=ON + -DEXPORT_C_API=OFF + -DENABLE_SHARED=OFF + -DENABLE_CLI=OFF + -DMAIN12=ON + ) + if [[ ${ABI} = x86 ]] ; then + mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi + ;; + "main10") + mycmakeargs+=( + -DHIGH_BIT_DEPTH=ON + -DEXPORT_C_API=OFF + -DENABLE_SHARED=OFF + -DENABLE_CLI=OFF + ) + if [[ ${ABI} = x86 ]] ; then + mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi + ;; + "main") + if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then + local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) + unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] + local liblist="" + for v in "${myvariants[@]}" ; do + ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die + liblist+="libx265_${v}.a;" + done + mycmakeargs+=( + -DEXTRA_LIB="${liblist}" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=$(usex 10bit) + -DLINKED_12BIT=$(usex 12bit) + ) + fi + ;; + *) + die "Unknown variant: ${MULTIBUILD_VARIANT}";; + esac + cmake-utils_src_configure + popd >/dev/null || die +} + multilib_src_configure() { append-cflags -fPIC append-cxxflags -fPIC - local mycmakeargs=( + local myabicmakeargs=( $(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)" ) 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 ) # Bug #528202 if use pic ; then ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi elif [[ ${ABI} = x32 ]] ; then # bug #510890 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - cmake-utils_src_configure + local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) + multibuild_foreach_variant x265_variant_src_configure } -src_configure() { - multilib_parallel_foreach_abi multilib_src_configure +multilib_src_compile() { + local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) + multibuild_foreach_variant cmake-utils_src_compile } -multilib_src_test() { +x265_variant_src_test() { if [ -x "${BUILD_DIR}/test/TestBench" ] ; then "${BUILD_DIR}/test/TestBench" || die else - einfo "Unit tests check only assembly, and you do not seem to have any." + einfo "Unit tests check only assembly." + einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}" einfo "Skipping tests." fi } -src_test() { - multilib_foreach_abi multilib_src_test +multilib_src_test() { + local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) + multibuild_foreach_variant x265_variant_src_test +} + +multilib_src_install() { + # Install only "main" variant since the others are already linked into it. + local MULTIBUILD_VARIANTS=( "main" ) + multibuild_foreach_variant cmake-utils_src_install } -src_install() { - cmake-multilib_src_install +multilib_src_install_all() { dodoc -r "${S}/../doc/"* }