public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2016-04-12 17:41 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2016-04-12 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     01c937900910b60d2c59095de0aab41511bb7555
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 17:41:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 17:41:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=01c93790

media-sound/amarok: Fix build with USE -embedded

By adding upstreamed patch from Matt Whitlock <gentoo <AT> mattwhitlock.name>.

Gentoo-bug: 566980

Package-Manager: portage-2.2.28

 media-sound/amarok/amarok-2.8.90.ebuild            |  5 +++-
 .../files/amarok-2.8.90-mysql-embedded.patch       | 34 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild
index d9f9871..4db4e97 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -72,7 +72,10 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdeapps_dep phonon-kde)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.8.0-taglib110.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
+	"${FILESDIR}/${P}-mysql-embedded.patch"
+)
 
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707

diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
new file mode 100644
index 0000000..b03aa18
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
@@ -0,0 +1,34 @@
+From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Tue, 29 Mar 2016 12:22:41 -0400
+Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if
+ WITH_MYSQL_EMBEDDED
+
+REVIEW: 127523
+---
+ src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+index 244cde1..4c618fc 100644
+--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
++++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
+     ${KDE4_KDECORE_LIBS}
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+-    ${MYSQL_EMBEDDED_LIBRARIES}
+     ${CMAKE_DL_LIBS}
+     ${ZLIB_LIBRARIES}
+ )
+ 
++if(WITH_MYSQL_EMBEDDED)
++    target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
++endif(WITH_MYSQL_EMBEDDED)
++
+ if(NOT WIN32 AND NOT APPLE)
+     target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
+-- 
+2.8.1
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2016-04-27 17:52 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2016-04-27 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d7bd8b80fc776de1c90e9eedc9a3543aa3c22be8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 17:51:36 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 17:52:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7bd8b80

media-sound/amarok: Remove 2.8.90

Moved to gentoo main tree.

Package-Manager: portage-2.2.28

 media-sound/amarok/amarok-2.8.90.ebuild            | 128 ---------------------
 .../amarok/files/amarok-2.8.0-taglib110.patch      |  40 -------
 .../files/amarok-2.8.90-mysql-embedded.patch       |  34 ------
 media-sound/amarok/metadata.xml                    |   1 -
 4 files changed, 203 deletions(-)

diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild
deleted file mode 100644
index 4db4e97..0000000
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2[qt4(+)]
-	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdeapps_dep libkcddb)
-		$(add_kdeapps_dep libkcompactdisc)
-		$(add_kdeapps_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl:0
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
-	"${FILESDIR}/${P}-mysql-embedded.patch"
-)
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		-DWITH_NepomukCore=OFF
-		-DWITH_Soprano=OFF
-		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
-		-DWITH_IPOD=$(usex ipod)
-		-DWITH_GDKPixBuf=$(usex ipod)
-		-DWITH_LibLastFm=$(usex lastfm)
-		-DWITH_MP3Tunes=$(usex mp3tunes)
-		-DWITH_Mtp=$(usex mtp)
-		-DWITH_LibOFA=$(usex ofa)
-		-DWITH_UTILITIES=$(usex utils)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-			echo
-		fi
-	fi
-}

diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
deleted file mode 100644
index 0934816..0000000
--- a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Omar Plummer <omarplummer@imergetechnologies.com>
-Date: Thu, 06 Aug 2015 22:24:27 +0000
-Subject: Fix TagLib version check.
-X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904
----
-Fix TagLib version check.
-
-The version check compared version strings lexicographically, so "1.7"
-(the min version) compared as greater than "1.10.0".
-
-BUG: 351013
-REVIEW: 124639
----
-
-
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@
- 
-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-      set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
- 
-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -42,7 +42,7 @@
-         set(TAGLIB_FOUND TRUE)
-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- else(TAGLIBCONFIG_EXECUTABLE)
-

diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
deleted file mode 100644
index b03aa18..0000000
--- a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <kde@mattwhitlock.name>
-Date: Tue, 29 Mar 2016 12:22:41 -0400
-Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if
- WITH_MYSQL_EMBEDDED
-
-REVIEW: 127523
----
- src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
-index 244cde1..4c618fc 100644
---- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
-+++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
-@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
-     ${KDE4_KDECORE_LIBS}
-     ${QT_QTCORE_LIBRARY}
-     ${QT_QTGUI_LIBRARY}
--    ${MYSQL_EMBEDDED_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     ${ZLIB_LIBRARIES}
- )
- 
-+if(WITH_MYSQL_EMBEDDED)
-+    target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
-+endif(WITH_MYSQL_EMBEDDED)
-+
- if(NOT WIN32 AND NOT APPLE)
-     target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
- endif(NOT WIN32 AND NOT APPLE)
--- 
-2.8.1
-

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 6043c6c..136f0c7 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -19,7 +19,6 @@
 		it will make amarok rely only on standalone MySQL server.</flag>
 		<flag name="lastfm">Enable Last.fm streaming services support through
 		<pkg>media-libs/liblastfm</pkg></flag>
-		<flag name="mp3tunes">Enable mp3tunes integration</flag>
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
 		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)</flag>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2018-03-19 21:51 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-03-19 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     70e741b9b265af7dbe13c21fb91dead0997d99e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 21:50:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 21:51:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70e741b9

media-sound/amarok: Find liblastfm header path

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild              |  5 ++++-
 .../amarok/files/amarok-liblastfm-headers.patch    | 25 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 6cfbeb8ca7..863557895f 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -85,7 +85,10 @@ RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok:4
 "
 
-PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch
+	"${FILESDIR}"/${PN}-liblastfm-headers.patch
+)
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/media-sound/amarok/files/amarok-liblastfm-headers.patch b/media-sound/amarok/files/amarok-liblastfm-headers.patch
new file mode 100644
index 0000000000..7120db0412
--- /dev/null
+++ b/media-sound/amarok/files/amarok-liblastfm-headers.patch
@@ -0,0 +1,25 @@
+From b331e6e7c0e34dd896e21b9d1569214a0ec0fddb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 19 Mar 2018 22:26:54 +0100
+Subject: [PATCH] Search for liblastfm header path without suffix
+
+---
+ cmake/modules/FindLibLastFm.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindLibLastFm.cmake b/cmake/modules/FindLibLastFm.cmake
+index a3a065f181..ef89423c90 100644
+--- a/cmake/modules/FindLibLastFm.cmake
++++ b/cmake/modules/FindLibLastFm.cmake
+@@ -13,7 +13,7 @@ find_path(LIBLASTFM_INCLUDE_DIR NAMES global.h
+    /opt/local/include
+    /usr/include
+    /usr/local/include
+-   PATH_SUFFIXES lastfm5
++   PATH_SUFFIXES lastfm5 lastfm
+ )
+ 
+ find_library( LIBLASTFM_LIBRARY NAMES lastfm5
+-- 
+2.16.2
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2018-03-22 18:45 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-03-22 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4b0a8075fd9834060a509b1671ace4c7c486572d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 17:38:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 17:38:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b0a8075

media-sound/amarok: Depend on correct liblastfm version

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/amarok/amarok-9999.ebuild              |  7 ++----
 .../amarok/files/amarok-liblastfm-headers.patch    | 25 ----------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index d573a1e07e..c7e76ed391 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -73,7 +73,7 @@ COMMONDEPEND="
 		dev-libs/glib:2
 		>=media-libs/libgpod-0.7.0[gtk]
 	)
-	lastfm? ( media-libs/liblastfm[qt5(+)] )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
 	wikipedia? ( $(add_qt_dep qtwebengine) )
@@ -87,10 +87,7 @@ RDEPEND="${COMMONDEPEND}
 	$(add_qt_dep qtquickcontrols2)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch
