Amarok 1.4.10 for F11

TheIcebreaker · #1 18th June 2009, 01:30 PM

Has somebody built a F11 package for amarok 1.4.

I tried today with the F10 package I built, trying to rebuild it I got compilation errors maybe related to the Gcc version bump but I am not sure.

If somebody has succeeded pls provide the srpm.

leigh123linux · #2 18th June 2009, 02:28 PM

Try this patch that I made ( I haven't got enough spare time or bandwidth for a srpm )

Code:

--- amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp 
+++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
@@ -28,6 +28,8 @@
 #include <taglib/tstring.h>
 
 #include "taglib_audiblefile.h"
+
+#include <cstdio>
 
 #include <netinet/in.h> // ntohl
 
--- amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
@@ -28,6 +28,7 @@
 #include <taglib/tag.h>
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp 
@@ -28,6 +28,8 @@
 #include "audibletag.h"
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
+
+#include <cstdio>
 
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 
@@ -22,6 +22,7 @@
 #include "taglib_audiblefiletyperesolver.h"
 #include "taglib_audiblefile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
--- amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp 
@@ -28,6 +28,8 @@
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
 #include <taglib/tag.h>
+
+#include <stdio.h>
 
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
--- amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
@@ -22,6 +22,7 @@
 #include "wavfiletyperesolver.h"
 #include "wavfile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
--- amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp  
@@ -29,6 +29,7 @@
 
 #include "wavfile.h"
 
+#include <stdio.h>
 #include <netinet/in.h> // ntohl
 
 using namespace TagLib;

For the original SRPM see link.

http://forums.fedoraforum.org/showpo...3&postcount=61

Spec file edits

Code:

Patch1:     amarok-1.4.8-gcc43.patch
# Use xdg-open to start the selected browser
Patch2:     amarok-1.4.7-xdg.patch

## upstream patches
# security backport: http://websvn.kde.org/?view=rev&revision=908415
Patch100:   amarok-1.4.10-aa_security.patch
# patch so amarok builds with libmtp-0.3.6
Patch101:   amarok_1.4.10_libmtp.patch
Patch102:   amarok-1.4.10-gcc44.patch

BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  esound-devel
BuildRequires:  gettext
#{?_with_helix:BuildRequires:  HelixPlayer}
BuildRequires:  kdelibs%{?kde3}-devel
%if 0%{?konq}
BuildRequires:  kdebase%{?kde3}-devel
%else
Obsoletes: %{name}-konqueror < %{version}-%{release}
%endif
BuildRequires:  taglib-devel 
%{?_with_ifp:BuildRequires:  libifp-devel}
# Ipod
%{?_with_libgpod:BuildRequires:  libgpod-devel}
%{?_with_mp4v2:BuildRequires: libmp4v2-devel}
# MTP players
%{?_with_libmtp:BuildRequires:  libmtp-devel}
BuildRequires:  libmusicbrainz-devel
# Creative Nomad Jukebox
%{?_with_libnjb:BuildRequires:  libnjb-devel}
BuildRequires:  libtool
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires:  libtool-ltdl-devel
%endif
BuildRequires:  libtunepimp-devel
BuildRequires:  libusb-devel
%{?_with_libvisual:BuildRequires:  libvisual-devel}
BuildRequires:  mysql-devel
BuildRequires:  postgresql-devel
BuildRequires:  ruby-devel ruby
BuildRequires:  SDL-devel
BuildRequires:  taglib-devel
BuildRequires:  xine-lib-devel
# not used anymore, in favor of libvisual ? -- Rex
#%{?fedora:BuildRequires:  xmms-devel}

# For dir ownership and some default plugins (lyrics), -ruby subpkg?  -- Rex
Requires:  ruby

# To open the selected browser, works with Patch2
Requires:  xdg-utils
Requires(post): xdg-utils
Requires(postun): xdg-utils

Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3

Obsoletes: amarok-devel < %{version}-%{release}
%if 0%{?fedora} > 6 && 0%{?fedora} < 9
# need to keep this around for previous releases, so not to break multilib compat.
Provides:  amarok-devel = %{version}-%{release}
%endif

# engines, etc...
# old, obsolete ones: arts, akode
Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
# xine-lib
Provides: %{name}-engine-xine = %{version}-%{release}


%description
Amarok is a multimedia player with:
 - fresh playlist concept, very fast to use, with drag and drop
 - plays all formats supported by the various engines
 - audio effects, like reverb and compressor
 - compatible with the .m3u and .pls formats for playlists
 - nice GUI, integrates into the KDE look, but with a unique touch

%if 0%{?_with_helix:1}
Amarok can use various engines to decode sound : helix and xine.
To use the helix engine, you need to install either HelixPlayer
or RealPlayer
%endif

%package konqueror
Summary: Amarok konqueror (service menus, sidebar) support
Group:   Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description konqueror
%{summary}.

%if 0%{?_with_libvisual:1}
%package visualisation
Summary:    Visualisation plugins for Amarok
Group:      Applications/Multimedia
Requires:   %{name} = %{version}-%{release}
# No plugins by default, we need libvisual-plugins
Requires:   libvisual-plugins
%description visualisation
Amarok can use visualisation plugins from different origins.
Right now, only xmms is supported, which means that you can
use any of xmms' visualisation plugins with Amarok.
%endif


%prep
%setup -q 

%patch1 -p1 -b .gcc43
%patch2 -p1 -b .xdg
%patch100 -p4 -b .aa_security
%patch101 -p1 -b .amarok_1.4.10_libmtp
%patch102 -p1 -b  .amarok-1.4.10-gcc44.patch


%build
unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh

I don't know if the build will complete, there maybe more files that need patching.

Good luck.

TheIcebreaker · #3 18th June 2009, 05:59 PM

i will give it a go tonite

TheIcebreaker · #4 18th June 2009, 11:23 PM

You got it wrong dude I want amarok 1.4 not the crappy new one.

***Hlingler*** · #5 18th June 2009, 11:24 PM

My bad. Post deleted. And thread un-subscribed.

V

TheIcebreaker · #6 19th June 2009, 01:06 AM

Got it to build and works fine .
Made a few additions to your patch

Cant upload for some reason.

Code:

--- amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp 
+++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
@@ -28,6 +28,8 @@
 #include <taglib/tstring.h>
 
 #include "taglib_audiblefile.h"
+
+#include <cstdio>
 
 #include <netinet/in.h> // ntohl
 
--- amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
@@ -28,6 +28,7 @@
 #include <taglib/tag.h>
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp 
@@ -28,6 +28,8 @@
 #include "audibletag.h"
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
+
+#include <cstdio>
 
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 
@@ -22,6 +22,7 @@
 #include "taglib_audiblefiletyperesolver.h"
 #include "taglib_audiblefile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
--- amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp 
@@ -28,6 +28,8 @@
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
 #include <taglib/tag.h>
+
+#include <stdio.h>
 
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
--- amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
@@ -22,6 +22,7 @@
 #include "wavfiletyperesolver.h"
 #include "wavfile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
--- amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp.orig 
+++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp  
@@ -29,6 +29,7 @@
 
 #include "wavfile.h"
 
+#include <stdio.h>
 #include <netinet/in.h> // ntohl
 
 using namespace TagLib;
--- amarok-1.4.10/amarok/src/metabundlesaver.cpp.orig	
+++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	
@@ -185,7 +185,7 @@
 
     debug() << "Renaming original file to temporary name " << m_origRenamedSavePath << endl;
 
-    errcode = std::rename( QFile::encodeName( m_bundle->url().path() ).data(),
+    errcode = rename( QFile::encodeName( m_bundle->url().path() ).data(),
                                QFile::encodeName( m_origRenamedSavePath ).data() );
     if( errcode != 0 )
     {
@@ -225,7 +225,7 @@
 
     debug() << "Renaming temp file to original's filename" << endl;
 
-    errcode = std::rename( QFile::encodeName( m_tempSavePath ).data(),
+    errcode = rename( QFile::encodeName( m_tempSavePath ).data(),
                                 QFile::encodeName( m_bundle->url().path() ).data() );
     if( errcode != 0 )
     {
@@ -236,7 +236,7 @@
 
     debug() << "Deleting original" << endl;
 
-    errcode = std::remove( QFile::encodeName( m_origRenamedSavePath ) );
+    errcode = remove( QFile::encodeName( m_origRenamedSavePath ) );
     if( errcode != 0 )
     {
         debug() << "Could not delete the original file!" << endl;
@@ -251,7 +251,7 @@
     fail_remove_copy:
 
         debug() << "Deleting temporary file..." << endl;
-        errcode = std::remove( QFile::encodeName( m_tempSavePath ).data() );
+        errcode = remove( QFile::encodeName( m_tempSavePath ).data() );
         if( errcode != 0 )
         {
             debug() << "Could not delete the temporary file!" << endl;
@@ -262,7 +262,7 @@
             return false;
 
         debug() << "Reverting original file to original filename!" << endl;
-        errcode = std::rename( QFile::encodeName( m_origRenamedSavePath ).data(),
+        errcode = rename( QFile::encodeName( m_origRenamedSavePath ).data(),
                                 QFile::encodeName( m_bundle->url().path() ).data() );
         if( errcode != 0 )
         {
@@ -283,7 +283,7 @@
     if( !m_tempSavePath.isEmpty() && QFile::exists( m_tempSavePath ) )
     {
         int errcode;
-        errcode = std::remove( QFile::encodeName( m_tempSavePath ).data() );
+        errcode = remove( QFile::encodeName( m_tempSavePath ).data() );
         if( errcode != 0 )
         {
             dirty = true;
--- amarok-1.4.10/amarok/src/metadata/mp4/mp4file.cpp.orig
+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4file.cpp
@@ -28,7 +28,7 @@
 #include "mp4tag.h"
 #include <tfile.h>
 #include <audioproperties.h>
-
+#include <stdlib.h>
 #include <stdint.h>
 
 #define MP4V2_HAS_WRITE_BUG 1
--- amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp.orig
+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp
@@ -22,7 +22,7 @@
 #include "mp4properties.h"
 
 
-#include <tstring.h>
+#include <string.h>
 
 #include <config.h>
 #ifdef HAVE_SYSTEMS_H
--- amarok-1.4.10/amarok/src/metadata/mp4/mp4tag.cpp.orig
+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4tag.cpp
@@ -23,6 +23,7 @@
 #include "mp4tag.h"
 
 #include <tag.h>
+#include <stdlib.h>
 #include <stdint.h>
 
 using namespace TagLib;
--- amarok-1.4.10/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.orig
+++ amarok-1.4.10/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
@@ -24,6 +24,7 @@
 
 #include "taglib_mp4filetyperesolver.h"
 #include "mp4file.h"
+#include <string.h>
 
 TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
         bool readProperties,

TheIcebreaker · #7 20th June 2009, 01:27 AM

Now there is another problem leigh. Wikipedia artist info is not displayed at all.
It always gives a list of other languages to choose but does not display anything for any of them .

I have even tried the patch in the latest F9 rpm which claims to have solved it but no luck.
Is there any amarok 1.4 user able to display artist info correctly.

psyklops · #8 24th June 2009, 11:14 PM

I'm interested in downgrading to 1.4 as well. Any chance of an SRPM file or the x86_64 binary or a tutorial on how to apply the patch?

**rdieter** · #9 25th June 2009, 01:56 AM

Seems there's continuing demand for this, I'll see about whipping up unofficial amarok1 rpms to host at kde-redhat.

psyklops · #10 25th June 2009, 03:00 PM

After some research I was able to hack my way around building the Fedora 11 RPMS of amarok 1.4.10. on x86_64

Credit goes to TheIceBreaker and Leigh for their patch(s).

The koji build of the src.rpm package from here: http://kojipkgs.fedoraproject.org/pa...-4.fc9.src.rpm

My modified spec file to include the patch: http://rapidshare.com/files/248507862/amarok.spec

I don't know my way around coding at all so I modified the patch file directly.
Leigh's and TheIceBreakers slightly modified patch file: http://rapidshare.com/files/24850786...11-build.patch

amarok-1.4.10 x86_64 F11 binary:http://rapidshare.com/files/24850786...c11.x86_64.rpm

visualisations plugins: http://rapidshare.com/files/24850786...c11.x86_64.rpm

Lastly, rdieter thanks for looking into hosting the previous build of amarok. The current iteration of 2.xx is just a big backward step IMHO. I'm sure it'll get better...but...

**rdieter** · #11 25th June 2009, 03:11 PM

Whatever floats your boat.

OK, amarok1 (yes, named amarok1) rpms are now hosted at kde-redhat stable repos for F-10, F-11.

currently used src.rpm :
http://apt.kde-redhat.org/apt/kde-re...vn.el5.src.rpm

I'll keep all the latest-n-greatest in cvs at
http://cvs.fedoraproject.org/viewvc/rpms/amarok/EL-5/

I'd like to coordinate efforts, so if folks have other modifications, patches, please throw them my way.
<shameless plug>
Further, if you're interested in helping co-maintain amarok, with cvs commit access, I'd be happy to entertain that too ( http://fedoraproject.org/wiki/PackageMaintainers/Join )
</shameless plug>

gogalago · #12 1st July 2009, 07:09 AM

psyklops!!!!

you are a god amongst men!

Amarok 2 has been driving me fekkin NUTS... to be fair, I know it will get there eventually, and 1.4 does actually look a bit clunky now, but at least the basic functionality actually works. (even in 2.2 user generated playlist editing is completely broken - for the last three weeks I've continually had about 20 text-editors open to manually file things as they come up lol)

Anyway I just wanted to say thanks for figuring out a binary for the clueless amongst us - and to your "upstreamers" too!
(@rdieter I couldn't get your build to work, even though I was using your 2.1.1 for a while)

psyklops · #13 4th July 2009, 07:02 AM

Quote:

Originally Posted by gogalago

psyklops!!!!

you are a god amongst men!

Amarok 2 has been driving me fekkin NUTS... to be fair, I know it will get there eventually, and 1.4 does actually look a bit clunky now, but at least the basic functionality actually works. (even in 2.2 user generated playlist editing is completely broken - for the last three weeks I've continually had about 20 text-editors open to manually file things as they come up lol)

Anyway I just wanted to say thanks for figuring out a binary for the clueless amongst us - and to your "upstreamers" too!
(@rdieter I couldn't get your build to work, even though I was using your 2.1.1 for a while)

No problem at all!

I'm a noob when it comes to build spec files, managing packages etc. so I just built off previous work that was done.

I built rdieter's SRPM file as well, although I did use this one: http://apt.kde-redhat.org/apt/kde-re...n.fc11.src.rpm

...instead of the 'el5' build in the list.

jpc2769 · #14 19th September 2009, 02:49 PM

This is truly great, thanks to all who made it possible!

How do I stop package manager from trying (sometimes successfully

) to "update" to 2.1.1 etc?

Thanks.

Jason