Author: ranger
Date: Wed Apr 1 17:26:54 2009
New Revision: 1470
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1470&repname=user%3a+ranger>
Log:
amarok updates
Modified:
trunk/experimental/10.4/main/finkinfo/kde/amarok2.info
trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch
trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
trunk/experimental/common/main/finkinfo/kde/amarok2.info
trunk/experimental/common/main/finkinfo/kde/amarok2.patch
Modified: trunk/experimental/10.4/main/finkinfo/kde/amarok2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/amarok2.info&rev=1470&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/amarok2.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.info Wed Apr 1 17:26:54
2009
@@ -1,7 +1,7 @@
Info4: <<
Package: amarok2-%type_pkg[kde]
Version: 2.1.0
-Revision: 0.947547.1
+Revision: 0.947755.1
Description: KDE4 - music player
Type: kde (x11 mac)
License: GPL/LGPL
@@ -29,6 +29,7 @@
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.14.0-1),
+ gtk+2-dev (>= 2.14.3-1),
kde4-buildenv (>= 4.2.2-1),
kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
@@ -52,8 +53,8 @@
<<
GCC: 4.0
-Source: http://ranger.befunk.com/fink/amarok/amarok-947547.tar.bz2
-Source-MD5: 8ab7d6385b2144cd7ebdf803fdeba7ed
+Source: http://ranger.befunk.com/fink/amarok/amarok-947755.tar.bz2
+Source-MD5: 7458c0d1dc0bf4f7b3a70c55b86afcb1
SourceDirectory: amarok
SetMAKEFLAGS: -j1
@@ -83,17 +84,15 @@
mv %i/lib/%type_pkg[kde]/bin/amarok.app
%i/lib/%type_pkg[kde]/bin/Amarok.app
rm -rf %i/lib/%type_pkg[kde]/bin/Amarok.shell
- rm -rf %i/lib/%type_pkg[kde]/lib/libamarok_taglib.dylib
rm -rf %i/lib/%type_pkg[kde]/lib/libamaroklib.dylib
- rm -rf %i/lib/%type_pkg[kde]/lib/libamarokplasma.dylib
rm -rf %i/lib/%type_pkg[kde]/lib/libamarokpud.dylib
+ rm -rf %i/lib/%type_pkg[kde]/lib/libmediadevicelib.dylib
<<
Shlibs: <<
!%p/lib/%type_pkg[kde]/lib/libamarok_service_liblastfm.dylib
- !%p/lib/%type_pkg[kde]/lib/libamarok_taglib.1.dylib
!%p/lib/%type_pkg[kde]/lib/libamaroklib.1.dylib
- !%p/lib/%type_pkg[kde]/lib/libamarokplasma.2.dylib
!%p/lib/%type_pkg[kde]/lib/libamarokpud.1.dylib
+ !%p/lib/%type_pkg[kde]/lib/libmediadevicelib.1.dylib
<<
PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
Modified: trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch&rev=1470&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch Wed Apr 1 17:26:54
2009
@@ -1,6 +1,26 @@
+diff -Nurd amarok/src/afttagger/afttagger_main.cpp
amarok-new/src/afttagger/afttagger_main.cpp
+--- amarok/src/afttagger/afttagger_main.cpp 2009-03-26 00:34:59.000000000
-0400
++++ amarok-new/src/afttagger/afttagger_main.cpp 2009-03-31
22:05:46.000000000 -0400
+@@ -19,11 +19,11 @@
+
+ #include "SafeFileSaver.h"
+
+-#include "taglib/fileref.h"
+-#include "taglib/id3v2tag.h"
+-#include "taglib/mpegfile.h"
+-#include "taglib/tfile.h"
+-#include "taglib/uniquefileidentifierframe.h"
++#include "fileref.h"
++#include "id3v2tag.h"
++#include "mpegfile.h"
++#include "tfile.h"
++#include "uniquefileidentifierframe.h"
+
+ #include <KAboutData>
+ #include <KCmdLineArgs>
diff -Nurd amarok/src/context/CMakeLists.txt
amarok-new/src/context/CMakeLists.txt
---- amarok/src/context/CMakeLists.txt 2009-02-02 12:57:46.000000000 -0500
-+++ amarok-new/src/context/CMakeLists.txt 2009-03-10 11:27:20.000000000
-0400
+--- amarok/src/context/CMakeLists.txt 2009-03-06 22:37:30.000000000 -0500
++++ amarok-new/src/context/CMakeLists.txt 2009-03-31 21:37:31.000000000
-0400
@@ -9,6 +9,7 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
..
@@ -9,14 +29,75 @@
${CMAKE_CURRENT_BINARY_DIR}/..)
########### next target ###############
-diff -Nurd amarok/src/metadata/mp4/mp4properties.cpp
amarok-new/src/metadata/mp4/mp4properties.cpp
---- amarok/src/metadata/mp4/mp4properties.cpp 2008-05-21 07:51:37.000000000
-0400
-+++ amarok-new/src/metadata/mp4/mp4properties.cpp 2009-03-10
11:27:20.000000000 -0400
-@@ -19,6 +19,7 @@
- * MA 02110-1301 USA *
- ***************************************************************************/
+diff -Nurd amarok/src/meta/MetaReplayGain.cpp
amarok-new/src/meta/MetaReplayGain.cpp
+--- amarok/src/meta/MetaReplayGain.cpp 2009-03-26 00:34:53.000000000 -0400
++++ amarok-new/src/meta/MetaReplayGain.cpp 2009-03-31 21:43:41.000000000
-0400
+@@ -25,7 +25,7 @@
+ #include <cmath>
-+#define HAVE_INTTYPES_H 1
- #include "mp4properties.h"
+ // Taglib
+-#include <taglib/tag.h>
++#include <tag.h>
+ #include <tlist.h>
+ #include <tstring.h>
+ #include <textidentificationframe.h>
+diff -Nurd amarok/src/meta/MetaReplayGain.h
amarok-new/src/meta/MetaReplayGain.h
+--- amarok/src/meta/MetaReplayGain.h 2009-03-06 22:36:58.000000000 -0500
++++ amarok-new/src/meta/MetaReplayGain.h 2009-03-31 21:43:41.000000000
-0400
+@@ -24,7 +24,7 @@
+ #include <QMap>
+ // Taglib
+-#include <taglib/fileref.h>
++#include <fileref.h>
+ /* This file exists (rather than putting the method in MetaUtility.h and
+ * MetaUtility.cpp) because we need to share the implementation between
+diff -Nurd amarok/src/meta/MetaUtility.cpp amarok-new/src/meta/MetaUtility.cpp
+--- amarok/src/meta/MetaUtility.cpp 2009-03-26 00:34:53.000000000 -0400
++++ amarok-new/src/meta/MetaUtility.cpp 2009-03-31 21:43:41.000000000
-0400
+@@ -30,7 +30,7 @@
+ #include <kio/global.h>
+
+ // Taglib
+-#include <taglib/tag.h>
++#include <tag.h>
+ #include <tlist.h>
+ #include <tmap.h>
+ #include <tstring.h>
+diff -Nurd amarok/src/meta/MetaUtility.h amarok-new/src/meta/MetaUtility.h
+--- amarok/src/meta/MetaUtility.h 2009-03-06 22:36:58.000000000 -0500
++++ amarok-new/src/meta/MetaUtility.h 2009-03-31 21:43:41.000000000 -0400
+@@ -27,7 +27,7 @@
+ #include <QVariant>
+
+ // Taglib
+-#include <taglib/fileref.h>
++#include <fileref.h>
+
+ namespace Meta
+ {
+diff -Nurd amarok/utilities/collectionscanner/MetaReplayGain.cpp
amarok-new/utilities/collectionscanner/MetaReplayGain.cpp
+--- amarok/utilities/collectionscanner/MetaReplayGain.cpp 2009-03-26
00:35:02.000000000 -0400
++++ amarok-new/utilities/collectionscanner/MetaReplayGain.cpp 2009-03-31
22:07:35.000000000 -0400
+@@ -25,7 +25,7 @@
+ #include <cmath>
+
+ // Taglib
+-#include <taglib/tag.h>
++#include <tag.h>
+ #include <tlist.h>
+ #include <tstring.h>
+ #include <textidentificationframe.h>
+diff -Nurd amarok/utilities/collectionscanner/MetaReplayGain.h
amarok-new/utilities/collectionscanner/MetaReplayGain.h
+--- amarok/utilities/collectionscanner/MetaReplayGain.h 2009-03-26
00:35:02.000000000 -0400
++++ amarok-new/utilities/collectionscanner/MetaReplayGain.h 2009-03-31
22:07:35.000000000 -0400
+@@ -22,7 +22,7 @@
+ #include <QMap>
+
+ // Taglib
+-#include <taglib/fileref.h>
++#include <fileref.h>
+
+ /* This file exists (rather than putting the method in MetaUtility.h and
+ * MetaUtility.cpp) because we need to share the implementation between
Modified: trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info&rev=1470&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
(original)
+++ trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info Wed
Apr 1 17:26:54 2009
@@ -26,20 +26,33 @@
<<
GCC: 4.0
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
+
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[qt]"
. %p/sbin/kde4-buildenv.sh
+ export QTDIR="%p/lib/qt4-%type_pkg[qt]"
pushd generator
qmake
make CC="$CC" CXX="$CXX" LINK="$CXX"
- QTDIR=%p/lib/qt4-%type_pkg[qt] ./generator
--include-paths=%p/lib/qt4-%type_pkg[qt]/include
+ ./generator --include-paths=%p/lib/qt4-%type_pkg[qt]/include
popd
pushd qtbindings
qmake
- make CC="$CC" CXX="$CXX" LINK="$CXX"
+ # I'm a dirty cheater!
+ make qs_eval/Makefile
+ cat <<END >> qs_eval/Makefile
+
+release: all
+
+debug: all
+
+END
+ make CC="$CC" CXX="$CXX" LINK="$CXX" release debug
popd
pushd tools/qsexec/src
qmake
@@ -54,7 +67,7 @@
mv generator/generator tools/qsexec/qsexec %i/lib/qt4-%type_pkg[qt]/bin/
install -d -m 755 %i/lib/qt4-%type_pkg[qt]/lib
- mv plugins %i/lib/qt4-%type_pkg[qt]/lib/
+ mv plugins %i/lib/qt4-%type_pkg[qt]
install -d -m 755 %i/share/doc/%N
mv doc %i/share/doc/%N/API
@@ -64,7 +77,7 @@
SplitOff: <<
Package: %N-runtime
Description: Runtime QtScript plugins
- Files: lib/qt4-%type_pkg[qt]/lib/plugins
+ Files: lib/qt4-%type_pkg[qt]/plugins
<<
DocFiles: LICENSE* README*
Modified: trunk/experimental/common/main/finkinfo/kde/amarok2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/amarok2.info&rev=1470&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/amarok2.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/amarok2.info Wed Apr 1
17:26:54 2009
@@ -1,7 +1,7 @@
Info4: <<
Package: amarok2-%type_pkg[kde]
Version: 2.1.0
-Revision: 0.947547.1
+Revision: 0.947755.1
Type: kde (x11 mac)
Description: KDE4 - music player
License: GPL/LGPL
@@ -13,14 +13,14 @@
looks good doing it.
<<
-Source: http://ranger.befunk.com/fink/amarok/amarok-947547.tar.bz2
-Source-MD5: 8ab7d6385b2144cd7ebdf803fdeba7ed
+Source: http://ranger.befunk.com/fink/amarok/amarok-947755.tar.bz2
+Source-MD5: 7458c0d1dc0bf4f7b3a70c55b86afcb1
SourceDirectory: amarok
#Source: mirror:kde:stable/amarok/%v/src/amarok-%v.tar.bz2
#Source-MD5: 98b78372ec6ea3432faba356c90c6dbe
#PatchFile: amarok2.patch
-#PatchFile-MD5: 923cdd3091e8c01ac32da69ad0858a6e
+#PatchFile-MD5: 43637f6607b9ab3873c26c7c6da7b7be
Depends: <<
dbus (>= 1.2.12-1),
@@ -38,10 +38,7 @@
<<
# TODO:
-# Gdk, 2.0.x: Support for artwork on iPod audio devices via GdkPixbuf
<http://developer.gnome.org/arch/imaging/gdkpixbuf.html>
# libmtp, 0.3.0: Enable Support for portable media devices that use the media
transfer protocol <http://libmtp.sourceforge.net/>
-# loudmouth: Loudmouth is the communication backend needed by mp3tunes for
synching. <http://www.loudmouth-project.org>
-# kdemultimedia, 4.0: Support for playing audio cds <http://www.kde.org>
BuildDepends: <<
automoc-%type_pkg[kde] (>= 0.9.88-1),
@@ -51,6 +48,7 @@
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.14.0-1),
+ gtk+2-dev (>= 2.12.0-1),
kde4-buildenv (>= 4.2-3),
kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
@@ -102,18 +100,16 @@
mv %i/lib/%type_pkg[kde]/bin/amarok.app
%i/lib/%type_pkg[kde]/bin/Amarok.app
rm -rf %i/lib/%type_pkg[kde]/bin/Amarok.shell
- rm -rf %i/lib/%type_pkg[kde]/lib/libamarok_taglib.dylib
rm -rf %i/lib/%type_pkg[kde]/lib/libamaroklib.dylib
- rm -rf %i/lib/%type_pkg[kde]/lib/libamarokplasma.dylib
rm -rf %i/lib/%type_pkg[kde]/lib/libamarokpud.dylib
+ rm -rf %i/lib/%type_pkg[kde]/lib/libmediadevicelib.dylib
<<
Shlibs: <<
!%p/lib/%type_pkg[kde]/lib/libamarok_service_liblastfm.dylib
- !%p/lib/%type_pkg[kde]/lib/libamarok_taglib.1.dylib
!%p/lib/%type_pkg[kde]/lib/libamaroklib.1.dylib
- !%p/lib/%type_pkg[kde]/lib/libamarokplasma.2.dylib
!%p/lib/%type_pkg[kde]/lib/libamarokpud.1.dylib
+ !%p/lib/%type_pkg[kde]/lib/libmediadevicelib.1.dylib
<<
PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
Modified: trunk/experimental/common/main/finkinfo/kde/amarok2.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/amarok2.patch&rev=1470&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/amarok2.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/amarok2.patch Wed Apr 1
17:26:54 2009
@@ -1,6 +1,26 @@
+diff -Nurd amarok/src/afttagger/afttagger_main.cpp
amarok-new/src/afttagger/afttagger_main.cpp
+--- amarok/src/afttagger/afttagger_main.cpp 2009-03-26 00:34:59.000000000
-0400
++++ amarok-new/src/afttagger/afttagger_main.cpp 2009-03-31
22:05:46.000000000 -0400
+@@ -19,11 +19,11 @@
+
+ #include "SafeFileSaver.h"
+
+-#include "taglib/fileref.h"
+-#include "taglib/id3v2tag.h"
+-#include "taglib/mpegfile.h"
+-#include "taglib/tfile.h"
+-#include "taglib/uniquefileidentifierframe.h"
++#include "fileref.h"
++#include "id3v2tag.h"
++#include "mpegfile.h"
++#include "tfile.h"
++#include "uniquefileidentifierframe.h"
+
+ #include <KAboutData>
+ #include <KCmdLineArgs>
diff -Nurd amarok/src/context/CMakeLists.txt
amarok-new/src/context/CMakeLists.txt
---- amarok/src/context/CMakeLists.txt 2009-02-02 12:57:46.000000000 -0500
-+++ amarok-new/src/context/CMakeLists.txt 2009-03-10 11:27:20.000000000
-0400
+--- amarok/src/context/CMakeLists.txt 2009-03-06 22:37:30.000000000 -0500
++++ amarok-new/src/context/CMakeLists.txt 2009-03-31 21:37:31.000000000
-0400
@@ -9,6 +9,7 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
..
@@ -9,14 +29,75 @@
${CMAKE_CURRENT_BINARY_DIR}/..)
########### next target ###############
-diff -Nurd amarok/src/metadata/mp4/mp4properties.cpp
amarok-new/src/metadata/mp4/mp4properties.cpp
---- amarok/src/metadata/mp4/mp4properties.cpp 2008-05-21 07:51:37.000000000
-0400
-+++ amarok-new/src/metadata/mp4/mp4properties.cpp 2009-03-10
11:27:20.000000000 -0400
-@@ -19,6 +19,7 @@
- * MA 02110-1301 USA *
- ***************************************************************************/
+diff -Nurd amarok/src/meta/MetaReplayGain.cpp
amarok-new/src/meta/MetaReplayGain.cpp
+--- amarok/src/meta/MetaReplayGain.cpp 2009-03-26 00:34:53.000000000 -0400
++++ amarok-new/src/meta/MetaReplayGain.cpp 2009-03-31 21:43:41.000000000
-0400
+@@ -25,7 +25,7 @@
+ #include <cmath>
-+#define HAVE_INTTYPES_H 1
- #include "mp4properties.h"
+ // Taglib
+-#include <taglib/tag.h>
++#include <tag.h>
+ #include <tlist.h>
+ #include <tstring.h>
+ #include <textidentificationframe.h>
+diff -Nurd amarok/src/meta/MetaReplayGain.h
amarok-new/src/meta/MetaReplayGain.h
+--- amarok/src/meta/MetaReplayGain.h 2009-03-06 22:36:58.000000000 -0500
++++ amarok-new/src/meta/MetaReplayGain.h 2009-03-31 21:43:41.000000000
-0400
+@@ -24,7 +24,7 @@
+ #include <QMap>
+ // Taglib
+-#include <taglib/fileref.h>
++#include <fileref.h>
+ /* This file exists (rather than putting the method in MetaUtility.h and
+ * MetaUtility.cpp) because we need to share the implementation between
+diff -Nurd amarok/src/meta/MetaUtility.cpp amarok-new/src/meta/MetaUtility.cpp
+--- amarok/src/meta/MetaUtility.cpp 2009-03-26 00:34:53.000000000 -0400
++++ amarok-new/src/meta/MetaUtility.cpp 2009-03-31 21:43:41.000000000
-0400
+@@ -30,7 +30,7 @@
+ #include <kio/global.h>
+
+ // Taglib
+-#include <taglib/tag.h>
++#include <tag.h>
+ #include <tlist.h>
+ #include <tmap.h>
+ #include <tstring.h>
+diff -Nurd amarok/src/meta/MetaUtility.h amarok-new/src/meta/MetaUtility.h
+--- amarok/src/meta/MetaUtility.h 2009-03-06 22:36:58.000000000 -0500
++++ amarok-new/src/meta/MetaUtility.h 2009-03-31 21:43:41.000000000 -0400
+@@ -27,7 +27,7 @@
+ #include <QVariant>
+
+ // Taglib
+-#include <taglib/fileref.h>
++#include <fileref.h>
+
+ namespace Meta
+ {
+diff -Nurd amarok/utilities/collectionscanner/MetaReplayGain.cpp
amarok-new/utilities/collectionscanner/MetaReplayGain.cpp
+--- amarok/utilities/collectionscanner/MetaReplayGain.cpp 2009-03-26
00:35:02.000000000 -0400
++++ amarok-new/utilities/collectionscanner/MetaReplayGain.cpp 2009-03-31
22:07:35.000000000 -0400
+@@ -25,7 +25,7 @@
+ #include <cmath>
+
+ // Taglib
+-#include <taglib/tag.h>
++#include <tag.h>
+ #include <tlist.h>
+ #include <tstring.h>
+ #include <textidentificationframe.h>
+diff -Nurd amarok/utilities/collectionscanner/MetaReplayGain.h
amarok-new/utilities/collectionscanner/MetaReplayGain.h
+--- amarok/utilities/collectionscanner/MetaReplayGain.h 2009-03-26
00:35:02.000000000 -0400
++++ amarok-new/utilities/collectionscanner/MetaReplayGain.h 2009-03-31
22:07:35.000000000 -0400
+@@ -22,7 +22,7 @@
+ #include <QMap>
+
+ // Taglib
+-#include <taglib/fileref.h>
++#include <fileref.h>
+
+ /* This file exists (rather than putting the method in MetaUtility.h and
+ * MetaUtility.cpp) because we need to share the implementation between
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
