From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1263345-garchives=archives.gentoo.org@lists.gentoo.org>
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 C96B51382C5
for <garchives@archives.gentoo.org>; Mon, 22 Mar 2021 10:07:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 277C2E0871;
Mon, 22 Mar 2021 10:07:06 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 11CDEE0871
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 10:07:06 +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 447B5340806
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 10:07:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BADF6630
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 10:07:01 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1616407591.31e09a87470369955e7fcb7fecd76dd21d187b82.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/vlc/vlc-3.0.12.1-r100.ebuild media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-9999.ebuild
X-VCS-Directories: media-video/vlc/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 31e09a87470369955e7fcb7fecd76dd21d187b82
X-VCS-Branch: master
Date: Mon, 22 Mar 2021 10:07:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: feeb2c21-8ba1-4125-aee0-a5aaf08d8bb0
X-Archives-Hash: 18dbbf6d413d1be07b6c0672fe383e2d
commit: 31e09a87470369955e7fcb7fecd76dd21d187b82
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 22 10:06:31 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 10:06:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e09a87
media-video/vlc: fix gettext version mismatch
Make the specified gettext version the minimum instead of the exact
version required. It fixes this error when cross-compiling:
*** error: gettext infrastructure mismatch: using a Makefile.in.in
from gettext version 0.19 but the autoconf macros are from gettext
version 0.20
Closes: https://bugs.gentoo.org/766549
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/vlc/vlc-3.0.12.1-r100.ebuild | 3 +++
media-video/vlc/vlc-3.0.9999.ebuild | 3 +++
media-video/vlc/vlc-9999.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
index 41a504e5afa..4463b83fc27 100644
--- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
@@ -272,6 +272,9 @@ src_prepare() {
sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
eautoreconf
# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a90d2abdfd4..ac592d9ad6f 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -269,6 +269,9 @@ src_prepare() {
sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
eautoreconf
# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 2eec388951d..cebba4dea7e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -272,6 +272,9 @@ src_prepare() {
sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
eautoreconf
# Disable automatic running of tests.