[gentoo-commits] repo/gentoo:master commit in: media-sound/snapcast/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/snapcast/files/

[Joonas Niilola]

commit:     1e1109bd3e34483c11e56e4b16da8f9407cea4d1
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Nov 25 18:50:40 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 07:29:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1109bd

media-sound/snapcast: remove unused patch

Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/snapcast-options-for-use-flags.patch     | 90 ----------------------
 1 file changed, 90 deletions(-)

diff --git a/media-sound/snapcast/files/snapcast-options-for-use-flags.patch b/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
deleted file mode 100644
index 956d6299d45..00000000000
--- a/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52fec6e..d068db1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,11 @@ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
- option(BUILD_SERVER "Build Snapserver" ON)
- option(BUILD_CLIENT "Build Snapclient" ON)
- 
-+option(BUILD_WITH_FLAC "Build with FLAC support" ON)
-+option(BUILD_WITH_VORBIS "Build with VORBIS support" ON)
-+option(BUILD_WITH_TREMOR "Build with vorbis using TREMOR" ON)
-+option(BUILD_WITH_AVAHI "Build with AVAHI support" ON)
-+
- 
- if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
-     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
-@@ -109,10 +114,12 @@ else()
-         endif (ALSA_FOUND)
-     endif()
- 
--    pkg_search_module(AVAHI avahi-client)
--    if (AVAHI_FOUND)
--        add_definitions(-DHAS_AVAHI)
--    endif (AVAHI_FOUND)
-+    if(BUILD_WITH_AVAHI)
-+        pkg_search_module(AVAHI avahi-client)
-+        if (AVAHI_FOUND)
-+            add_definitions(-DHAS_AVAHI)
-+        endif (AVAHI_FOUND)
-+    endif(BUILD_WITH_AVAHI)
- 
-     add_definitions(-DHAS_DAEMON)
- 
-@@ -154,29 +161,39 @@ if(NOT HAS_CXX11_STRING_SUPPORT)
-     add_definitions("-DNO_CPP11_STRING")
- endif()
- 
--pkg_search_module(FLAC flac)
--if (FLAC_FOUND)
--    add_definitions("-DHAS_FLAC")
--endif (FLAC_FOUND)
-+if(BUILD_WITH_FLAC)
-+    pkg_search_module(FLAC flac)
-+    if (FLAC_FOUND)
-+        add_definitions("-DHAS_FLAC")
-+    endif (FLAC_FOUND)
-+endif()
- 
--pkg_search_module(OGG ogg)
--if (OGG_FOUND)
--    add_definitions("-DHAS_OGG")
--endif (OGG_FOUND)
-+if(BUILD_WITH_VORBIS OR BUILD_WITH_TREMOR)
-+    pkg_search_module(OGG ogg)
-+    if (OGG_FOUND)
-+        add_definitions("-DHAS_OGG")
-+    endif (OGG_FOUND)
-+endif()
- 
--pkg_search_module(VORBIS vorbis)
--if (VORBIS_FOUND)
--    add_definitions("-DHAS_VORBIS")
--endif (VORBIS_FOUND)
-+if(BUILD_WITH_VORBIS)
-+    pkg_search_module(VORBIS vorbis)
-+    if (VORBIS_FOUND)
-+        add_definitions("-DHAS_VORBIS")
-+    endif (VORBIS_FOUND)
-+endif()
- 
--pkg_search_module(TREMOR vorbisidec)
--if (TREMOR_FOUND)
--    add_definitions("-DHAS_TREMOR")
--endif (TREMOR_FOUND)
-+if(BUILD_WITH_TREMOR)
-+    pkg_search_module(TREMOR vorbisidec)
-+    if (TREMOR_FOUND)
-+        add_definitions("-DHAS_TREMOR")
-+    endif (TREMOR_FOUND)
-+endif()
- 
--pkg_search_module(VORBISENC vorbisenc)
--if (VORBISENC_FOUND)
--    add_definitions("-DHAS_VORBISENC")
-+if(BUILD_WITH_VORBIS)
-+    pkg_search_module(VORBISENC vorbisenc)
-+    if (VORBISENC_FOUND)
-+        add_definitions("-DHAS_VORBISENC")
-+    endif(VORBISENC_FOUND)
- endif()

[gentoo-commits] repo/gentoo:master commit in: media-sound/snapcast/files/

[Conrad Kostecki]

commit:     8459f4f4c67544b6741ea8f6d8752b232a9a62f0
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 27 11:43:12 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 22:07:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8459f4f4

media-sound/snapcast: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24771
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../snapcast/files/snapcast-0.20.0-gcc-11.patch    | 11 ---------
 .../snapcast/files/snapcast-0.25.0-cxx17.patch     | 27 ----------------------
 2 files changed, 38 deletions(-)

diff --git a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch b/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
deleted file mode 100644
index 7ae562aaef05..000000000000
--- a/media-sound/snapcast/files/snapcast-0.20.0-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/786303
---- a/common/message/message.hpp
-+++ b/common/message/message.hpp
-@@ -29,6 +29,7 @@
- #include <sys/time.h>
- #endif
- #include <vector>
-+#include <memory>
- 
- /*
- template<typename CharT, typename TraitsT = std::char_traits<CharT> >

diff --git a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch b/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
deleted file mode 100644
index f6797a62f85f..000000000000
--- a/media-sound/snapcast/files/snapcast-0.25.0-cxx17.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitlab.exherbo.org/exherbo/media/-/blob/master/packages/net-apps/snapcast/files/snapcast-Set-CMAKE_CXX_STANDARD-to-17.patch
-
-From 9858c60109c5d4aa09c26d1cb44be5c056849a36 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 15 Oct 2021 23:55:39 +0200
-Subject: [PATCH] Set CMAKE_CXX_STANDARD to 17
-
-Fixes the build with boost[>=1.77.0] and we shouldn't have compilers
-which don't support it.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4381a71c..5373f658 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,7 +127,7 @@ if(NOT ANDROID)
- endif()
- 
- # Configure compiler options
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- 
- # Get arch
- include(${CMAKE_SOURCE_DIR}/cmake/TargetArch.cmake)
-