summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2011-05-08 16:21:45 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2011-05-08 16:21:45 +0000
commit46eef33abe9f99721ea70976412a80f8af5448e0 (patch)
tree4279e4808ab6b733e58a7379c320c960309ada8e
parentHandle USB devices better (bug #356215) (diff)
downloadhistorical-46eef33abe9f99721ea70976412a80f8af5448e0.tar.gz
historical-46eef33abe9f99721ea70976412a80f8af5448e0.tar.bz2
historical-46eef33abe9f99721ea70976412a80f8af5448e0.zip
Bumped amarok to the 2.4.1 release.
Renamed the patch to fix the upnp detection. Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
-rw-r--r--media-sound/amarok/ChangeLog10
-rw-r--r--media-sound/amarok/Manifest33
-rw-r--r--media-sound/amarok/amarok-2.4.0.90.ebuild4
-rw-r--r--media-sound/amarok/amarok-2.4.1.ebuild159
-rw-r--r--media-sound/amarok/files/amarok-fix-upnp-dep.patch37
5 files changed, 225 insertions, 18 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 2df45a9e2dcc..427b401d36d7 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-sound/amarok
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.404 2011/04/26 22:03:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.405 2011/05/08 16:21:45 jmbsvicetto Exp $
+
+*amarok-2.4.1 (08 May 2011)
+
+ 08 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ amarok-2.4.0.90.ebuild, +amarok-2.4.1.ebuild,
+ +files/amarok-fix-upnp-dep.patch:
+ Bumped amarok to the 2.4.1 release.
+ Renamed the patch to fix the upnp detection.
26 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
amarok-2.4.0.90.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index a1177f5a8054..a02d48b31479 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,28 +5,31 @@ AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf694
AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 RMD160 897a669e6a26e2559e713004849c19b7bd7f1033 SHA1 c6915369c3ecbceac7a8c5b8246f485fb760c2f4 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf
AUX amarok-2.4.0.90-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
+AUX amarok-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
DIST amarok-2.3.2.tar.bz2 13948250 RMD160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 SHA1 594d6d3ad57832fb80ba4387459356132d37ace2 SHA256 842569da06b4ebfc334f3530a77f900ea30b3b8968698bda8082b4b991488237
DIST amarok-2.4.0.90.tar.bz2 15190982 RMD160 9243c6d1be194829fa5ef21fa970457343ebf109 SHA1 c71d7fd28d42030ca887c7f24655ac4a47956c5a SHA256 4379d9f7b960ff2045f47c14b3866ca298e98c4bad82fe84fea08e52320ccb2a
DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
+DIST amarok-2.4.1.tar.bz2 15246413 RMD160 090a9a024701baf7e08fb8c63374156beb284b5d SHA1 1b1180e7799ff1314ee5a6409a612ede37ce8394 SHA256 0d4e516101c0e37e6dbc8b5a05c68c5fa04473d91fa16dd021b3891582a25d65
EBUILD amarok-2.3.2-r1.ebuild 4427 RMD160 3ab4b38f359a865586962bf4e740c52bb832fb9d SHA1 8b90eeea7d04d838b51865c3dde7edb6a021d040 SHA256 78dbacbc22a749251080c8c996c54a408e1040f3e49f9ccfc0ad5f9cab28a7fb
-EBUILD amarok-2.4.0.90.ebuild 4422 RMD160 774618f1d7aec80a2b36856caf6c5fd256bc26a9 SHA1 c4083658ca5a8a7a00d1465088a1241441656a89 SHA256 216a6ded8317068521b5a1004477e06d858724a987b860639828eb0ca045dfbf
+EBUILD amarok-2.4.0.90.ebuild 4423 RMD160 4ba9bf28bfc6841db5a5d8b499b5f200588ef237 SHA1 2fd07d049f788dbcb1c446ede65681c9323f4582 SHA256 1b500fdb6594ef46709ed499483ddacf7b96a58a172861422b92ccd4ba5e4d37
EBUILD amarok-2.4.0.ebuild 3993 RMD160 b2f25d4da246881dcc9832de88cdf237503e8f70 SHA1 8ae9fc1c8643b4f66fc6579be07c642f97def5fe SHA256 784354df2100a93e5eb75f3720be8636da0d2c657ea1a14adee0ae6db9095a7a
-MISC ChangeLog 69471 RMD160 4b507ce904486994cd5e9596066e47ac2387eda2 SHA1 a1ffc3733fc4664ae2981ea163b430686ab9d867 SHA256 5cd7ed87e7fa248e33dd9d66201cf8333189cd8aaae4b8874e7e287728c6f6aa
+EBUILD amarok-2.4.1.ebuild 4374 RMD160 ca44e603febbeb8ca5ec62bc8d79dfc079e225b5 SHA1 7beb6caf087704f08e6f7a7bdb2b9e062079faf8 SHA256 678ac81d6ab4c6407f199f087e4d1fabd29bbf9fdefca8e1ba085f5556113b65
+MISC ChangeLog 69737 RMD160 3adaa17ddd35ef8eb56d7f9c2fdf8a087e165949 SHA1 d5200bd754cfbf845c83d370f4178777a077fc74 SHA256 defa10461dffa8bcf5aab6fce6c5ec26eb95170ab0754962b83850c71ee62077
MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJNt0CyAAoJEC8ZTXQF1qEPfeYQALeaVVeAMU8hkHPmQpPxUbXr
-ug1bmnoJ9UnpzaU4cpoxiE4XSDrNTJ1wz3pr+CgF0xM8MEFuQ4eIbNEu0WutWYUE
-PNKVbe3ILdVYJ51evd4pzSI/nMqvhzA0hRpfcuZoCUC0SeohM/eo8srkcYaEC677
-xX7U3+efS4nPFKuYeITTNMSZ0ESv97d2gq6j0wb9ECPqc43ZSyHVwHC7Uvj69Fsu
-3o/oCTN6g3sKXY3qF0U5MMhulMPwmtUubyC2lMtnbblS2jTgSI9Q2QmVlKToCGkb
-0QLmn674oRskL8e8+GdKmnd+8OPJMQAChmg9NqmGfO7kmT+zOSrjwiKdyTyQ7M1V
-KhWRbIsdmy2IHW0OJVAf+cQzX0vzLY6Y8J3BEDkRRgGr4bBnn2yBuKCzX3JDiosw
-3OfteGVoiUyPnjdCrlWWIgH4vGTnGxO7JR8a9DbJNUnAYA8hydIGTN05qd/hcGQs
-BfZz9GC/FUSVRjwGrAKo/KvIxFqCA0UQZEjsSBN6zMcIWvjKT/3YgVd/lU6teFW0
-Xzhv1TYZzBWOA/hd+vo9/di+8XDRGnai7cjsWLvqAKQmvf39mzMZ3iKIw5AnDsRQ
-GWIMfK1b0oX2cVqYCc6qPPltgwZnUqQ4l3QBEvWu6rMvhP3biIuahT9agbO5C0WL
-RluAGv5uBEZ3GOahIoby
-=4Qx1
+iQIcBAEBCAAGBQJNxsJeAAoJEC8ZTXQF1qEPUlgP/i8LRvnFiiogbgGzPrrVx+/s
+Jm/ZrEks1t8ryEbVG3NpQbK+XjSHFppdhoQJIjaWIhMr5LmIPJITqvOVdcuNn+O5
+JaSRv3H1W1ncD6HA3nUKayr7GLJ9fMwx6AE5hlLtkehnRTXfD1A+nyBxfEp/VRxy
+6tfIj4qv84qQkdnfj2X6SlFUcfOUSlzxaGLH8q1JDlFL6HQRggmALCzMNDN/nEG7
+Lh0n4xwyiDzeBnW2zBC2rXTJ2Z8uGDrYea3vKQvlzf4+XQMeUaXGYIfJBMAKM9Fj
+FZ5bta2oQzeCPbvel6lYUZyaAXhp1VYX7I7+yCy8g/pJAr/bwKfH8g+GLE/zg1S3
+fh7NgGwGDmFjg6fNB9VlNOC11idb9JVKxD7OHCFNqSTuVILML5ybhayQqmVthw0u
+woXacJQ1iMC9KXsBskauwdDxpz2iGGcuZkI0Dn3Qb/YnbhJfVdDo6sWacbn/V+9X
+af8QLLhdyz+K4DbnmG++cKesZQtUyWK4QRUmZ35mPzFkJCccJz/yKwSew+VWck/l
+MbG2l3NSW7DyLZRToAh+2KxaVspXHGRSyUHpEXU4rGiJHngAjOOTAgpwD3jAST8h
+/qPB/nUGKsSthEh1zaFoMRdpPw4SJsNEYgVKG1JdzIcewPqq0073MSK2/g7aO1cy
+uKhKN94RWsKqGdqWxiS7
+=Gk9Z
-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.4.0.90.ebuild b/media-sound/amarok/amarok-2.4.0.90.ebuild
index a3beac142591..06b94c0db33e 100644
--- a/media-sound/amarok/amarok-2.4.0.90.ebuild
+++ b/media-sound/amarok/amarok-2.4.0.90.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.90.ebuild,v 1.4 2011/04/26 22:03:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.90.ebuild,v 1.5 2011/05/08 16:21:45 jmbsvicetto Exp $
EAPI="3"
@@ -79,7 +79,7 @@ RDEPEND="${COMMONDEPEND}
# Upstream patch to fix the plugin detection on startup
# https://projects.kde.org/projects/extragear/multimedia/amarok/repository/revisions/37eda947bd8181a73ad0fffc88e66c25ddd69f28
PATCHES=(
- "${FILESDIR}/${P}-fix-upnp-dep.patch"
+ "${FILESDIR}/${PN}-fix-upnp-dep.patch"
"${FILESDIR}/${P}-fix-plugin-detection.patch"
)
diff --git a/media-sound/amarok/amarok-2.4.1.ebuild b/media-sound/amarok/amarok-2.4.1.ebuild
new file mode 100644
index 000000000000..1b91eb3fcb82
--- /dev/null
+++ b/media-sound/amarok/amarok-2.4.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.1.ebuild,v 1.1 2011/05/08 16:21:45 jmbsvicetto Exp $
+
+EAPI="3"
+
+# Translations are only in the tarballs, not the git repo
+if [[ ${PV} != *9999* ]]; then
+ KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr hu it ja km nb nds nl
+ pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KDE_SCM="git"
+ KEYWORDS=""
+fi
+
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded handbook ipod lastfm mp3tunes mtp opengl playdar +player semantic-desktop upnp +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+ >=media-libs/taglib-1.6.1[asf,mp4]
+ >=media-libs/taglib-extras-1.0.1
+ player? (
+ app-crypt/qca:2
+ >=app-misc/strigi-0.5.7[dbus,qt4]
+ $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+ sys-libs/zlib
+ >=virtual/mysql-5.1[embedded?]
+ x11-libs/qt-script
+ >=x11-libs/qtscriptgenerator-0.1.0
+ cdda? (
+ $(add_kdebase_dep libkcddb)
+ $(add_kdebase_dep libkcompactdisc)
+ $(add_kdebase_dep kdemultimedia-kioslaves)
+ )
+ ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+ lastfm? ( >=media-libs/liblastfm-0.3.0 )
+ mp3tunes? (
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/openssl
+ net-libs/loudmouth
+ net-misc/curl
+ x11-libs/qt-core[glib]
+ )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ opengl? ( virtual/opengl )
+ playdar? ( dev-libs/qjson )
+ upnp? ( kde-misc/kio-upnp-ms )
+ )
+ utils? (
+ x11-libs/qt-core
+ x11-libs/qt-dbus
+ )
+ !player? ( !utils? ( media-sound/amarok[player] ) )
+"
+DEPEND="${COMMONDEPEND}
+ dev-util/automoc
+ dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+ !media-sound/amarok-utils
+ player? ( $(add_kdebase_dep phonon-kde) )
+"
+
+# Upstream patch to fix the plugin detection on startup
+# https://projects.kde.org/projects/extragear/multimedia/amarok/repository/revisions/37eda947bd8181a73ad0fffc88e66c25ddd69f28
+PATCHES=(
+ "${FILESDIR}/${PN}-fix-upnp-dep.patch"
+)
+
+src_prepare() {
+ if ! use player; then
+ # Disable po processing
+ sed -e "s:include(MacroOptionalAddSubdirectory)::" \
+ -i "${S}/CMakeLists.txt" \
+ || die "Removing include of MacroOptionalAddSubdirectory failed."
+ sed -e "s:macro_optional_add_subdirectory( po )::" \
+ -i "${S}/CMakeLists.txt" \
+ || die "Removing include of MacroOptionalAddSubdirectory failed."
+ fi
+
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+ use ppc64 && append-flags -mminimal-toc
+
+ if use player; then
+ mycmakeargs=(
+ -DWITH_PLAYER=ON
+ -DWITH_Libgcrypt=OFF
+ $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+ $(cmake-utils_use_with ipod)
+ $(cmake-utils_use_with ipod Gdk)
+ $(cmake-utils_use_with lastfm LibLastFm)
+ $(cmake-utils_use_with mtp)
+ $(cmake-utils_use_with mp3tunes MP3Tunes)
+ $(cmake-utils_use_with playdar QJSON)
+ $(cmake-utils_use_with upnp HUpnp)
+ )
+ else
+ mycmakeargs=(
+ -DWITH_PLAYER=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ $(cmake-utils_use_with utils UTILITIES)
+ )
+ # $(cmake-utils_use_with semantic-desktop Nepomuk)
+ # $(cmake-utils_use_with semantic-desktop Soprano)
+
+ kde4-base_src_configure
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ if use player; then
+
+ if use daap; then
+ echo
+ elog "You have installed amarok with daap support."
+ elog "You may be interested in installing www-servers/mongrel as well."
+ echo
+ fi
+
+ 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://amaroklive.com/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
+ fi
+}
diff --git a/media-sound/amarok/files/amarok-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
new file mode 100644
index 000000000000..878c013fa972
--- /dev/null
+++ b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
@@ -0,0 +1,37 @@
+diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
+--- amarok-2.4.0.90.orig/CMakeLists.txt 2011-04-19 00:03:27.910000016 +0000
++++ amarok-2.4.0.90/CMakeLists.txt 2011-04-19 00:06:17.466666683 +0000
+@@ -105,6 +105,10 @@
+ macro_optional_find_package(QJSON)
+ macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
+
++ # HUpnp is required for the upnp plugin
++ macro_optional_find_package(HUpnp)
++ macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
++
+ # macro_optional_find_package(Strigi)
+ # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
+
+diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
+--- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt 2011-04-19 00:03:27.940000015 +0000
++++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt 2011-04-19 00:07:06.753333348 +0000
+@@ -25,4 +25,6 @@
+ if( QJSON_FOUND )
+ add_subdirectory( playdarcollection )
+ endif( QJSON_FOUND )
+-add_subdirectory( upnpcollection )
++if( HUPNP_FOUND )
++ add_subdirectory( upnpcollection )
++endif( HUPNP_FOUND )
+diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
+--- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake 2011-04-19 01:59:14.313333349 +0000
++++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake 2011-04-19 02:14:13.670000016 +0000
+@@ -6,7 +6,7 @@
+ # HUPNP_LIBRARIES
+ # HUPNP_FOUND
+
+-find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
++find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
+
+ find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
+