diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-22 11:30:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-22 11:30:24 +0100 |
| commit | d56d144655e3785864da43c9acb6c228ef9360ae (patch) | |
| tree | b769b599a558483f82e9a057c41f1edd29626dd1 /media-sound/mumble | |
| parent | fab849d1daed0ba7f2ac497d07985c3dbb692543 (diff) | |
gentoo resync : 22.06.2019
Diffstat (limited to 'media-sound/mumble')
| -rw-r--r-- | media-sound/mumble/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/mumble/mumble-9999.ebuild | 40 |
2 files changed, 32 insertions, 11 deletions
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest index f9460e1e60e6..af0d0019fec5 100644 --- a/media-sound/mumble/Manifest +++ b/media-sound/mumble/Manifest @@ -1,6 +1,7 @@ DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0 EBUILD mumble-1.3.0_pre20190313.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f +EBUILD mumble-1.3.0_rc1-r1.ebuild 3740 BLAKE2B 7f25922b5de9c8165204258f7807e2d7b95459d742461e3420049b8d1964ddbc726a143da1c75266aef782c611302612dde416e5f1b8a9141a1445d4fadcf6fe SHA512 5a69d06a03be98f11447eefc44a9f6c31b5fb51f686e8afc0a89905b6e91d27295d84f1129518a4a6d62fb88ba2890754859d03e086a59edbc5298e5a0f29bc1 EBUILD mumble-1.3.0_rc1.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b -EBUILD mumble-9999.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b +EBUILD mumble-9999.ebuild 3740 BLAKE2B 7f25922b5de9c8165204258f7807e2d7b95459d742461e3420049b8d1964ddbc726a143da1c75266aef782c611302612dde416e5f1b8a9141a1445d4fadcf6fe SHA512 5a69d06a03be98f11447eefc44a9f6c31b5fb51f686e8afc0a89905b6e91d27295d84f1129518a4a6d62fb88ba2890754859d03e086a59edbc5298e5a0f29bc1 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9 diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index d15c4124e796..30b2055c37fb 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop qmake-utils xdg +inherit desktop multilib-build qmake-utils xdg DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" HOMEPAGE="https://wiki.mumble.info" @@ -63,6 +63,8 @@ BDEPEND=" virtual/pkgconfig " +# NB: qmake does not support multilib but it's fine to configure +# for the native ABI here src_configure() { myuse() { [[ -n "${1}" ]] || die "myuse: No use option given" @@ -97,16 +99,36 @@ src_configure() { DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" } -src_install() { - newdoc README.Linux README - dodoc CHANGES +multilib_src_compile() { + local emake_args=( + # place libmumble* in a subdirectory + DESTDIR_ADD="/${MULTILIB_ABI_FLAG}" + {C,L}FLAGS_ADD="$(get_abi_CFLAGS)" + ) + # build only overlay library for other ABIs + multilib_is_native_abi || emake_args+=( -C overlay_gl ) + emake "${emake_args[@]}" + emake clean +} + +src_compile() { + multilib_foreach_abi multilib_src_compile +} - local dir=release - if use debug; then - dir=debug +multilib_src_install() { + local dir=$(usex debug debug release) + dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* + if multilib_is_native_abi; then + dobin "${dir}"/mumble + dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* fi +} + +src_install() { + multilib_foreach_abi multilib_src_install - dobin "${dir}"/mumble + newdoc README.Linux README + dodoc CHANGES dobin scripts/mumble-overlay insinto /usr/share/services @@ -118,8 +140,6 @@ src_install() { doman man/mumble-overlay.1 doman man/mumble.1 - - dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* } pkg_preinst() { |