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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73926158092 for ; Wed, 8 Jun 2022 06:13:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7015FE08DD; Wed, 8 Jun 2022 06:13:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D03AE08DD for ; Wed, 8 Jun 2022 06:13:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17C86340FBD for ; Wed, 8 Jun 2022 06:13:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3A68303 for ; Wed, 8 Jun 2022 06:13:05 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1654667807.f99a5d4c1caffc20532913020d394a9e1e855ebe.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/sndio/, media-sound/sndio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch media-sound/sndio/sndio-1.8.0-r1.ebuild X-VCS-Directories: media-sound/sndio/ media-sound/sndio/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: f99a5d4c1caffc20532913020d394a9e1e855ebe X-VCS-Branch: master Date: Wed, 8 Jun 2022 06:13:05 +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: 7daf8879-1a6d-4d3c-ad32-2069f91477aa X-Archives-Hash: 19e11ddd792777a194656b10ab2c6b13 commit: f99a5d4c1caffc20532913020d394a9e1e855ebe Author: Joonas Niilola gentoo org> AuthorDate: Tue Jun 7 12:26:43 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Jun 8 05:56:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99a5d4c media-sound/sndio: fix hardcoded pkgconfdir path - on a multilib system sndio will install the 64-bit pkgconfig file under /usr/lib which then won't get found by non-multilib packages. Closes: https://bugs.gentoo.org/842420 Signed-off-by: Joonas Niilola gentoo.org> .../sndio-1.8.0-fix-hardcoded-pkgconfdir.patch | 12 +++++ media-sound/sndio/sndio-1.8.0-r1.ebuild | 55 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch b/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch new file mode 100644 index 000000000000..70c66157fab8 --- /dev/null +++ b/media-sound/sndio/files/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch @@ -0,0 +1,12 @@ +diff -Naur a/configure b/configure +--- a/configure 2021-05-07 10:49:58.000000000 +0300 ++++ b/configure 2022-06-07 14:49:07.623069325 +0300 +@@ -205,7 +205,7 @@ + datadir="${datadir:-$prefix/share}" + includedir="${includedir:-$prefix/include}" + libdir="${libdir:-$exec_prefix/lib}" +-pkgconfdir="${pkgconfdir:-$prefix/lib/pkgconfig}" ++pkgconfdir="${pkgconfdir:-$libdir/pkgconfig}" + mandir="${mandir:-$prefix/share/man}" + + # diff --git a/media-sound/sndio/sndio-1.8.0-r1.ebuild b/media-sound/sndio/sndio-1.8.0-r1.ebuild new file mode 100644 index 000000000000..3a22a2e82ac8 --- /dev/null +++ b/media-sound/sndio/sndio-1.8.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal toolchain-funcs + +DESCRIPTION="small audio and MIDI framework part of the OpenBSD project" +HOMEPAGE="http://www.sndio.org/" +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://caoua.org/git/sndio" + EGIT_MIN_CLONE_TYPE="single+tags" +else + SRC_URI="http://www.sndio.org/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="ISC" +SLOT="0/7.1" +IUSE="alsa" + +DEPEND=" + dev-libs/libbsd[${MULTILIB_USEDEP}] + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + acct-user/sndiod +" + +PATCHES=( "${FILESDIR}"/sndio-1.8.0-fix-hardcoded-pkgconfdir.patch ) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + tc-export CC + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --privsep-user=sndiod \ + --with-libbsd \ + $(use_enable alsa) \ + || die "Configure failed" +} + +src_install() { + multilib-minimal_src_install + + doinitd "${FILESDIR}/sndiod" +}