media-libs/x265: Sync with upstream

Package-Manager: portage-2.2.20.1

4 files changed, 31 insertions, 16 deletions

diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog
index 24cae3c9..2ce8e782 100644
--- a/media-libs/x265/ChangeLog
+++ b/media-libs/x265/ChangeLog
@@ -1,3 +1,9 @@
+*x265-1.7 (09 Oct 2015)
+
+  09 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh> +x265-1.7.ebuild,
+  -x265-1.2.ebuild:
+  media-libs/x265: Sync with upstream
+
   15 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh> x265-1.2.ebuild:
   Remove malformed Id headers
 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index b06f8e2c..5b53492f 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,4 +1,4 @@
-DIST x265-1.2.tar.bz2 573907 SHA256 5f5ae7b9cf73b6ecaa1d169fd9f68f3efad75b0d23f504eeca92d57b3f0cb829 WHIRLPOOL a7da95ef7740f96aa66c4490e28b53750c4c666187db6a52666eca3748fa5023da1ad4224f39a1c1d49dfd5259635ce99645351244a7113e6d429aa716c6a12f
-EBUILD x265-1.2.ebuild 1765 SHA256 93a73154d9efd3ec6e5b5c7e7d23e10e385ca9c451ec0a3ba25892bf76631f13 WHIRLPOOL bb22ee0f09c4e36da237c1010a06cd3e22c0cbadfa3ae13a0a50cf07cdc0cb5495a0a2e8272acef89c49c118f1ddceade9011477818a6eada367cb3123cc9900
-MISC ChangeLog 294 SHA256 4f279de3d6b3dcab89cb5454f016dddc4fb1201ccc3be0896ae4097784c53d84 WHIRLPOOL dfead8c7116b56487ef3058b8fd14a49ab0e9c1f359890cf4d1faddba0d8e061605395b3a99681d79bda361ddb28c2242ae9604469dd917c5cd4d61fc9b16984
+DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
+EBUILD x265-1.7.ebuild 2096 SHA256 de2d0e4dacb31690f919555e6f3e4c04516c693fd8c05e5eb8de3821656c02e5 WHIRLPOOL 40f155c1ba59ef58c1fb13e96a9225c3681a51b5c561cf569ff4d4c81f8fac7653e8beb9d0e98659019476efadeb355b3378b6b684a1a4474ed2fb9b737b61f1
+MISC ChangeLog 451 SHA256 9d0294daf2f5ce99d9176b9bcfcb15872ab11cf0a69d7c1fd0ac00643838c1fe WHIRLPOOL df93837ddf0168d50e1a5b40cd6d93f0979588d8cdc9d97040801c3ac0e41a6fd2c4a74728b4a589828dd1546531ac16b07e4b81b0b239a2ae65854bfc78e168
 MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6
diff --git a/media-libs/x265/x265-1.2.ebuild b/media-libs/x265/x265-1.7.ebuild
index 1895d58c..332f6551 100644
--- a/media-libs/x265/x265-1.2.ebuild
+++ b/media-libs/x265/x265-1.7.ebuild
@@ -8,10 +8,12 @@ inherit cmake-multilib multilib flag-o-matic
 
 if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
+	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"
@@ -19,7 +21,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/25"
+SLOT="0/59"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -37,7 +39,7 @@ src_unpack() {
 		export S=${WORKDIR}/${P}/source
 	else
 		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
+		export S="${WORKDIR}/${PN}_${PV}/source"
 	fi
 }
 
@@ -57,6 +59,11 @@ multilib_src_configure() {
 		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
 }
 
@@ -65,10 +72,12 @@ src_configure() {
 }
 
 multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
+	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() {
diff --git a/metadata/md5-cache/media-libs/x265-1.2 b/metadata/md5-cache/media-libs/x265-1.7
index ac49e3b6..065c4a1b 100644
--- a/metadata/md5-cache/media-libs/x265-1.2
+++ b/metadata/md5-cache/media-libs/x265-1.7
@@ -4,9 +4,9 @@ DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=5
 HOMEPAGE=http://x265.org/
 IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-SLOT=0/25
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.2.tar.bz2 -> x265-1.2.tar.bz2
+SLOT=0/59
+SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.7.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.7.tar.gz
 _eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=46d516dcf91affa060dccc8b12f4adc9
+_md5_=1eca14ddfe39bc8565e3d8793972da9e