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 8DA051382C5 for ; Wed, 17 Mar 2021 01:22:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2905E077C; Wed, 17 Mar 2021 01:22:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADFA1E077C for ; Wed, 17 Mar 2021 01:22:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87E5B340ED0 for ; Wed, 17 Mar 2021 01:22:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D42BF5B6 for ; Wed, 17 Mar 2021 01:22:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615944121.99aeb4db26dbd9fc4cc19b915349e6060c3cd0b4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libopenaptx/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libopenaptx/libopenaptx-0.2.0.ebuild media-libs/libopenaptx/libopenaptx-9999.ebuild X-VCS-Directories: media-libs/libopenaptx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99aeb4db26dbd9fc4cc19b915349e6060c3cd0b4 X-VCS-Branch: master Date: Wed, 17 Mar 2021 01:22:47 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1c8b31c5-23ca-4c85-99be-6ba54345dfe6 X-Archives-Hash: af3c5d8035901c259232bc8772e9db56 commit: 99aeb4db26dbd9fc4cc19b915349e6060c3cd0b4 Author: Sam James gentoo org> AuthorDate: Wed Mar 17 01:19:47 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 17 01:22:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aeb4db media-libs/libopenaptx: fixes to prepare for tree * Update LICENSE to LGPL-2.1+ * Respect CC and AR * Drop ~x86 keyword until tested * Style changes (inc. block structure, variable style) * Don't use ${D} in src_compile Bug: https://bugs.gentoo.org/758377 Signed-off-by: Sam James gentoo.org> media-libs/libopenaptx/libopenaptx-0.2.0.ebuild | 36 ++++++++++++++++--------- media-libs/libopenaptx/libopenaptx-9999.ebuild | 36 ++++++++++++++++--------- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild index 7ebf9df7051..bac055db132 100644 --- a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild +++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="Reverse-engineered aptX and aptX HD library" HOMEPAGE="https://github.com/pali/libopenaptx" @@ -13,27 +13,37 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/pali/${PN}" else SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi -IUSE="cpu_flags_x86_avx2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" -RDEPEND="" -DEPEND="${RDEPEND}" +IUSE="cpu_flags_x86_avx2" src_compile() { + tc-export CC AR + use cpu_flags_x86_avx2 && append-cflags "-mavx2" - emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR=$(get_libdir) \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ARFLAGS="$ARFLAGS -rcs" all + emake \ + PREFIX="${EPREFIX}"/usr \ + LIBDIR=$(get_libdir) \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + ARFLAGS="${ARFLAGS} -rcs" \ + all } src_install() { - emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR=$(get_libdir) \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ARFLAGS="$ARFLAGS -rcs" install - - #rm static lib - rm -f "${D}/usr/$(get_libdir)"/libopenaptx.a || die "rm libopenaptx.a" + emake \ + PREFIX="${EPREFIX}"/usr \ + DESTDIR="${D}" \ + LIBDIR="$(get_libdir)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + ARFLAGS="${ARFLAGS} -rcs" \ + install + + rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib" } diff --git a/media-libs/libopenaptx/libopenaptx-9999.ebuild b/media-libs/libopenaptx/libopenaptx-9999.ebuild index 7ebf9df7051..bac055db132 100644 --- a/media-libs/libopenaptx/libopenaptx-9999.ebuild +++ b/media-libs/libopenaptx/libopenaptx-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="Reverse-engineered aptX and aptX HD library" HOMEPAGE="https://github.com/pali/libopenaptx" @@ -13,27 +13,37 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/pali/${PN}" else SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi -IUSE="cpu_flags_x86_avx2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" -RDEPEND="" -DEPEND="${RDEPEND}" +IUSE="cpu_flags_x86_avx2" src_compile() { + tc-export CC AR + use cpu_flags_x86_avx2 && append-cflags "-mavx2" - emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR=$(get_libdir) \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ARFLAGS="$ARFLAGS -rcs" all + emake \ + PREFIX="${EPREFIX}"/usr \ + LIBDIR=$(get_libdir) \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + ARFLAGS="${ARFLAGS} -rcs" \ + all } src_install() { - emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR=$(get_libdir) \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ARFLAGS="$ARFLAGS -rcs" install - - #rm static lib - rm -f "${D}/usr/$(get_libdir)"/libopenaptx.a || die "rm libopenaptx.a" + emake \ + PREFIX="${EPREFIX}"/usr \ + DESTDIR="${D}" \ + LIBDIR="$(get_libdir)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + ARFLAGS="${ARFLAGS} -rcs" \ + install + + rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib" }