wip/amarok: compilation failure

Hi,

The latest amarok update fails to compile (on NetBSD-current) with the 
following error:

[ 41%] Building CXX object 
src/CMakeFiles/amaroklib.dir/__/shared/taglib_filetype_resolvers/mimefiletyperesolver.o                                              
/usr/pkgsrc/wip/amarok/work.x86_64/amarok-2.1.90/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp: 
In member function 'virtual TagLib::File* 
MimeFileTypeResolver::createFile(const char*, bool, 
TagLib::AudioProperties::ReadStyle) const':                                                                           
/usr/pkgsrc/wip/amarok/work.x86_64/amarok-2.1.90/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp:76: 
error: expected type-specifier before 'TagLibExtras'                                                                             
/usr/pkgsrc/wip/amarok/work.x86_64/amarok-2.1.90/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp:76: 
error: cannot convert 'int*' to 'TagLib::File*' in return
/usr/pkgsrc/wip/amarok/work.x86_64/amarok-2.1.90/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp:76: 
error: expected ';' before 'TagLibExtras'
/usr/pkgsrc/wip/amarok/work.x86_64/amarok-2.1.90/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp:76: 
error: 'TagLibExtras' has not been declared
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/wip/amarok/work.x86_64/amarok-2.1.90
*** Error code 1

I tried to remove the else-if clause that contains the TagLibExtras reference 
but then I run into undefineds in the libraries.

Regards,
Sverre

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf