gentoo auto-resync : 22:11:2023 - 17:18:34

3 files changed, 87 insertions, 1 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index eb24a28aa2b8..6bf461feb77c 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,7 +1,8 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
+AUX gerbera-1.12.1-gcc14.patch 2571 BLAKE2B cdebe5f239de5136d646e4efb249deda94daa95944dcfd701d9b664f39150adcce86cb96c628fc09e3b3b17103e84181e441a59c2f115f3e659b2fdf49fe8fb9 SHA512 6661d5cfc5bfdbfa97f059d8c715cc3e6a24f89f55fba44d2a0333795e336039076f0165b4f03866947aa3fdf43d2bf0c3b19e56832f925ea429d6be9843130b
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2
-EBUILD gerbera-1.12.1-r1.ebuild 2194 BLAKE2B cc62407f2bd812cdfa03cffa2b9504f953fc1b00418b4d881ab098a30f2013b29b70de1af8326d19c07bebb4a2adb4fcf34bb0df0062c25d4606cba417f56152 SHA512 800f164b3f3e717842031ec98055e2ebfb6afbfd72577816794fc88176806c8948a8189226ddea9cd7b86e3fcf138218c7463a7b7b0cb7b2ad0d77f8c4bc3248
+EBUILD gerbera-1.12.1-r1.ebuild 2247 BLAKE2B 03d0a04315f26bb90825d4018a6c823631f0e574c6309d7d20d9a733ad7fad5a71d3a92eddfe8039a21acfea7baabba32f1b783ab1f95daec73e957f79c8a680 SHA512 2c36f21d4cbe8ef9dce7e9c21b6b10198ec36553024e146de1d6368497791327ebb4d1f03b34b77bf28a8ee3fed5dd62967adf33d12823fc6bc6b8db430eb23a
 EBUILD gerbera-9999.ebuild 2195 BLAKE2B 178eac044ee2fcc40d490807d4bc8474eafb3e8ad6e0c2a23688685b6d75fff96beb1e1c7db66ec07303094f4895dc774afda7361b15fd5f6154eabf31404c9e SHA512 c6f232bf998e3cccf014abec46dc8c9d299dc48c34cd589dd7a07585368d3aacb182296ff5bceb443aea3c563560109d48fb37f5f0ec8beac952273801730e68
 MISC metadata.xml 1153 BLAKE2B 160ec07f27637335374b7c1232c65942d661b66ab89f9e145ffcbadd510ea454a52cef9ab8e544ed46c0c11f56f69b1c659b4f604b0c65ada19f66f1d857586e SHA512 95da4ff4383a5fa1467ea5674c38cb6c8b7939fa01e7a66bac42bb2e3d21dfc020c2585bc6e81af602a227c978e3fe1dc3950ef962b17cbbc11a0cea0413d9b3
diff --git a/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch
new file mode 100644
index 000000000000..9e84f53b3ef4
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch
@@ -0,0 +1,81 @@
+From 07f78866608c8f1094696615932e2d8382e5fd8c Mon Sep 17 00:00:00 2001
+From: Kostadin Shishmanov <kocelfc@tutanota.com>
+Date: Thu, 16 Nov 2023 21:17:34 +0200
+Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14
+
+Gentoo bug: https://bugs.gentoo.org/917136
+
+Upstream PR: https://github.com/gerbera/gerbera/pull/2899
+
+Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
+---
+ src/cds/cds_objects.h                     | 1 +
+ src/iohandler/io_handler_buffer_helper.cc | 2 ++
+ src/iohandler/mem_io_handler.cc           | 2 ++
+ src/util/tools.h                          | 1 +
+ src/util/upnp_clients.cc                  | 2 ++
+ 5 files changed, 8 insertions(+)
+
+diff --git a/src/cds/cds_objects.h b/src/cds/cds_objects.h
+index 4283a3af5..a4b9c1d01 100644
+--- a/src/cds/cds_objects.h
++++ b/src/cds/cds_objects.h
+@@ -34,6 +34,7 @@
+ #ifndef __CDS_OBJECTS_H__
+ #define __CDS_OBJECTS_H__
+ 
++#include <algorithm>
+ #include <map>
+ #include <memory>
+ #include <vector>
+diff --git a/src/iohandler/io_handler_buffer_helper.cc b/src/iohandler/io_handler_buffer_helper.cc
+index ee1de602e..49afd3c8c 100644
+--- a/src/iohandler/io_handler_buffer_helper.cc
++++ b/src/iohandler/io_handler_buffer_helper.cc
+@@ -36,6 +36,8 @@
+ 
+ #include "config/config_manager.h"
+ 
++#include <algorithm>
++
+ IOHandlerBufferHelper::IOHandlerBufferHelper(std::shared_ptr<Config> config, std::size_t bufSize, std::size_t initialFillSize)
+     : config(std::move(config))
+     , bufSize(bufSize)
+diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc
+index 534c452da..230f4aa85 100644
+--- a/src/iohandler/mem_io_handler.cc
++++ b/src/iohandler/mem_io_handler.cc
+@@ -34,6 +34,8 @@
+ 
+ #include "mem_io_handler.h" // API
+ 
++#include <algorithm>
++
+ MemIOHandler::MemIOHandler(const void* buffer, int length)
+     : buffer(new char[length])
+     , length(length)
+diff --git a/src/util/tools.h b/src/util/tools.h
+index 177f09900..de2481c87 100644
+--- a/src/util/tools.h
++++ b/src/util/tools.h
+@@ -33,6 +33,7 @@
+ #ifndef __TOOLS_H__
+ #define __TOOLS_H__
+ 
++#include <algorithm>
+ #include <map>
+ #include <optional>
+ #include <vector>
+diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc
+index e07fb4508..d95f426fb 100644
+--- a/src/util/upnp_clients.cc
++++ b/src/util/upnp_clients.cc
+@@ -33,6 +33,8 @@
+ 
+ #include <upnp.h>
+ 
++#include <algorithm>
++
+ std::shared_ptr<ClientStatusDetail> ClientStatusDetail::clone() const
+ {
+     return std::make_shared<ClientStatusDetail>(group, itemId, playCount, lastPlayed.count(), lastPlayedPosition.count(), bookMarkPos.count());
diff --git a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild
index 28552ca8d1de..c7fbd27a2fa3 100644
--- a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild
@@ -48,6 +48,10 @@ DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12.1-gcc14.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_AVCODEC=$(usex ffmpeg)