From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0BAD7138306 for ; Wed, 13 Jul 2016 13:24:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC5CC21C170; Wed, 13 Jul 2016 13:24:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B9AF21C1B7 for ; Wed, 13 Jul 2016 13:24:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DF51340CCA for ; Wed, 13 Jul 2016 13:24:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA0A02436 for ; Wed, 13 Jul 2016 13:24:14 +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: <1468416159.a63fbd964af5eaa53a7e8ebf845d532e35de2cff.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x264/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x264/Manifest media-libs/x264/x264-0.0.20160712.ebuild media-libs/x264/x264-9999.ebuild X-VCS-Directories: media-libs/x264/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: a63fbd964af5eaa53a7e8ebf845d532e35de2cff X-VCS-Branch: master Date: Wed, 13 Jul 2016 13:24:14 +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: ed3fa434-87b7-4fd3-851d-f0f16b09ce61 X-Archives-Hash: 81f93306b5f862a002cc2a401595fb3b commit: a63fbd964af5eaa53a7e8ebf845d532e35de2cff Author: Alexis Ballier gentoo org> AuthorDate: Wed Jul 13 13:22:39 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Wed Jul 13 13:22:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63fbd96 media-libs/x264: bump a new snapshot; drop cflags patch which shouldnt be needed these days and causes issues. Package-Manager: portage-2.3.0 media-libs/x264/Manifest | 1 + .../x264/{x264-9999.ebuild => x264-0.0.20160712.ebuild} | 12 +----------- media-libs/x264/x264-9999.ebuild | 12 +----------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index cabb7bf..499d998 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -2,3 +2,4 @@ DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024 DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3 DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24 +DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-0.0.20160712.ebuild similarity index 83% copy from media-libs/x264/x264-9999.ebuild copy to media-libs/x264/x264-0.0.20160712.ebuild index 278f1fe..1d583e0 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-0.0.20160712.ebuild @@ -35,24 +35,14 @@ RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) DOCS="AUTHORS doc/*.txt" -src_prepare() { - # Initial support for x32 ABI, bug #420241 - # Avoid messing too much with CFLAGS. - epatch "${FILESDIR}"/x264-0.0.20160523-cflags.patch -} - multilib_src_configure() { tc-export CC local asm_conf="" - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then + if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]]; then asm_conf=" --disable-asm" fi - # Upstream uses this, see the cflags patch - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse" - append-flags "-ffast-math" - "${S}/configure" \ --prefix="${EPREFIX}"/usr \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 278f1fe..1d583e0 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -35,24 +35,14 @@ RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) DOCS="AUTHORS doc/*.txt" -src_prepare() { - # Initial support for x32 ABI, bug #420241 - # Avoid messing too much with CFLAGS. - epatch "${FILESDIR}"/x264-0.0.20160523-cflags.patch -} - multilib_src_configure() { tc-export CC local asm_conf="" - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then + if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]]; then asm_conf=" --disable-asm" fi - # Upstream uses this, see the cflags patch - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse" - append-flags "-ffast-math" - "${S}/configure" \ --prefix="${EPREFIX}"/usr \ --libdir="${EPREFIX}"/usr/$(get_libdir) \