public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/sndio/, media-sound/sndio/files/
Date: Wed,  8 Jun 2022 06:13:05 +0000 (UTC)	[thread overview]
Message-ID: <1654667807.f99a5d4c1caffc20532913020d394a9e1e855ebe.juippis@gentoo> (raw)

commit:     f99a5d4c1caffc20532913020d394a9e1e855ebe
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 12:26:43 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <juippis <AT> 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"
+}


             reply	other threads:[~2022-06-08  6:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-08  6:13 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-22  5:21 [gentoo-commits] repo/gentoo:master commit in: media-sound/sndio/, media-sound/sndio/files/ Sam James

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=1654667807.f99a5d4c1caffc20532913020d394a9e1e855ebe.juippis@gentoo \
    --to=juippis@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