Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/speex/
Date: Wed, 30 Aug 2017 21:29:34
Message-Id: 1504128564.88db124b3f3ed7eaaead23a888fbb01dad93eeab.chewi@gentoo
1 commit: 88db124b3f3ed7eaaead23a888fbb01dad93eeab
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 26 10:14:52 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 30 21:29:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88db124b
7
8 media-libs/speex: Use CPU_FLAGS_ARM and fix logic on armv6+ (#617322)
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 media-libs/speex/metadata.xml | 1 -
13 media-libs/speex/speex-1.2.0-r1.ebuild | 19 +++++++++++++++----
14 2 files changed, 15 insertions(+), 5 deletions(-)
15
16 diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
17 index 7617efb0161..deddfd6ac1a 100644
18 --- a/media-libs/speex/metadata.xml
19 +++ b/media-libs/speex/metadata.xml
20 @@ -9,7 +9,6 @@
21 <remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
22 </upstream>
23 <use>
24 - <flag name="armv5te">Enables optimizations for armv5te processors.</flag>
25 <flag name="utils">Enables speex commandline utilities (speexenc, speexdec).</flag>
26 <flag name="vbr">Enable VBR support.</flag>
27 </use>
28
29 diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
30 index 138ae9c759b..bf424f56d19 100644
31 --- a/media-libs/speex/speex-1.2.0-r1.ebuild
32 +++ b/media-libs/speex/speex-1.2.0-r1.ebuild
33 @@ -14,7 +14,7 @@ SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
34 LICENSE="BSD"
35 SLOT="0"
36 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
37 -IUSE="armv5te cpu_flags_x86_sse static-libs utils +vbr"
38 +IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
39
40 RDEPEND="
41 utils? (
42 @@ -41,16 +41,27 @@ src_prepare() {
43 multilib_src_configure() {
44 append-lfs-flags
45
46 + local \
47 + ARM4_ARG=--disable-arm4-asm \
48 + ARM5_ARG=--disable-arm5e-asm
49 +
50 + if use arm && ! use cpu_flags_arm_v6; then
51 + if use cpu_flags_arm_v5; then
52 + ARM5_ARG=--enable-arm5e-asm
53 + elif use cpu_flags_arm_v4; then
54 + ARM4_ARG=--enable-arm4-asm
55 + fi
56 + fi
57 +
58 # Can also be configured without floating point
59 # --enable-fixed-point
60 ECONF_SOURCE="${S}" econf \
61 $(use_enable static-libs static) \
62 - $(usex arm $(usex armv5te '--disable-arm4-asm' '--enable-arm4-asm') '--disable-arm4-asm') \
63 - $(use_enable armv5te arm5e-asm) \
64 $(use_enable cpu_flags_x86_sse sse) \
65 $(use_enable vbr) \
66 $(use_with utils speexdsp) \
67 - $(use_enable utils binaries)
68 + $(use_enable utils binaries) \
69 + ${ARM4_ARG} ${ARM5_ARG}
70 }
71
72 multilib_src_install_all() {