dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media-sound/amarok: new revison

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1192 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-05-02 19:35:02 +00:00
parent 06a8dc4dfc
commit fa3fa554fd
5 changed files with 270 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media-sound/amarok/ChangeLog
View File

@ -2,6 +2,13 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*amarok-2.1.0_pre20090502 (02 May 2009)
02 May 2009; Mario Fetka <mario.fetka@gmail.com>
+amarok-2.1.0_pre20090502.ebuild, +files/amarok-ipod.patch,
+files/disable_bindings_test.patch:
new revison
*amarok-2.0.2 (05 Mar 2009)
05 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> +amarok-2.0.2.ebuild:

5
media-sound/amarok/Manifest
View File

@ -1,6 +1,9 @@
AUX 2.0.1.1-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61
AUX amarok-2.0.2-librt-1.patch 721 RMD160 a36d3cb937674672d41c790559084e4cd8c7c730 SHA1 0ca0e33ec624937d1d55a35911d8a2e401cc4c09 SHA256 37801a5a80bb2272dcd0eb5aad6305eed41c9822f92e1876c159e805cd7565c5
AUX amarok-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1 d94aa98a17229b2ddbae4128021bdb727fb38202 SHA256 b119ba280bba29276ece49b3d80d8770aee831e9afcb1d8795811130b734994a
AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6
DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651
EBUILD amarok-2.0.2.ebuild 2971 RMD160 27e664ef53e1e790f66ccb29dbd59e1b60477c6b SHA1 502ad3bf53464d84c16565d5d18352fd1a811b49 SHA256 89e30e2a3a95d63b2f457eb04d9ef6ad9e7fb3ee4a301be824e175f7810d7a7a
MISC ChangeLog 3475 RMD160 b1f633dc047f305e4ac8de5018b9b644c01f7717 SHA1 9023f9f58fb01d816ed654c6d34fb809f89f5ed0 SHA256 a7f7a34109e544a970aa89509d14ef37e95635dd82ea2df17ec919bff24e6a67
EBUILD amarok-2.1.0_pre20090502.ebuild 2153 RMD160 1740e8d9ad7ec25afe2368c452202bb8fd751e3e SHA1 bb9099c21b314b608d66995d01ecd040a66ab322 SHA256 d2f7858c0093cc1e7e5917fc999a0bf440f5b1294ad95817dfcd544304da3a91
MISC ChangeLog 3682 RMD160 f894bd5623f0ef92c48d0e5706fab5ab55c22380 SHA1 161900bba61264e2e73fcf1361da0650178f18a2 SHA256 3c2eb7beab3ba906d7888709407f2d96b019109eeae2cce15be0cc5a92a47672
MISC metadata.xml 2242 RMD160 5c8dc1dad24c8ced0799cec417f365eb6f5b34f4 SHA1 d34e266daa2e6b1e9b90930003b7aafdd9354195 SHA256 b51d1bb69f0f14303609a332c31fcf88b1a54b8b317e275550a26803ba076cae

88
media-sound/amarok/amarok-2.1.0_pre20090502.ebuild Normal file
View File

@ -0,0 +1,88 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
OPENGL_REQUIRED="optional"
KMNAME="extragear/multimedia"
inherit kde4-base subversion
ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/${PN}/@{${PV/2.1.0_pre/}}"
DESCRIPTION="Advanced audio player based on KDE framework."
HOMEPAGE="http://amarok.kde.org/"
LICENSE="GPL-2"
KEYWORDS="~x86 ~amd64"
SLOT="2"
IUSE="cdaudio daap debug gtk ipod mp3tunes mtp +semantic-desktop"
DEPEND="
>=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.5
>=media-libs/taglib-extras-0.1[kde]
>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
>=kde-base/phonon-kde-${KDE_MINIMAL}
>=kde-base/plasma-workspace-${KDE_MINIMAL}
sys-libs/zlib
>=x11-libs/qtscriptgenerator-0.1.0
cdaudio? (
>=kde-base/libkcddb-${KDE_MINIMAL}
>=kde-base/libkcompactdisc-${KDE_MINIMAL}
)
ipod? (
>=media-libs/libgpod-0.7.0
gtk? ( x11-libs/gtk+:2 )
)
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-0.3.0 )
"
RDEPEND="${DEPEND}
media-sound/amarok-utils
semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
"
src_prepare() {
kde4-base_src_prepare
append-flags -I${KDEDIR}
append-ldflags -L${KDEDIR}/$(get_libdir) -Wl,--as-needed
epatch "${FILESDIR}/disable_bindings_test.patch"
}
src_configure() {
mycmakeargs="${mycmakeargs}
-DWITH_PLAYER=ON
-DWITH_UTILITIES=OFF
-DWITH_Libgcrypt=OFF
$(cmake-utils_use_with ipod Ipod)
$(cmake-utils_use_with gtk Gdk)
$(cmake-utils_use_with mtp Mtp)
$(cmake-utils_use_with mp3tunes MP3TUNES)"
# $(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 daap; then
echo
elog "You have installed amarok with daap support."
elog "You may be insterested in installing www-servers/mongrel as well."
echo
fi
}

159
media-sound/amarok/files/amarok-ipod.patch Normal file
View File

@ -0,0 +1,159 @@
--- cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100
+++ cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100
@@ -2,45 +2,35 @@
# Once done this will define
#
# IPOD_FOUND - system has libgpod
-# IPOD_INCLUDE_DIR - the libgpod include directory
+# IPOD_INCLUDE_DIRS - the libgpod include directory
# IPOD_LIBRARIES - Link these to use libgpod
-# IPOD_DEFINITIONS - Compiler switches required for using libgpod
+# IPOD_CFLAGS - Compiler switches required for using libgpod
+# IPOD_VERSION - Version number of libgpod
#
-if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
# in cache already
SET(IPOD_FOUND TRUE)
-else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
if(NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
-
- PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags)
-
- set(IPOD_DEFINITIONS ${_IPODCflags})
+ find_package(PkgConfig)
+ PKG_SEARCH_MODULE(IPOD libgpod-1.0)
+
endif(NOT WIN32)
+ IF (IPOD_FOUND)
+ IF (NOT IPOD_FIND_QUIETLY)
+ MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}")
+ ENDIF (NOT IPOD_FIND_QUIETLY)
+ ELSE (IPOD_FOUND)
+ IF (IPOD_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!")
+ ENDIF (IPOD_FIND_REQUIRED)
+ ENDIF (IPOD_FOUND)
+
+ MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS)
- FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0
- ${_IPODIncDir}
- )
-
- FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod
- PATHS
- ${_IPODLinkDir}
- )
-
- if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
- SET(IPOD_FOUND TRUE)
- else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
- SET(IPOD_FOUND_FALSE)
- endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES )
-
- MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES)
-
-endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
--- src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100
+++ src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100
@@ -17,7 +17,7 @@
handler
${GLIB2_INCLUDE_DIR}
${GDK_INCLUDE_DIR}
- ${IPOD_INCLUDE_DIR}
+ ${IPOD_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}/../..
${AMAROK_COLLECTION_SUPPORT_DIR}
${KDE4_INCLUDE_DIR}
--- src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100
+++ src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100
@@ -1339,73 +1339,12 @@
QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
- Itdb_Thumb *thumb = NULL;
GdkPixbuf *gpixbuf = NULL;
- QString thumbPath;
// pull image out of ipod
- if( ipodtrack->has_artwork == 0x01 )
- {
- // try small first
-
- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL );
-
- // then large if needed
- if( thumb == NULL)
- {
- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE );
- }
-
- if( thumb != NULL)
- {
- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
- }
- else
- {
- GList *thumbs = ipodtrack->artwork->thumbnails;
-
- for(; thumbs; thumbs = thumbs->next)
- {
- Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data;
- if( curThumb == NULL)
- continue;
-
- switch( curThumb->type )
- {
- case ITDB_THUMB_PHOTO_SMALL:
- break;
- case ITDB_THUMB_PHOTO_LARGE:
- break;
- case ITDB_THUMB_PHOTO_FULL_SCREEN:
- break;
- case ITDB_THUMB_PHOTO_TV_SCREEN:
- break;
- case ITDB_THUMB_COVER_XLARGE:
- break;
- case ITDB_THUMB_COVER_MEDIUM:
- break;
- case ITDB_THUMB_COVER_SMEDIUM:
- break;
- case ITDB_THUMB_COVER_XSMALL:
- break;
-
- default:
- break;
- }
-
- thumb = curThumb;
- break;
-
- }
-
- if( thumb != NULL)
- {
- thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) );
- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
- }
- }
- }
+ if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false
+ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 );
if(gpixbuf != NULL)
{

12
media-sound/amarok/files/disable_bindings_test.patch Normal file
View File

@ -0,0 +1,12 @@
--- CMakeLists.txt 2009-03-24 16:51:54.000000000 +0200
+++ CMakeLists.txt2 2009-03-24 17:06:57.000000000 +0200
@@ -38,9 +38,6 @@
macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
- find_package( QtScriptQtBindings REQUIRED )
- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
-
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
find_package(MySQLAmarok REQUIRED)