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 306E7138330 for ; Fri, 23 Sep 2016 16:27:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F123621C06C; Fri, 23 Sep 2016 16:27:15 +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 2BF8921C04E for ; Fri, 23 Sep 2016 16:27:15 +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 713A13408A2 for ; Fri, 23 Sep 2016 16:27:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BFAE248C for ; Fri, 23 Sep 2016 16:27:11 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1474648015.acbdb2218f946d8114130f209aecdeb7c627e942.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libvpx/files/, media-libs/libvpx/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch media-libs/libvpx/libvpx-1.6.0-r1.ebuild X-VCS-Directories: media-libs/libvpx/files/ media-libs/libvpx/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: acbdb2218f946d8114130f209aecdeb7c627e942 X-VCS-Branch: master Date: Fri, 23 Sep 2016 16:27:11 +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: 2c960660-b78d-48b9-9074-ffc495d2eeff X-Archives-Hash: d99874d74b08457505a018374a3351c9 commit: acbdb2218f946d8114130f209aecdeb7c627e942 Author: Mike Gilbert gentoo org> AuthorDate: Fri Sep 23 16:25:51 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Sep 23 16:26:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbdb221 media-libs/libvpx: port to EAPI 6 Package-Manager: portage-2.3.0_p43 .../files/libvpx-1.3.0-sparc-configure.patch | 4 +- media-libs/libvpx/libvpx-1.6.0-r1.ebuild | 49 +++++++++------------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch b/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch index dc3f6c9..2ddea4d 100644 --- a/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch +++ b/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch @@ -1,5 +1,5 @@ ---- configure~ 2014-01-10 21:12:42.000000000 +0100 -+++ configure 2014-04-05 12:51:51.794638686 +0200 +--- a/configure ++++ b/configure @@ -109,6 +109,7 @@ all_platforms="${all_platforms} ppc64-darwin9-gcc" all_platforms="${all_platforms} ppc64-linux-gcc" diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild index 659cbb7..7986feb 100644 --- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild +++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild @@ -2,31 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils multilib toolchain-funcs multilib-minimal +EAPI=6 +inherit toolchain-funcs multilib-minimal LIBVPX_TESTDATA_VER=1.6.0 -if [[ ${PV} == *9999* ]]; then - inherit git-2 - EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git" -elif [[ ${PV} == *pre* ]]; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -else - SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -fi -# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing -# it. -SRC_URI="${SRC_URI} - test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )" - DESCRIPTION="WebM VP8 and VP9 Codec SDK" HOMEPAGE="http://www.webmproject.org" +SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )" LICENSE="BSD" SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads" RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" @@ -46,8 +34,19 @@ REQUIRED_USE=" cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) " -src_prepare() { - epatch "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010 +PATCHES=( + "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010 +) + +src_configure() { + # https://bugs.gentoo.org/show_bug.cgi?id=384585 + # https://bugs.gentoo.org/show_bug.cgi?id=465988 + # copied from php-pear-r1.eclass + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/ + addpredict /var/lib/net-snmp/mib_indexes + addpredict /session_mm_cli0.sem + multilib-minimal_src_configure } multilib_src_configure() { @@ -61,21 +60,13 @@ multilib_src_configure() { x86_64*) export AS=yasm;; esac - # https://bugs.gentoo.org/show_bug.cgi?id=384585 - # https://bugs.gentoo.org/show_bug.cgi?id=465988 - # copied from php-pear-r1.eclass - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/ - addpredict /var/lib/net-snmp/mib_indexes - addpredict /session_mm_cli0.sem - # Build with correct toolchain. tc-export CC CXX AR NM # Link with gcc by default, the build system should override this if needed. export LD="${CC}" local myconf - if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then + if multilib_is_native_abi; then myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)" else # not needed for multilib and will be overwritten anyway. @@ -121,5 +112,5 @@ multilib_src_test() { multilib_src_install() { emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install - [ "${ABI}" = "${DEFAULT_ABI}" ] && use doc && dohtml docs/html/* + multilib_is_native_abi && use doc && dodoc -r docs/html }