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

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     ca6f7861621ebc5ce69dbc705c3870b83045d10f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 19:15:48 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 19:16:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6f7861

media-sound/strawberry: Drop superfluous patch

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../strawberry-0.8.5-make_backends_optional.patch  | 56 ----------------------
 media-sound/strawberry/strawberry-0.8.5.ebuild     |  8 +---
 media-sound/strawberry/strawberry-9999.ebuild      |  8 +---
 3 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch b/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch
deleted file mode 100644
index e1d54d15a0a..00000000000
--- a/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c0ab9083306a3664cc277dfcde9730f473d08a54 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 4 Jan 2021 16:55:12 +0100
-Subject: [PATCH] CMakeLists.txt: Make gstreamer/vlc backend search optional
-
-Gentoo-bug: https://bugs.gentoo.org/757780
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- CMakeLists.txt | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41027633..df093d88 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,6 +64,12 @@ if(BUILD_WERROR)
-   list(APPEND COMPILE_OPTIONS -Werror)
- endif(BUILD_WERROR)
- 
-+option(USE_GSTREAMER "Use Gstreamer as backend if found" ON)
-+option(USE_VLC "Use VLC as backend if found" ON)
-+if(NOT USE_GSTREAMER AND NOT USE_VLC)
-+  message( FATAL_ERROR "You need to enable either Gstreamer or VLC backend" )
-+endif()
-+
- add_compile_options(${COMPILE_OPTIONS})
- 
- if(${CMAKE_BUILD_TYPE} MATCHES "Release")
-@@ -119,13 +125,17 @@ pkg_check_modules(GLIB REQUIRED glib-2.0)
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
- pkg_check_modules(GIO REQUIRED gio-2.0)
- pkg_check_modules(LIBCDIO libcdio)
--pkg_check_modules(GSTREAMER gstreamer-1.0)
--pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
--pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
--pkg_check_modules(GSTREAMER_APP gstreamer-app-1.0)
--pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
--pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
--pkg_check_modules(LIBVLC libvlc)
-+if(USE_GSTREAMER)
-+  pkg_check_modules(GSTREAMER gstreamer-1.0)
-+  pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
-+  pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
-+  pkg_check_modules(GSTREAMER_APP gstreamer-app-1.0)
-+  pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
-+  pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
-+endif()
-+if(USE_VLC)
-+  pkg_check_modules(LIBVLC libvlc)
-+endif()
- pkg_check_modules(SQLITE REQUIRED sqlite3>=3.9)
- pkg_check_modules(LIBPULSE libpulse)
- pkg_check_modules(CHROMAPRINT libchromaprint)
--- 
-2.30.0
-

diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
index 5d1628e7686..0d5281b6b69 100644
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
@@ -84,10 +84,6 @@ REQUIRED_USE="
 	|| ( gstreamer vlc )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.5-make_backends_optional.patch" #757780
-)
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
@@ -105,13 +101,13 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_VLC="$(usex vlc)"
 		-DUSE_SYSTEM_TAGLIB=ON
-		-DUSE_VLC="$(usex vlc)"
 		-DWITH_QT6=OFF
 	)
 

diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 5d1628e7686..0d5281b6b69 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -84,10 +84,6 @@ REQUIRED_USE="
 	|| ( gstreamer vlc )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.5-make_backends_optional.patch" #757780
-)
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
@@ -105,13 +101,13 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_VLC="$(usex vlc)"
 		-DUSE_SYSTEM_TAGLIB=ON
-		-DUSE_VLC="$(usex vlc)"
 		-DWITH_QT6=OFF
 	)