Compare commits

...

7 Commits

Author SHA1 Message Date
Nedko Arnaudov 32d96fe2f6 media-sound/jack-2.22.1: fix multilib
recent git implementations require safe.directory to work properly

https://bugs.gentoo.org/879353
https://github.com/gentoo/gentoo/pull/28154

The current fix for #879353, commit 207a50da440b7c6bea060972a7684e792c2a84fc,
does not address the install, as observed in https://github.com/LADI/os-gentoo-overlay/issues/1#issuecomment-1629783361

This is workaround for https://github.com/LADI/os-gentoo-overlay/issues/1
The git eclass should handle this situation without ebuild workarounds.
2023-07-11 11:31:09 +03:00
Nedko Arnaudov 511cdba71e recent git version require safe.directory to work properly
https://bugs.gentoo.org/879353
2023-07-11 01:45:59 +03:00
Nedko Arnaudov cb680e9aee media-sound/jack2-2.9999.ebuild: comment out waf shebang adjust
changing waf shebang in-tree causes git state to be dirty
2023-07-11 01:45:02 +03:00
Nedko Arnaudov 3e37b4b61d media-sound/jack-2.9999: fix missing } 2023-07-11 00:30:50 +03:00
Nedko Arnaudov 5736d6dd3a restore prepare stage 2023-07-11 00:17:30 +03:00
Nedko Arnaudov 73b1975bc8 comment out "python_fix_shebang waf" 2023-07-10 23:58:51 +03:00
Nedko Arnaudov 874a69950e this reverts commit 41ab2684c4
See https://github.com/LADI/os-gentoo-overlay/issues/1
2023-07-10 18:35:06 +03:00
2 changed files with 44 additions and 22 deletions

View File

@ -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"
@ -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 )
@ -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
@ -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)
@ -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
}

View File

@ -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"
@ -22,12 +22,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 )
@ -43,7 +43,16 @@ DOCS=( AUTHORS.rst NEWS.rst README.rst README_NETJACK2 )
PATCHES=( )
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
@ -54,7 +63,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)
@ -67,10 +76,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
}