Skip to content

Commit

Permalink
media-sound/jack-2.22.1: fix multilib
Browse files Browse the repository at this point in the history
recent git implementations require safe.directory to work properly

https://bugs.gentoo.org/879353
gentoo/gentoo#28154

The current fix for #879353, commit 207a50da440b7c6bea060972a7684e792c2a84fc,
does not address the install, as observed in #1 (comment)

This is workaround for #1
The git eclass should handle this situation without ebuild workarounds.
  • Loading branch information
nedko committed Jul 11, 2023
1 parent 511cdba commit 32d96fe
Showing 1 changed file with 22 additions and 11 deletions.
33 changes: 22 additions & 11 deletions media-sound/jack2/jack2-2.22.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=8

PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="threads(+)"
inherit flag-o-matic python-single-r1 waf-utils
inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
inherit git-r3

EGIT_REPO_URI="https://github.com/LADI/jack2.git"
Expand All @@ -23,12 +23,12 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}"

DEPEND="
alsa? ( media-libs/alsa-lib )
sys-apps/dbus
libsamplerate? ( media-libs/libsamplerate )
ieee1394? ( media-libs/libffado )
metadata? ( sys-libs/db )
opus? ( media-libs/opus[custom-modes] )"
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
sys-apps/dbus[${MULTILIB_USEDEP}]
libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
RDEPEND="
${DEPEND}
pam? ( sys-auth/realtime-base )
Expand All @@ -42,7 +42,16 @@ PDEPEND=""

DOCS=( AUTHORS.rst NEWS.rst README.rst README_NETJACK2 )

src_configure() {
src_prepare() {
default

# changing waf shebang in-tree causes git state to be dirty
#python_fix_shebang waf

multilib_copy_sources
}

multilib_src_configure() {
# clients crash if built with lto
# https://github.com/jackaudio/jack2/issues/485
filter-lto
Expand All @@ -53,7 +62,7 @@ src_configure() {
--alsa=$(usex alsa)
--celt=no
--db=$(usex metadata)
--doxygen=$(usex doc)
--doxygen=$(multilib_native_usex doc)
--firewire=$(usex ieee1394)
--iio=no
--opus=$(usex opus)
Expand All @@ -66,10 +75,12 @@ src_configure() {
waf-utils_src_configure "${wafargs[@]}"
}

src_compile() {
multilib_src_compile() {
waf-utils_src_compile
}

src_install() {
multilib_src_install() {
git config --global --add safe.directory \
"$(cd "${out_dir}" && echo "${PWD}")" || die
waf-utils_src_install
}

0 comments on commit 32d96fe

Please sign in to comment.