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 E3AE3139345 for ; Mon, 12 Jul 2021 12:26:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5C5DE0919; Mon, 12 Jul 2021 12:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AE1D8E0919 for ; Mon, 12 Jul 2021 12:26:33 +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 6C3C8342C98 for ; Mon, 12 Jul 2021 12:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0585E7C0 for ; Mon, 12 Jul 2021 12:26:31 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1626092784.c9b822a38d0e71539ab4fef429027ec11f75e3b6.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/aqualung/aqualung-1.1-r101.ebuild media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch X-VCS-Directories: media-sound/aqualung/ media-sound/aqualung/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c9b822a38d0e71539ab4fef429027ec11f75e3b6 X-VCS-Branch: master Date: Mon, 12 Jul 2021 12:26:31 +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: ece01e65-d1e2-4102-a909-1c6d2c3aa269 X-Archives-Hash: 71fa48ca13bd2807b5616a7590a5c1d0 commit: c9b822a38d0e71539ab4fef429027ec11f75e3b6 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 12 11:59:51 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 12 12:26:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b822a3 media-sound/aqualung: respect LUA_SINGLE_TARGET value Default upstream behaviour is to prefer 5.2 over all others if present, and if neither 5.2 nor 5.1 can be found try the newest version available. Signed-off-by: Marek Szuba gentoo.org> media-sound/aqualung/aqualung-1.1-r101.ebuild | 6 +++++ .../files/aqualung-1.1-configure-lua-version.patch | 31 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild index 3f49bddce79..af782eb7015 100644 --- a/media-sound/aqualung/aqualung-1.1-r101.ebuild +++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild @@ -55,6 +55,7 @@ DEPEND=" " PATCHES=( + "${FILESDIR}/${P}-configure-lua-version.patch" "${FILESDIR}/${P}-ifp.patch" "${FILESDIR}/${P}-var-collision.patch" ) @@ -63,6 +64,11 @@ pkg_setup() { use lua && lua-single_pkg_setup } +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ --disable-rpath \ diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch new file mode 100644 index 00000000000..a88839728c5 --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch @@ -0,0 +1,31 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -401,24 +401,11 @@ + ]) + + AQUALUNG_DETECT([lua], [Lua Extension], +- [PKG_CHECK_MODULES([lua], [lua5.2], ++ [PKG_CHECK_MODULES([lua], [lua], + [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua-5.2], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua52], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua5.1], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua-5.1], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua51], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua >= 5.2], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua >= 5.1], +- [AQUALUNG_FOUND([lua])], +- [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])]) +- ++ [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])] ++ )] ++) + + # Compiler and linker variables. + AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"])