From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3964D13835A for ; Thu, 26 Nov 2020 07:53:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A8DEE090E; Thu, 26 Nov 2020 07:53:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 310D6E090E for ; Thu, 26 Nov 2020 07:53:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5CAD341314 for ; Thu, 26 Nov 2020 07:53:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF34F46A for ; Thu, 26 Nov 2020 07:53:25 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1606375768.1e1109bd3e34483c11e56e4b16da8f9407cea4d1.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/snapcast/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/snapcast/files/snapcast-options-for-use-flags.patch X-VCS-Directories: media-sound/snapcast/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 1e1109bd3e34483c11e56e4b16da8f9407cea4d1 X-VCS-Branch: master Date: Thu, 26 Nov 2020 07:53:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6953e155-791c-4672-b5d0-3fd17e7ad647 X-Archives-Hash: 028dceb73acf14ab00e3c675b7326925 commit: 1e1109bd3e34483c11e56e4b16da8f9407cea4d1 Author: Jakov Smolic sartura hr> AuthorDate: Wed Nov 25 18:50:40 2020 +0000 Commit: Joonas Niilola gentoo 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 sartura.hr> Signed-off-by: Joonas Niilola 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()