media-libs/x265: Version bump to 1.8

Package-Manager: portage-2.2.23

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index ff456413d5c6cba20530f2ca1bda90f947877ec1..154e98a00b77d8dffdc6ca78908bccc8d0b4af7d 100644 (file)
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
new file mode 100644 (file)
index 0000000..ee4a32f
--- /dev/null
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -0,0 +1,82 @@
+# 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} )"
+
+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
+}
+
+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 [ "${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/"*
+}

diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 008e9cb26a5439bc8e7d940836081b53b51be2f4..ee4a32fe9fae3cd095331bc6b3789b3b632807dd 100644 (file)
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/59"
+SLOT="0/68"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -37,7 +37,7 @@ src_unpack() {
                export S=${WORKDIR}/${P}/source
        else
                unpack ${A}
-               export S="${WORKDIR}/${PN}_${PV}/source"
+               export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
        fi
 }