media-libs/x265: bump to 1.9.
authorAlexis Ballier <aballier@gentoo.org>
Fri, 29 Jan 2016 18:59:45 +0000 (19:59 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Fri, 29 Jan 2016 18:59:54 +0000 (19:59 +0100)
Enable 12bit by default since it is no more experimental.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
media-libs/x265/Manifest
media-libs/x265/x265-1.9.ebuild [new file with mode: 0644]
media-libs/x265/x265-9999.ebuild

index 154e98a00b77d8dffdc6ca78908bccc8d0b4af7d..977da6086502ec2cf35a1020d11b4536a93d4122 100644 (file)
@@ -1,3 +1,4 @@
 DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
 DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
 DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
+DIST x265_1.9.tar.gz 956101 SHA256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 SHA512 1c399101374da58d0661786a6144dd25a2028e25bcb99b3084d8839b0bd9c20bccf5c0e4413882f16b3b1c49f96710746a16cb690f3811dffb08c3befdc8e5f1 WHIRLPOOL 508d21ad0ff7ed8eb2fe9a9a69113dc7dca07306ddace6de22b29e71dad7242fae0b6e4864a409a0279d85adbe054b4ffbc8c95fe915163b506f5bab25245f8c
diff --git a/media-libs/x265/x265-1.9.ebuild b/media-libs/x265/x265-1.9.ebuild
new file mode 100644 (file)
index 0000000..9e5db6a
--- /dev/null
@@ -0,0 +1,171 @@
+# 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 ~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/79"
+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
+}
+
+# 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")
+               -DENABLE_LIBNUMA=$(usex numa ON OFF)
+               -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/"*
+}
index 21f4143a1848c01d2f8238e4094bfae1d33b4e65..9652a58cb01746f2a548fe4231992d05e39cea0a 100644 (file)
@@ -21,8 +21,8 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/68"
-IUSE="+10bit 12bit numa pic test"
+SLOT="0/80"
+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}] )"
@@ -121,7 +121,7 @@ multilib_src_configure() {
        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)
+               -DENABLE_LIBNUMA=$(usex numa ON OFF)
                -DLIB_INSTALL_DIR="$(get_libdir)"
        )