* [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/
@ 2015-10-02 1:38 Ryan Hill
0 siblings, 0 replies; 5+ messages in thread
From: Ryan Hill @ 2015-10-02 1:38 UTC (permalink / raw
To: gentoo-commits
commit: 49ba2f7bae64d3a75f414c682f9703626a6fd9e7
Author: Ryan Hill <rhill <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 01:41:14 2015 +0000
Commit: Ryan Hill <rhill <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 01:41:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ba2f7b
media-sound/mumble: Fix build with GCC 4.9.
Gentoo-Bug: https://bugs.gentoo.org/532180
Package-Manager: portage-2.2.22
Signed-off-by: Ryan Hill <rhill <AT> gentoo.org>
media-sound/mumble/files/mumble-1.2.8-gcc49.patch | 26 +++++++++++++++++++++++
media-sound/mumble/mumble-1.2.8.ebuild | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
new file mode 100644
index 0000000..cecb3d3
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/532180
+
+Avoid "jump to label crosses initialization" error.
+
+ Move variable "buffer" into the while loop to avoid a compile error
+ with g++ 4.9.0.
+
+ Although earlier compiler versions did accept the code, jumping into the
+ scope of an variable length array is not allowed:
+ http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
+
+
+--- a/src/mumble/OSS.cpp
++++ b/src/mumble/OSS.cpp
+@@ -243,9 +243,9 @@ void OSSInput::run() {
+ eMicFormat = SampleShort;
+ initializeMixer();
+
+- short buffer[iMicLength];
+-
+ while (bRunning) {
++ short buffer[iMicLength];
++
+ int len = static_cast<int>(iMicLength * iMicChannels * sizeof(short));
+ ssize_t l = read(fd, buffer, len);
+ if (l != len) {
diff --git a/media-sound/mumble/mumble-1.2.8.ebuild b/media-sound/mumble/mumble-1.2.8.ebuild
index e457a05..a0282bf 100644
--- a/media-sound/mumble/mumble-1.2.8.ebuild
+++ b/media-sound/mumble/mumble-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+ "${FILESDIR}"/${PN}-1.2.8-gcc49.patch
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/
@ 2020-06-15 9:56 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-06-15 9:56 UTC (permalink / raw
To: gentoo-commits
commit: afc960cb03b862c89be6840332deee8059dc3f5d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 09:54:00 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 09:56:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc960cb
media-sound/mumble: Security bump to version 1.3.1
Bug: https://bugs.gentoo.org/727598
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/mumble/Manifest | 2 +-
.../mumble/files/mumble-1.3.1_rc1-qt-5.15.patch | 28 ----------------------
...mumble-1.3.1_rc1.ebuild => mumble-1.3.1.ebuild} | 2 --
3 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 105fb3e2f1f..c6056d2712b 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,2 @@
DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
-DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
+DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
deleted file mode 100644
index 4268d56e829..00000000000
--- a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Mon, 1 Jun 2020 21:01:00 +0200
-Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath>
- include for Qt 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’
- 42 | QPainterPath qpp;
- | ^~~
----
- src/mumble/OverlayText.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
-index f06f2b63a8..c1cd9efdd7 100644
---- a/src/mumble/OverlayText.h
-+++ b/src/mumble/OverlayText.h
-@@ -6,6 +6,7 @@
- #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
- #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
-
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QFont>
-
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1.ebuild
similarity index 98%
rename from media-sound/mumble/mumble-1.3.1_rc1.ebuild
rename to media-sound/mumble/mumble-1.3.1.ebuild
index f23f44786ac..69f5d7055e0 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1.ebuild
@@ -64,8 +64,6 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692
-
# NB: qmake does not support multilib but it's fine to configure
# for the native ABI here
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/
@ 2022-02-25 16:09 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2022-02-25 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 9c19562ac6472473a6003b37816c33386db7fa23
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 16:07:21 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 16:08:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c19562a
media-sound/mumble: Added dev-cpp/nlohmann_json to DEPEND in live ebuild
Bug: https://bugs.gentoo.org/834030
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/mumble/files/mumble-9999-system_json.patch | 18 ++++++++++++++++++
media-sound/mumble/mumble-9999.ebuild | 5 +++++
2 files changed, 23 insertions(+)
diff --git a/media-sound/mumble/files/mumble-9999-system_json.patch b/media-sound/mumble/files/mumble-9999-system_json.patch
new file mode 100644
index 000000000000..2be7553d50ef
--- /dev/null
+++ b/media-sound/mumble/files/mumble-9999-system_json.patch
@@ -0,0 +1,18 @@
+diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
+index bb8df1671..51f83850e 100644
+--- a/src/mumble/CMakeLists.txt
++++ b/src/mumble/CMakeLists.txt
+@@ -472,12 +472,7 @@ else()
+ endif()
+
+
+-set(JSON_BuildTests OFF CACHE INTERNAL "")
+-set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
+-add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
+-
+-target_link_libraries(mumble_client_object_lib PUBLIC nlohmann_json::nlohmann_json)
+-
++find_pkg("nlohmann_json" REQUIRED)
+ find_pkg("SndFile;LibSndFile;sndfile" REQUIRED)
+
+ # Check if sndfile version supports opus
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 0f0d04d692c3..a5cfa6d410b7 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
"
DEPEND="${RDEPEND}
+ dev-cpp/nlohmann_json
dev-qt/qtconcurrent:5
dev-qt/qttest:5
>=dev-libs/boost-1.41.0
@@ -70,6 +71,10 @@ BDEPEND="
src_prepare() {
sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
+ if [[ "${PV}" == *9999 ]] ; then
+ PATCHES+=( "${FILESDIR}/${P}-system_json.patch" )
+ fi
+
# required because of xdg.eclass also providing src_prepare
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/
@ 2022-03-01 10:26 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2022-03-01 10:26 UTC (permalink / raw
To: gentoo-commits
commit: 583639c62e8515396d1d516cff9d1b66b12b151d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 10:26:15 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 10:26:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583639c6
media-sound/mumble: Drop merged patch
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../mumble/files/mumble-9999-system_json.patch | 60 ----------------------
media-sound/mumble/mumble-9999.ebuild | 4 --
2 files changed, 64 deletions(-)
diff --git a/media-sound/mumble/files/mumble-9999-system_json.patch b/media-sound/mumble/files/mumble-9999-system_json.patch
deleted file mode 100644
index bb04dc0a01e0..000000000000
--- a/media-sound/mumble/files/mumble-9999-system_json.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a239ccf62369880a0b08faf01021e7961ec1cc5a Mon Sep 17 00:00:00 2001
-From: Robert Adam <dev@robert-adam.de>
-Date: Fri, 25 Feb 2022 18:37:51 +0100
-Subject: [PATCH] BUILD(client): Add option to use system JSON lib
-
-This commit introduces an option that toggles between using a bundled
-version of nlohmann_json (default) and looking for a version installed
-on the system instead.
-
-Fixes #5584
----
- docs/dev/build-instructions/cmake_options.md | 5 +++++
- src/mumble/CMakeLists.txt | 11 ++++++++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/docs/dev/build-instructions/cmake_options.md b/docs/dev/build-instructions/cmake_options.md
-index 2a02b200b7..b395251069 100644
---- a/docs/dev/build-instructions/cmake_options.md
-+++ b/docs/dev/build-instructions/cmake_options.md
-@@ -34,6 +34,11 @@ Bundle Qt's translations as well
- Build the included version of CELT instead of looking for one on the system.
- (Default: ON)
-
-+### bundled-json
-+
-+Build the included version of nlohmann_json instead of looking for one on the system
-+(Default: ON)
-+
- ### bundled-opus
-
- Build the included version of Opus instead of looking for one on the system.
-diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
-index bb8df16714..5f1c14ba97 100644
---- a/src/mumble/CMakeLists.txt
-+++ b/src/mumble/CMakeLists.txt
-@@ -27,6 +27,7 @@ option(bundled-celt "Build the included version of CELT instead of looking for o
- option(bundled-speex "Build the included version of Speex instead of looking for one on the system." ON)
- option(rnnoise "Use RNNoise for machine learning noise reduction." ON)
- option(bundled-rnnoise "Build the included version of RNNoise instead of looking for one on the system." ${rnnoise})
-+option(bundled-json "Build the included version of nlohmann_json instead of looking for one on the system" ON)
-
- option(manual-plugin "Include the built-in \"manual\" positional audio plugin." ON)
-
-@@ -472,9 +473,13 @@ else()
- endif()
-
-
--set(JSON_BuildTests OFF CACHE INTERNAL "")
--set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
--add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
-+if(bundled-json)
-+ set(JSON_BuildTests OFF CACHE INTERNAL "")
-+ set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
-+ add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
-+else()
-+ find_pkg("nlohmann_json" REQUIRED)
-+endif()
-
- target_link_libraries(mumble_client_object_lib PUBLIC nlohmann_json::nlohmann_json)
-
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index abee2e9d032d..7574a19a1ad6 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -71,10 +71,6 @@ BDEPEND="
src_prepare() {
sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
- if [[ "${PV}" == *9999 ]] ; then
- PATCHES+=( "${FILESDIR}/${P}-system_json.patch" )
- fi
-
# required because of xdg.eclass also providing src_prepare
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/
@ 2022-05-11 1:30 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-05-11 1:30 UTC (permalink / raw
To: gentoo-commits
commit: fa650a14a85055ca24681cc7eae1a2cdf76e7456
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 01:29:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 11 01:29:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa650a14
media-sound/mumble: backport upstream fixes for new Poco, GCC 12
Closes: https://bugs.gentoo.org/842984
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mumble-1.4.230-gcc12-include-memory.patch | 28 ++++++++++++++++++++++
.../files/mumble-1.4.230-poco-link-cmake.patch | 24 +++++++++++++++++++
media-sound/mumble/mumble-1.4.230.ebuild | 2 ++
3 files changed, 54 insertions(+)
diff --git a/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch b/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
new file mode 100644
index 000000000000..624a8594d995
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
@@ -0,0 +1,28 @@
+https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca
+
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 27 Feb 2022 10:59:57 +0000
+Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> include
+
+Without the change the build fails on upcoming gcc-12 as:
+
+ /build/mumble/plugins/gtav/gtav.cpp:13:13:
+ error: 'unique_ptr' in namespace 'std' does not name a template type
+ 13 | static std::unique_ptr< Game > game;
+ | ^~~~~~~~~~
+ /build/mumble/plugins/gtav/gtav.cpp:12:1:
+ note: 'std::unique_ptr' is defined in header '<memory>';
+ did you forget to '#include <memory>'?
+ 11 | #include <cstring>
+ +++ |+#include <memory>
+ 12 |
+--- a/plugins/gtav/gtav.cpp
++++ b/plugins/gtav/gtav.cpp
+@@ -9,6 +9,7 @@
+ #include "mumble_positional_audio_utils.h"
+
+ #include <cstring>
++#include <memory>
+
+ static std::unique_ptr< Game > game;
+
diff --git a/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch b/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch
new file mode 100644
index 000000000000..d1b4dee11d51
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/842984
+https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030
+
+Fix underlinking against Poco.
+--- a/src/mumble/CMakeLists.txt
++++ b/src/mumble/CMakeLists.txt
+@@ -383,11 +383,16 @@ target_include_directories(mumble
+ "${PLUGINS_DIR}"
+ )
+
+-find_pkg(Poco COMPONENTS Zip)
++find_pkg(Poco
++ COMPONENTS
++ XML
++ Zip
++)
+
+ if(TARGET Poco::Zip)
+ target_link_libraries(mumble
+ PRIVATE
++ Poco::XML
+ Poco::Zip
+ )
+ else()
diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230.ebuild
index 8ddd32995916..c6c38d8a9fd2 100644
--- a/media-sound/mumble/mumble-1.4.230.ebuild
+++ b/media-sound/mumble/mumble-1.4.230.ebuild
@@ -71,6 +71,8 @@ BDEPEND="
PATCHES=(
"${WORKDIR}/${PN}-1.4-openssl3.patch"
+ "${FILESDIR}/${PN}-1.4.230-gcc12-include-memory.patch"
+ "${FILESDIR}/${PN}-1.4.230-poco-link-cmake.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-11 1:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-02 1:38 [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/ Ryan Hill
-- strict thread matches above, loose matches on Subject: below --
2020-06-15 9:56 Lars Wendler
2022-02-25 16:09 Lars Wendler
2022-03-01 10:26 Lars Wendler
2022-05-11 1:30 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox