commit: b363e083dda23714c6fefb3ad3766c8504a70e93 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Aug 30 10:46:53 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 30 13:11:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b363e083
net-voip/mumble: drop 1.4.287-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-voip/mumble/Manifest | 4 - .../mumble/files/mumble-1.4-force-alignment.patch | 28 ---- net-voip/mumble/mumble-1.4.287-r1.ebuild | 158 --------------------- 3 files changed, 190 deletions(-) diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest index a47bcf364138..90406a4c2793 100644 --- a/net-voip/mumble/Manifest +++ b/net-voip/mumble/Manifest @@ -1,5 +1 @@ -DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b -DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15 -DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a -DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82 DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59 diff --git a/net-voip/mumble/files/mumble-1.4-force-alignment.patch b/net-voip/mumble/files/mumble-1.4-force-alignment.patch deleted file mode 100644 index ea0ae4792443..000000000000 --- a/net-voip/mumble/files/mumble-1.4-force-alignment.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001 -From: Davide Beatrici <[email protected]> -Date: Thu, 1 Sep 2022 23:32:57 +0200 -Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for - CCameraAngles in GTAV plugin - -https://en.cppreference.com/w/cpp/language/alignas - -This fixes compilation when the implicit alignment is not 8 bytes. - -It can be the case with 32 bit targets. ---- - plugins/gtav/structs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h -index 2829dc11e1..0e4f76edab 100644 ---- a/plugins/gtav/structs.h -+++ b/plugins/gtav/structs.h -@@ -118,7 +118,7 @@ struct CCameraManagerAngles { - ptr_t cameraAngles; // CCameraAngles * - }; - --struct CCameraAngles { -+struct alignas(8) CCameraAngles { - uint8_t pad1[960]; - ptr_t playerAngles; // CPlayerAngles * - uint8_t pad2[60]; diff --git a/net-voip/mumble/mumble-1.4.287-r1.ebuild b/net-voip/mumble/mumble-1.4.287-r1.ebuild deleted file mode 100644 index 006c163c720a..000000000000 --- a/net-voip/mumble/mumble-1.4.287-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake flag-o-matic python-any-r1 xdg - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" -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 ) -else - if [[ "${PV}" == *_pre* ]] ; then - SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"; - else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"; - S="${WORKDIR}/${P}.src" - fi - KEYWORDS="amd64 ~arm64 ~ppc64 x86" -fi - -SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz"; -SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-crypto-threads.patch.xz"; -SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz"; - -LICENSE="BSD MIT" -SLOT="0" -IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/openssl-1.0.0b:0= - dev-libs/poco[util,xml,zip] - >=dev-libs/protobuf-2.2.0:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - >=media-libs/libsndfile-1.0.20[-minimal] - >=media-libs/opus-1.3.1 - >=media-libs/speex-1.2.0 - media-libs/speexdsp - sys-apps/lsb-release - x11-libs/libX11 - x11-libs/libXi - alsa? ( media-libs/alsa-lib ) - dbus? ( dev-qt/qtdbus:5 ) - g15? ( app-misc/g15daemon:= ) - jack? ( virtual/jack ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - pipewire? ( media-video/pipewire ) - speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-qt/qtconcurrent:5 - dev-qt/qttest:5 - dev-libs/boost - x11-base/xorg-proto -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}/${PN}-1.4-openssl3.patch" - "${WORKDIR}/${PN}-1.4-crypto-threads.patch" - "${WORKDIR}/${PN}-1.4-odr.patch" - "${FILESDIR}/${PN}-1.4-force-alignment.patch" -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # required because of xdg.eclass also providing src_prepare - cmake_src_prepare -} - -src_configure() { - - local mycmakeargs=( - -Dalsa="$(usex alsa)" - -Dtests="$(usex test)" - -Dbundled-celt="ON" - -Dbundled-opus="OFF" - -Dbundled-speex="OFF" - -Ddbus="$(usex dbus)" - -Dg15="$(usex g15)" - -Djackaudio="$(usex jack)" - -Doverlay="ON" - -Dportaudio="$(usex portaudio)" - -Doverlay-xcompile="$(usex multilib)" - -Dpipewire="$(usex pipewire)" - -Dpulseaudio="$(usex pulseaudio)" - -Drnnoise="$(usex rnnoise)" - -Dserver="OFF" - -Dspeechd="$(usex speech)" - -Dtranslations="$(usex nls)" - -Dupdate="OFF" - -Dwarnings-as-errors="OFF" - -Dzeroconf="$(usex zeroconf)" - ) - - if [[ "${PV}" != 9999 ]] ; then - mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) - fi - - # https://bugs.gentoo.org/832978 - # fix tests (and possibly runtime issues) on arches with unsigned chars - append-cxxflags -fsigned-char - - cmake_src_configure -} - -src_test() { - # https://bugs.gentoo.org/884049 - # increase timeout for tests - local -x QTEST_FUNCTION_TIMEOUT=600000 - cmake_src_test -} - -src_install() { - cmake_src_install - - if use amd64 && use multilib ; then - # The 32bit overlay library gets built when multilib is enabled. - # Install it into the correct 32bit lib dir. - local libdir_64="/usr/$(get_libdir)/mumble" - local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble" - dodir ${libdir_32} - mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \ - "${ED}"/${libdir_32}/ || die - fi - - insinto /usr/share/mumble - doins -r samples -} - -pkg_postinst() { - xdg_pkg_postinst - echo - elog "Visit https://wiki.mumble.info/ for futher configuration instructions." - elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)." - echo -}
