Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
e8073499
Commit
e8073499
authored
3 months ago
by
Matthias Ahouansou
Committed by
Patrycja Rosa
3 months ago
Browse files
Options
Downloads
Patches
Plain Diff
community/mumble: upgrade to 1.5.735
parent
5fdbd9ca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!79570
community/firefox-esr: upgrade to 128.7.0
,
!76729
community/mumble: upgrade to 1.5.735
Pipeline
#280295
canceled
3 months ago
Stage: verify
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
community/mumble/32-bit.patch
+1
-50
1 addition, 50 deletions
community/mumble/32-bit.patch
community/mumble/APKBUILD
+3
-5
3 additions, 5 deletions
community/mumble/APKBUILD
community/mumble/musl-1.2.3.patch
+0
-14
0 additions, 14 deletions
community/mumble/musl-1.2.3.patch
with
4 additions
and
69 deletions
community/mumble/32-bit.patch
+
1
−
50
View file @
e8073499
Fix type conversion on 32 bit targets
Ref https://github.com/mumble-voip/mumble/issues/6377
Ref https://github.com/mumble-voip/mumble/issues/6377
#issuecomment-2526348545
--- a/src/MumbleProtocol.cpp
+++ b/src/MumbleProtocol.cpp
@@ -781,7 +781,7 @@
namespace Protocol {
}
- m_audioData.payload = gsl::span< byte >(payloadBegin, payloadSize);
+ m_audioData.payload = gsl::span< byte >(payloadBegin, static_cast< size_t >(payloadSize));
if (stream.left() == 3 * sizeof(float)) {
// If there are further bytes after the audio payload, this means that there is positional data attached to
--- a/src/mumble/Audio.cpp
+++ b/src/mumble/Audio.cpp
@@ -43,7 +43,7 @@
void LoopUser::addFrame(const Mumble::Protocol::AudioData &audioData) {
QMutexLocker l(&qmLock);
bool restart = (qetLastFetch.elapsed() > 100);
- long time = qetTicker.elapsed();
+ qint64 time = qetTicker.elapsed();
float r;
if (restart)
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -617,11 +617,11 @@
bool AudioOutput::mix(void *outbuff, unsigned int frameCount) {
// Mix down stereo to mono. TODO: stereo record support
// frame: for a stereo stream, the [LR] pair inside ...[LR]LRLRLR.... is a frame
for (unsigned int i = 0; i < frameCount; ++i) {
- recbuff[i] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment;
+ recbuff[static_cast< int >(i)] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment;
}
} else {
for (unsigned int i = 0; i < frameCount; ++i) {
- recbuff[i] += pfBuffer[i] * volumeAdjustment;
+ recbuff[static_cast< int >(i)] += pfBuffer[i] * volumeAdjustment;
}
}
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1041,7 +1041,7 @@
void Server::sendMessage(ServerUser &u, const unsigned char *data, int len, QByt
((reinterpret_cast< quint64 >(ebuffer.data()) + 8) & static_cast< quint64 >(~7)) + 4);
#else
std::vector< char > bufVec;
- bufVec.resize(len + 4);
+ bufVec.resize(static_cast< std::size_t >(len + 4));
char *buffer = bufVec.data();
#endif
{
--- a/src/murmur/ServerUser.h
+++ b/src/murmur/ServerUser.h
@@ -86,7 +86,7 @@
private:
...
...
This diff is collapsed.
Click to expand it.
community/mumble/APKBUILD
+
3
−
5
View file @
e8073499
...
...
@@ -2,7 +2,7 @@
# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname
=
mumble
pkgver
=
1.5.
634
pkgver
=
1.5.
735
pkgrel
=
0
pkgdesc
=
"Low-latency, high quality voice chat software"
url
=
"https://wiki.mumble.info/"
...
...
@@ -42,7 +42,6 @@ subpackages="
source
=
"https://github.com/mumble-voip/mumble/releases/download/v
$pkgver
/mumble-
$pkgver
.tar.gz
murmur.initd
musl-1.2.3.patch
EVIO-int.patch
32-bit.patch
"
...
...
@@ -125,9 +124,8 @@ murmur_doc() {
}
sha512sums
=
"
5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84
b5
9
mumble-1.5.
634
.tar.gz
1dba58e6f39dbef88c6e0d1501530bee62af5bd6c798dcfdbe6c9d94c1ec22ab91d157ba3ccb96d810daf31907ac2bbec876be20b8c9613664488e6bb03a5
b5
b
mumble-1.5.
735
.tar.gz
1edccadd87446a6b9f5b87f19405f92e3450c48334c79fba4bc2c31224be767be084488c4352f14e64b7506b5963d1d6f3d8d4c7ea8e8276104d19a4a03892c6 murmur.initd
2cc0a17a31bf9a436ea97447f958b7a93e96b0fcd020e5389ccfc413b6498b5176294d2b9c788a68cdfac47dabca8e6e28699f5ad184dcde4d30feb88d2e99b3 musl-1.2.3.patch
959cdb890fab13573ba0fb0114556ed9f01b98e47d47a0a6430230a59aaece66286cd931aeb6ecaab20a553458e925db44488147e6ebf15fdcee236fd56d22d9 EVIO-int.patch
6305418e669266ce8b0ea30502363573163bdf848ee17159b27f65ebefce9a4795333c24f135ab829bd1370627443738ab75dc4cd3922344ef7202d57b8a50e3
32-bit.patch
f14df650e2fbeaae07cec264bb1d3a4d3aca84edcaddc909e52cae0e5f0ff9eb3078fb151f12507255351c1541a6b38e05cd9763cf0a4457773955c84820fe0b
32-bit.patch
"
This diff is collapsed.
Click to expand it.
community/mumble/musl-1.2.3.patch
deleted
100644 → 0
+
0
−
14
View file @
5fdbd9ca
CRYPTO_get_locking_callback is defined as null in openssl
so this is always true, but it fails to compile on musl 1.2.3
as casting from null to bool is invalid
--- a/src/SSL.cpp
+++ b/src/SSL.cpp
@@ -33,7 +33,7 @@
// If we detect that no locking callback is configured, we
// have to set it up ourselves to allow multi-threaded use
// of OpenSSL.
- if (!CRYPTO_get_locking_callback()) {
+ if (true) {
SSLLocks::initialize();
}
}
This diff is collapsed.
Click to expand it.
Patrycja Rosa
@ptrcnull
mentioned in issue
#16708 (closed)
·
3 months ago
mentioned in issue
#16708 (closed)
mentioned in issue #16708
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment