diff options
| author |   Kenton Groombridge <concord@gentoo.org> | 2022-11-15 09:45:31 -0500 |
|---|---|---|
| committer | Kenton Groombridge <concord@gentoo.org> | 2022-11-15 09:49:01 -0500 |
| commit | 846953b414d93d2f81a0b8e909057533bb089628 (patch) | |
| tree | ffbb762276b56decfe1ac23d706fd4fc56068ff7 /net-voip | |
| parent | media-libs/libva-intel-media-driver: update metadata.xml (diff) | |
| download | gentoo-846953b414d93d2f81a0b8e909057533bb089628.tar.gz gentoo-846953b414d93d2f81a0b8e909057533bb089628.tar.bz2 gentoo-846953b414d93d2f81a0b8e909057533bb089628.zip | |
net-voip/mumble: update live ebuild
Fix relative path assertions in the live ebuild as well as fix the
builtin license script breakage.
Bug: https://bugs.gentoo.org/879569
Signed-off-by: Kenton Groombridge <concord@gentoo.org>
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/mumble/mumble-9999.ebuild | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild index 4d6f06e23171..c6f9fc3576ea 100644 --- a/net-voip/mumble/mumble-9999.ebuild +++ b/net-voip/mumble/mumble-9999.ebuild @@ -11,7 +11,20 @@ HOMEPAGE="https://wiki.mumble.info" if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" - EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy 3rdparty/gsl ) + + # needed for the included 3rdparty license script, + # even if these components may not be compiled in + EGIT_SUBMODULES=( + '-*' + themes/Mumble + 3rdparty/FindPythonInterpreter + 3rdparty/gsl + 3rdparty/minhook + 3rdparty/rnnoise-src + 3rdparty/speexdsp + 3rdparty/tracy + opus + ) else if [[ "${PV}" == *_pre* ]] ; then SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz" @@ -85,7 +98,6 @@ src_configure() { local mycmakeargs=( -Dalsa="$(usex alsa)" - -Dbundled-celt="ON" -Dbundled-json="OFF" -Dbundled-opus="OFF" -Dbundled-speex="OFF" @@ -112,6 +124,11 @@ src_configure() { mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) fi + # https://bugs.gentoo.org/879569 + # convert absolute install paths to relative paths to satisfy path assertions + mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="$(realpath --relative-to="${S}" "${ED}"/usr/share/man)" ) + mycmakeargs+=( -DCMAKE_INSTALL_DOCDIR="$(realpath --relative-to="${S}" "${ED}"/usr/share/doc/"${PF}")" ) + # https://bugs.gentoo.org/832978 # fix tests (and possibly runtime issues) on arches with unsigned chars append-cxxflags -fsigned-char |