-	"${FILESDIR}"/${PN}-liblastfm-headers.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/media-sound/amarok/files/amarok-liblastfm-headers.patch b/media-sound/amarok/files/amarok-liblastfm-headers.patch
deleted file mode 100644
index 7120db0412..0000000000
--- a/media-sound/amarok/files/amarok-liblastfm-headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b331e6e7c0e34dd896e21b9d1569214a0ec0fddb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 19 Mar 2018 22:26:54 +0100
-Subject: [PATCH] Search for liblastfm header path without suffix
-
----
- cmake/modules/FindLibLastFm.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindLibLastFm.cmake b/cmake/modules/FindLibLastFm.cmake
-index a3a065f181..ef89423c90 100644
---- a/cmake/modules/FindLibLastFm.cmake
-+++ b/cmake/modules/FindLibLastFm.cmake
-@@ -13,7 +13,7 @@ find_path(LIBLASTFM_INCLUDE_DIR NAMES global.h
-    /opt/local/include
-    /usr/include
-    /usr/local/include
--   PATH_SUFFIXES lastfm5
-+   PATH_SUFFIXES lastfm5 lastfm
- )
- 
- find_library( LIBLASTFM_LIBRARY NAMES lastfm5
--- 
-2.16.2
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2020-09-29 20:12 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-09-29 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     0893880fb0286783f00a67f0c377aa1785139cb4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 19:58:43 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 20:12:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0893880f

media-sound/amarok: Add IUSE=mariadb, update dependencies

- Set ECM_HANDBOOK="forceoptional"
- Drop obsolete patch
- Update MySQLe disable switch
- Update pkg_postinst info mechanism wrt USE mariadb state

Upstream commits:
f319fef25c654f726a056a7d09a290f447716235
6606c064f5a0cdcd1e51459fa76a7e3325ec4456
4337b3ef6e9ed30606fd06e15fd9ca350b1da01b
03ef605c9273d76a5802bdd2160cc5a52833f81c
822eddec49e1f976ee795d89c62bfea7210d2b61

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/amarok/amarok-9999.ebuild                | 20 ++++++++++----------
 .../amarok/files/amarok-2.8.90-mysqld-rpath.patch    | 12 ------------
 media-sound/amarok/metadata.xml                      |  8 ++------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index c1b5f87557..2bdbadffea 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ECM_HANDBOOK="true"
+ECM_HANDBOOK="forceoptional"
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org
@@ -13,13 +13,12 @@ HOMEPAGE="https://amarok.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="ipod lastfm mtp ofa podcast wikipedia"
+IUSE="ipod lastfm mariadb mtp ofa podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=app-crypt/qca-2.3.0:2
-	dev-db/mysql-connector-c:=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -73,32 +72,33 @@ DEPEND="
 		media-video/ffmpeg:=
 	)
 	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	!mariadb? ( dev-db/mysql-connector-c:= )
 	mtp? ( media-libs/libmtp )
 	podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
 	wikipedia? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
 	!ofa? ( media-video/ffmpeg )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
 		-DWITH_UTILITIES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
-		-DWITH_MYSQL_EMBEDDED=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_MySQLe=ON
 		-DWITH_IPOD=$(usex ipod)
 		$(cmake_use_find_package lastfm LibLastFm)
+		$(cmake_use_find_package !mariadb MySQL)
 		$(cmake_use_find_package mtp Mtp)
 		$(cmake_use_find_package ofa LibOFA)
 		$(cmake_use_find_package podcast Mygpo-qt5)
 		$(cmake_use_find_package wikipedia Qt5WebEngine)
 	)
-
 	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
 
 	ecm_src_configure
@@ -112,9 +112,9 @@ pkg_postinst() {
 	}
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You'll have to configure amarok to use an external db server, one of:"
-		elog "    $(pkg_is_installed dev-db/mariadb)"
-		elog "    $(pkg_is_installed dev-db/mysql)"
+		elog "You'll have to configure amarok to use an external db server:"
+		use mariadb && elog "    $(pkg_is_installed dev-db/mariadb)" ||
+			elog "    $(pkg_is_installed dev-db/mysql)"
 		elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
 		elog "to configure the external db and migrate your data from the embedded database."
 	fi

diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
deleted file mode 100644
index 08db5bbe37..0000000000
--- a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt	2016-05-04 11:01:25.000000000 -0400
-+++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt	2016-05-04 11:05:24.216625165 -0400
-@@ -28,6 +28,9 @@
-     ${ZLIB_LIBRARIES}
- )
- 
-+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}")
-+
- if(NOT WIN32 AND NOT APPLE)
-     target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
- endif(NOT WIN32 AND NOT APPLE)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 98843fda4c..89bebc990c 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -9,13 +9,9 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
 	<use>
-		<flag name="lastfm">Enable Last.fm streaming services support through
-		<pkg>media-libs/liblastfm</pkg></flag>
+		<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
+		<flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
 		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
 		<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)</flag>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-29 20:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-22 18:45 [gentoo-commits] proj/kde:master commit in: media-sound/amarok/files/, media-sound/amarok/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-09-29 20:12 Andreas Sturmlechner
2018-03-19 21:51 Andreas Sturmlechner
2016-04-27 17:52 Johannes Huber
2016-04-12 17:41 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox