public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
Date: Tue, 15 Sep 2020 18:34:12 +0000 (UTC)	[thread overview]
Message-ID: <1600194820.97aa0cb3357e3ce8bdd346f450772468d8b0c936.floppym@gentoo> (raw)

commit:     97aa0cb3357e3ce8bdd346f450772468d8b0c936
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 14 13:00:00 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 18:33:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97aa0cb3

media-video/x264-encoder: Set special value of AS to fix build failure.

Closes: https://bugs.gentoo.org/740566
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 6 ++++++
 media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 6 ++++++
 media-video/x264-encoder/x264-encoder-9999.ebuild         | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index 893ddce8fed..1c576fa216e 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
 src_configure() {
 	tc-export CC
 
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 

diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 18dccd367cb..13b167268ff 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
 src_configure() {
 	tc-export CC
 
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 

diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 18dccd367cb..13b167268ff 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
 src_configure() {
 	tc-export CC
 
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 


             reply	other threads:[~2020-09-15 18:34 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15 18:34 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-23 18:02 [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/ Arthur Zamarin
2024-11-23 13:02 Arthur Zamarin
2024-08-25 18:03 Sam James
2024-03-18  4:45 Sam James
2024-03-17 19:29 Arthur Zamarin
2023-12-26 21:39 Sam James
2022-11-12 17:48 Matt Turner
2022-09-03  5:27 Sam James
2022-09-03  5:27 Sam James
2022-03-10 12:45 Alexis Ballier
2022-01-05 10:01 David Seifert
2021-01-07 19:04 Sam James
2021-01-04  3:31 Sam James
2020-04-25 19:14 Mikle Kolyada
2019-09-04 14:46 Alexis Ballier
2019-07-28 11:24 Andreas Sturmlechner
2019-07-02 10:33 Agostino Sarubbo
2019-07-01 19:23 Thomas Deutschmann
2019-05-05 19:05 Mike Gilbert
2019-02-15 12:36 Alexis Ballier
2019-01-17  2:47 Andreas Sturmlechner
2019-01-17  2:47 Andreas Sturmlechner
2019-01-17  2:47 Andreas Sturmlechner
2018-05-20 20:17 Andreas Sturmlechner
2018-02-26 14:25 Jason Zaman
2018-02-25 20:16 Thomas Deutschmann
2018-02-25 19:41 Andreas Sturmlechner
2017-07-29 10:06 Alexis Ballier
2017-07-02 10:04 Alexis Ballier
2017-07-02 10:04 Alexis Ballier
2017-01-31 14:04 Alexis Ballier
2016-12-06 12:21 Agostino Sarubbo
2016-12-06 12:21 Agostino Sarubbo
2016-07-13 13:24 Alexis Ballier
2016-05-24 14:12 Alexis Ballier
2015-10-12  7:57 Alexis Ballier
2015-08-21 13:51 Alexis Ballier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1600194820.97aa0cb3357e3ce8bdd346f450772468d8b0c936.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox