diff options
| author | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2009-12-01 13:04:15 -0100 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2009-12-01 13:05:15 -0100 |
| commit | 3853f2cbe46ca20ec18573aebb6bbd9ddbec8fa2 (patch) | |
| tree | a6adcf2789102b2308e2a5d8714db7c327df5e21 | |
| parent | fab32090405a5406137d355a2076731a9c2f6669 (diff) | |
| download | kde-3853f2cbe46ca20ec18573aebb6bbd9ddbec8fa2.tar.gz kde-3853f2cbe46ca20ec18573aebb6bbd9ddbec8fa2.tar.bz2 kde-3853f2cbe46ca20ec18573aebb6bbd9ddbec8fa2.zip | |
Synced amarok-2.2.1-r2 and amarok-9999 ebuilds.
Added the patch to fix the linking of mysqlecollection.
| -rw-r--r-- | media-sound/amarok/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-9999.ebuild | 17 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-2.2-mysql-libs.patch | 11 |
3 files changed, 21 insertions, 10 deletions
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 479609234b6..0e8e22a014d 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,2 +1,3 @@ -EBUILD amarok-9999.ebuild 2688 RMD160 e93211e04180c97fd30abaa83d75800f64ac6aef SHA1 bb97b1672931d15a078ddaa7b09ab5c38019ce44 SHA256 dfd65ed3050947c5c7d88651915cd10305927b4aa4f0cc303a5a3f8a90820013 +AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1 +EBUILD amarok-9999.ebuild 2689 RMD160 0d1a0b7c250eb2e0a53f0c17bb1f07f965610593 SHA1 d1e40fa2e6c8d6668d41d34c1f2ebff751fe09b8 SHA256 5e5ea83cfbb6c7dced58a34c5232bc494d3746aab6ba2ea688adc962579c304a MISC metadata.xml 2254 RMD160 837f618d570d8a0f917b7e1a21df8bfb28ba8458 SHA1 9e8df20b12e41e002625f97991af4af9e3ea5e0c SHA256 2f30895a93e73b7c7eae4f1cf6b5536bd9c21d163b5be2041c5179175b87e780 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index 38be1634f46..27890cd9890 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -26,23 +26,26 @@ fi LICENSE="GPL-2" KEYWORDS="" SLOT="4" -IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp +semantic-desktop" +IUSE="bindist cdda daap debug +embedded ipod lastfm mp3tunes mtp +semantic-desktop" # ipod requires gdk enabled and also gtk compiled in libgpod DEPEND=" + app-crypt/qca:2 >=app-misc/strigi-0.5.7 || ( >=dev-db/mysql-5.0.76-r1[embedded?,-minimal] >=dev-db/mysql-community-5.0.77-r1[embedded?,-minimal] ) - >=media-libs/taglib-1.6 - >=media-libs/taglib-extras-1.0.0 + >=media-libs/taglib-extras-1.0.1 >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] sys-libs/zlib >=x11-libs/qtscriptgenerator-0.1.0 + bindist? ( >=media-libs/taglib-1.6.1[-asf,-mp4] ) + !bindist? ( >=media-libs/taglib-1.6.1[asf,mp4] ) cdda? ( >=kde-base/libkcddb-${KDE_MINIMAL} >=kde-base/libkcompactdisc-${KDE_MINIMAL} + >=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL} ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-0.3.0 ) @@ -62,18 +65,14 @@ RDEPEND="${DEPEND} semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} ) " +PATCHES=( "${FILESDIR}/amarok-2.2-mysql-libs.patch" ) + # Only really required for live ebuild, to skip git_src_prepare src_prepare() { kde4-base_src_prepare } src_configure() { - if use embedded; then - # Workaround for problems related to libmysqld.so and collection plugin not - # being found on some architectures when --as-needed is not used. - append-ldflags -Wl,--as-needed - fi - mycmakeargs="${mycmakeargs} -DWITH_PLAYER=ON -DWITH_UTILITIES=OFF diff --git a/media-sound/amarok/files/amarok-2.2-mysql-libs.patch b/media-sound/amarok/files/amarok-2.2-mysql-libs.patch new file mode 100644 index 00000000000..60bf8b17fd3 --- /dev/null +++ b/media-sound/amarok/files/amarok-2.2-mysql-libs.patch @@ -0,0 +1,11 @@ +diff -ur amarok-2.2.1-old/src/collection/mysqlecollection/CMakeLists.txt amarok-2.2.1/src/collection/mysqlecollection/CMakeLists.txt +--- amarok-2.2.1-old/src/collection/mysqlecollection/CMakeLists.txt 2009-11-30 23:31:05.000000000 -0100 ++++ amarok-2.2.1/src/collection/mysqlecollection/CMakeLists.txt 2009-11-30 23:31:32.000000000 -0100 +@@ -64,7 +64,6 @@ + ${KDE4_KIO_LIBS} + ${KDE4_THREADWEAVER_LIBRARIES} + ${MYSQL_EMBEDDED_LIBRARIES} +- ${MYSQL_LIBRARIES} + ${CMAKE_DL_LIBS} + ${ZLIB_LIBRARIES} + ${TAGLIB_LIBRARIES} |