Diff mumble-1.4.287-r1 with a mumble-9999

/usr/portage/net-voip/mumble/mumble-9999.ebuild 2023-10-09 14:52:34.756368483 +0300
11 11
if [[ "${PV}" == 9999 ]] ; then
12 12
	inherit git-r3
13 13
	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
14
	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
14

  
15
	# needed for the included 3rdparty license script,
16
	# even if these components may not be compiled in
17
	EGIT_SUBMODULES=(
18
		'-*'
19
		3rdparty/FindPythonInterpreter
20
		3rdparty/gsl
21
		3rdparty/minhook
22
		3rdparty/opus
23
		3rdparty/rnnoise-src
24
		3rdparty/speexdsp
25
		3rdparty/tracy
26
	)
15 27
else
16 28
	if [[ "${PV}" == *_pre* ]] ; then
17 29
		SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"
......
19 31
		MY_PV="${PV/_/-}"
20 32
		MY_P="${PN}-${MY_PV}"
21 33
		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
22
		S="${WORKDIR}/${P}.src"
34
		S="${WORKDIR}/${P/_*}.src"
23 35
	fi
24
	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
36
	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
25 37
fi
26 38

  
27
SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz"
28
SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-crypto-threads.patch.xz"
29
SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz"
30

  
31 39
LICENSE="BSD MIT"
32 40
SLOT="0"
33 41
IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
......
56 64
	g15? ( app-misc/g15daemon:= )
57 65
	jack? ( virtual/jack )
58 66
	portaudio? ( media-libs/portaudio )
59
	pulseaudio? ( media-sound/pulseaudio )
67
	pulseaudio? ( media-libs/libpulse )
60 68
	pipewire? ( media-video/pipewire )
61 69
	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
62 70
	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
63 71
"
64 72
DEPEND="${RDEPEND}
65 73
	${PYTHON_DEPS}
74
	dev-cpp/nlohmann_json
66 75
	dev-qt/qtconcurrent:5
67 76
	dev-qt/qttest:5
68 77
	dev-libs/boost
......
73 82
	virtual/pkgconfig
74 83
"
75 84

  
76
PATCHES=(
77
	"${WORKDIR}/${PN}-1.4-openssl3.patch"
78
	"${WORKDIR}/${PN}-1.4-crypto-threads.patch"
79
	"${WORKDIR}/${PN}-1.4-odr.patch"
80
	"${FILESDIR}/${PN}-1.4-force-alignment.patch"
81
)
82

  
83 85
pkg_setup() {
84 86
	python-any-r1_pkg_setup
85 87
}
86 88

  
87 89
src_prepare() {
90
	sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
91

  
88 92
	# required because of xdg.eclass also providing src_prepare
89 93
	cmake_src_prepare
90 94
}
......
93 97

  
94 98
	local mycmakeargs=(
95 99
		-Dalsa="$(usex alsa)"
96
		-Dtests="$(usex test)"
97
		-Dbundled-celt="ON"
100
		-Dbundled-json="OFF"
98 101
		-Dbundled-opus="OFF"
99 102
		-Dbundled-speex="OFF"
100 103
		-Ddbus="$(usex dbus)"
......
108 111
		-Drnnoise="$(usex rnnoise)"
109 112
		-Dserver="OFF"
110 113
		-Dspeechd="$(usex speech)"
114
		-Dtests="$(usex test)"
115
		-Dtracy="OFF"
111 116
		-Dtranslations="$(usex nls)"
112 117
		-Dupdate="OFF"
113 118
		-Dwarnings-as-errors="OFF"
......
125 130
	cmake_src_configure
126 131
}
127 132

  
128
src_test() {
129
	# https://bugs.gentoo.org/884049
130
	# increase timeout for tests
131
	local -x QTEST_FUNCTION_TIMEOUT=600000
132
	cmake_src_test
133
}
134

  
135 133
src_install() {
136 134
	cmake_src_install
137 135

  
Thank you!