media-libs/x265: Sync with upstream

Package-Manager: portage-2.2.20.1

5 files changed, 26 insertions, 10 deletions

diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog
index ba8bbb21..4b53d943 100644
--- a/media-libs/x265/ChangeLog
+++ b/media-libs/x265/ChangeLog
@@ -1,3 +1,12 @@
+*x265-1.8 (11 Oct 2015)
+
+  11 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch,
+  +x265-1.8.ebuild,
+  -files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch,
+  -x265-1.7.ebuild:
+  media-libs/x265: Sync with upstream
+
   09 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
   +files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch,
   x265-1.7.ebuild:
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 136f5f9b..70dc7478 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,5 +1,5 @@
-AUX 1.7-build-Disable-march-selection-from-CMakeLists.txt.patch 852 SHA256 b94fe4a6912cd118028e560dac7c2561641f49ec37361233bb769fca090538bd WHIRLPOOL 5d78f182b2aee6ff3516716d31c6a0bfbbc11677485981bc11801c3adc87654f1ab44563aa31a4b84f1ab171b6aad2bcf5d2625e22e0166a277ba1e086410881
-DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
-EBUILD x265-1.7.ebuild 2199 SHA256 edec878b2ea9718a7d41b1bc5a62bc9492a9bd5290e1893879bc69473815b145 WHIRLPOOL 34151484c4b1881882ab373026fcc37c19feae1096be9a6c3226f21f2373af2fbcf037c091ea3c158ab9c01d646095bec4bb42bfa91319acbaeea51b262a930c
-MISC ChangeLog 658 SHA256 a025b2d56e7d755cf708bc42cf8879da7ae2eb9fdcd76981934bd289f4b42d46 WHIRLPOOL afb8eac7833a5a5c7ba1f369a54cb09520d1bd81130914a96ca936a8267ef621299272fa3d3627e3d51e8c6bf6d13bf1f0a38e2e53a4100cc780fe77a613a28b
+AUX 1.8-build-Disable-march-selection-from-CMakeLists.txt.patch 1136 SHA256 42ef279f98bee2791a49112297cbc1a1a27432ab7345e54f848dcda9afd61f4b WHIRLPOOL 5a7acebfc8dee4f3cf77a817eafe1487ec55051cd82bc6ac961419f270610570d54ec3e60f3cf9d4257e5379a76efa9d68f59a746bdfe2e3ef2986198b43020a
+DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
+EBUILD x265-1.8.ebuild 2207 SHA256 ac9e8c859ee6d919f51e376599267cc4d7ad4dfc0072077135c34c938005f673 WHIRLPOOL 7e1580860846c6405ff56a82017bb6f56351db5da1b84236a0c6de0512c1e429c69f3e387dfe6b8ee03c867e5372c72a1f9167d48a61f99a3768575087b027da
+MISC ChangeLog 957 SHA256 e3d677f208548a35e94496afe8f57112b574e4f731371eaef06fd6e0b7d5323b WHIRLPOOL 66a5fd0ae1df79ce4117bf8eaef04cf444818130883361a7d99ee1285942e1e57987221913837d0dd8b60a5c81b7dc0eb3d7b3186e4247cc497ece99905bdde3
 MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6
diff --git a/media-libs/x265/files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch b/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch
index 7121e5fd..33ee2546 100644
--- a/media-libs/x265/files/1.7-build-Disable-march-selection-from-CMakeLists.txt.patch
+++ b/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch
@@ -1,8 +1,15 @@
-From 1793fdd78fa3dd925834b89ce7ae95007ce06107 Mon Sep 17 00:00:00 2001
+From e89069148db716d30fb81c798d0cfd83250a9f5a Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 10 Oct 2015 00:05:41 +0100
 Subject: [PATCH] build: Disable -march selection from CMakeLists.txt
 
+x32 arch as defined on https://sites.google.com/site/x32abi is neither
+X86 nor X64, then forcing -march=i686 leads to build failure as wrong
+-march is used.
+
+Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong
+
+As a global sanity sake, disable all forced -march in CMakeLists
 ---
  source/CMakeLists.txt | 7 -------
  1 file changed, 7 deletions(-)
diff --git a/media-libs/x265/x265-1.7.ebuild b/media-libs/x265/x265-1.8.ebuild
index 7de4ae5f..3cb337ae 100644
--- a/media-libs/x265/x265-1.7.ebuild
+++ b/media-libs/x265/x265-1.8.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"
@@ -39,7 +39,7 @@ src_unpack() {
 		export S=${WORKDIR}/${P}/source
 	else
 		unpack ${A}
-		export S="${WORKDIR}/${PN}_${PV}/source"
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
 	fi
 }
 
diff --git a/metadata/md5-cache/media-libs/x265-1.7 b/metadata/md5-cache/media-libs/x265-1.8
index f789e2bd..7be25be8 100644
--- a/metadata/md5-cache/media-libs/x265-1.7
+++ b/metadata/md5-cache/media-libs/x265-1.8
@@ -6,7 +6,7 @@ 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 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-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
+SLOT=0/68
+SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.8.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.8.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_=63db52b72e3e30f13f54b46a44932f8a
+_md5_=03df608c807aab4a453ab2537e2340e5