[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

[Sam James]

commit:     f25a7ab45c1a7345d741c183bb96de0967b67db1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 15:02:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 15:02:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25a7ab4

media-video/gpac: fix build on non amd64/x86

-mno-sse2 isn't valid on non amd64/x86.

Bug: https://bugs.gentoo.org/749972
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/gpac/gpac-1.0.1.ebuild | 15 +++++++++++++--
 media-video/gpac/gpac-9999.ebuild  | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index 806f4a7262b..8d9beec5a39 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -98,7 +98,6 @@ src_configure() {
        tc-export CC CXX AR RANLIB
 
        local myeconfargs=(
-               --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'-mno-sse2')"
                --cc="$(tc-getCC)"
                --libdir="$(get_libdir)"
                --verbose
@@ -134,6 +133,18 @@ src_configure() {
                $(my_use vorbis)
                $(my_use xvid)
        )
+
+       if use amd64 || use x86 ; then
+               # Don't pass -mno-sse2 on non amd64/x86
+               myeconfargs+=(
+                       --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 
'-msse2' '-mno-sse2')"
+               )
+       else
+               myeconfargs+=(
+                       --extra-cflags="${CFLAGS}"
+               )
+       fi
+
        econf "${myeconfargs[@]}"
 }
 

diff --git a/media-video/gpac/gpac-9999.ebuild 
b/media-video/gpac/gpac-9999.ebuild
index e5828cfed45..abfcbc0e5d9 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,7 @@ IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 
jack jpeg jpeg2k lib
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
        media-libs/libogg
+       sys-libs/zlib
        a52? ( media-libs/a52dec )
        aac? ( media-libs/faad2 )
        alsa? ( media-libs/alsa-lib )
@@ -97,7 +98,6 @@ src_configure() {
        tc-export CC CXX AR RANLIB
 
        local myeconfargs=(
-               --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'-mno-sse2')"
                --cc="$(tc-getCC)"
                --libdir="$(get_libdir)"
                --verbose
@@ -133,6 +133,18 @@ src_configure() {
                $(my_use vorbis)
                $(my_use xvid)
        )
+
+       if use amd64 || use x86 ; then
+               # Don't pass -mno-sse2 on non amd64/x86
+               myeconfargs+=(
+                       --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 
'-msse2' '-mno-sse2')"
+               )
+       else
+               myeconfargs+=(
+                       --extra-cflags="${CFLAGS}"
+               )
+       fi
+
        econf "${myeconfargs[@]}"
 }