View | Details | Raw Unified | Return to bug 108711
Collapse All | Expand All

(-)amarok/Makefile (-12 / +6 lines)
Lines 5-12 Link Here
5
# $FreeBSD: ports/audio/amarok/Makefile,v 1.62 2006/12/26 15:00:46 mich Exp $
5
# $FreeBSD: ports/audio/amarok/Makefile,v 1.62 2006/12/26 15:00:46 mich Exp $
6
6
7
PORTNAME=	amarok
7
PORTNAME=	amarok
8
PORTVERSION=	1.4.4
8
PORTVERSION=	1.4.5
9
PORTREVISION=	2
10
CATEGORIES=	audio kde
9
CATEGORIES=	audio kde
11
MASTER_SITES=	${MASTER_SITE_KDE}
10
MASTER_SITES=	${MASTER_SITE_KDE}
12
MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
11
MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
Lines 32-38 Link Here
32
OPTIONS=	GPOD "iPod support" on \
31
OPTIONS=	GPOD "iPod support" on \
33
		NJB "Creative Nomad and Dell support" on \
32
		NJB "Creative Nomad and Dell support" on \
34
		MTP "MTP device support" on \
33
		MTP "MTP device support" on \
35
		XMMS "XMMS visualizations" off \
36
		OPENGL "OpenGL support" on \
34
		OPENGL "OpenGL support" on \
37
		AMAZON "Amazon cover fetching support" on \
35
		AMAZON "Amazon cover fetching support" on \
38
		MYSQL "Use MySQL as collection backend" off \
36
		MYSQL "Use MySQL as collection backend" off \
Lines 74-88 Link Here
74
PLIST_SUB+=	MTP=""
72
PLIST_SUB+=	MTP=""
75
.endif
73
.endif
76
74
77
.if !defined(WITH_XMMS)
78
PLIST_SUB+=	XMMS="@comment "
79
CONFIGURE_ARGS+=--without-xmms
80
.else
81
BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
82
LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
83
PLIST_SUB+=	XMMS=""
84
.endif
85
86
.if defined(WITHOUT_OPENGL)
75
.if defined(WITHOUT_OPENGL)
87
CONFIGURE_ARGS+=--without-opengl
76
CONFIGURE_ARGS+=--without-opengl
88
.endif
77
.endif
Lines 99-104 Link Here
99
.if defined(WITH_POSTGRESQL)
88
.if defined(WITH_POSTGRESQL)
100
USE_PGSQL=	yes
89
USE_PGSQL=	yes
101
CONFIGURE_ARGS+=--enable-postgresql
90
CONFIGURE_ARGS+=--enable-postgresql
91
.endif
92
93
.if defined(DEBUG)
94
CONFIGURE_ARGS+=--enable-debug=full
95
STRIP=          # none
102
.endif
96
.endif
103
97
104
pre-extract:	check-options-version
98
pre-extract:	check-options-version
(-)amarok/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (amarok-1.4.4.tar.bz2) = 56a9aec42088c338b81252f8e0651781
1
MD5 (amarok-1.4.5.tar.bz2) = 81696ff44989334f0fc5dfd4142ded6d
2
SHA256 (amarok-1.4.4.tar.bz2) = 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea
2
SHA256 (amarok-1.4.5.tar.bz2) = a9d2214cab085ac9271c31354e0f797887f0a7cb6acd68ccbc7f94a71d805451
3
SIZE (amarok-1.4.4.tar.bz2) = 17635707
3
SIZE (amarok-1.4.5.tar.bz2) = 18034058
(-)amarok/files/patch-amarok_src_amarok__proxy.rb (-26 lines)
Lines 1-26 Link Here
1
2
$FreeBSD: ports/audio/amarok/files/patch-amarok_src_amarok__proxy.rb,v 1.1 2006/12/08 11:53:14 mich Exp $
3
4
--- amarok/src/amarok_proxy.rb.orig
5
+++ amarok/src/amarok_proxy.rb
6
@@ -117,6 +117,11 @@
7
   def cp_to_empty_outward( income, output )
8
     myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}"
9
     income.each_line do |data|
10
+      if data =~ /User-Agent: xine\/([0-9.]+)/
11
+        version = $1.split(".").collect { |v| v.to_i }
12
+        myputs("Found xine user agent version #{version.join(".")}")
13
+        @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 )
14
+      end
15
       myputs( data )
16
       data.chomp!
17
       safe_write( output, data )
18
@@ -142,7 +147,7 @@
19
 
20
   def cp_all_inward( income, output )
21
     myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" )
22
-    if self.is_a?( LastFM ) and @engine == 'xine-engine'
23
+    if self.is_a?( LastFM ) and @xineworkaround
24
       myputs( "Using buffer fill workaround." )
25
       filler = Array.new( 4096, 0 )
26
       safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block
(-)amarok/files/patch-amarok_src_lastfm.cpp (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
--- amarok/src/lastfm.cpp.orig
4
--- amarok/src/lastfm.cpp.orig
5
+++ amarok/src/lastfm.cpp
5
+++ amarok/src/lastfm.cpp
6
@@ -729,7 +729,7 @@
6
@@ -905,7 +905,7 @@
7
 
7
 
8
     QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
8
     QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
9
 
9
 
(-)amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp (-29 lines)
Lines 1-29 Link Here
1
2
$FreeBSD: ports/audio/amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp,v 1.2 2007/01/18 12:52:52 mich Exp $
3
4
--- amarok/src/mediadevice/generic/genericmediadevice.cpp.orig
5
+++ amarok/src/mediadevice/generic/genericmediadevice.cpp
6
@@ -415,7 +415,13 @@
7
         if( m_medium.mountPoint() == (*mountiter)->mountPoint() )
8
             m_medium.setFsType( (*mountiter)->mountType() );
9
     }
10
-    m_actuallyVfat = m_medium.fsType() == "vfat" ? true : false;
11
+    m_actuallyVfat = m_medium.fsType() == 
12
+#ifdef __FreeBSD__
13
+"msdosfs"
14
+#else
15
+"vfat"
16
+#endif
17
+ ? true : false;
18
     m_connected = true;
19
     m_transferDir = m_medium.mountPoint();
20
     m_initialFile = new GenericMediaFile( 0, m_medium.mountPoint(), this );
21
@@ -457,7 +463,7 @@
22
     debug() << "Renaming: " << src << " to: " << dst << endl;
23
 
24
     //do we want a progress dialog?  If so, set last false to true
25
-    if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) )
26
+    if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, 0 ) )
27
     {
28
         m_mfm.erase( m_mim[item]->getFullName() );
29
         m_mim[item]->setNamesFromBase( item->text(0) );
(-)amarok/files/patch-amarok_src_sqlite_fts1.c (+11 lines)
Line 0 Link Here
1
--- amarok/src/sqlite/fts1.c.orig       Thu Feb  1 23:14:17 2007
2
+++ amarok/src/sqlite/fts1.c    Sat Feb  3 01:51:38 2007
3
@@ -19,7 +19,7 @@
4
 #endif
5
6
 #include <assert.h>
7
-#if !defined(__APPLE__)
8
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
9
 #include <malloc.h>
10
 #else
11
 #include <stdlib.h>
(-)amarok/files/patch-amarok_src_sqlite_fts1__porter.c (+11 lines)
Line 0 Link Here
1
--- amarok/src/sqlite/fts1_porter.c.orig        Thu Feb  1 23:14:17 2007
2
+++ amarok/src/sqlite/fts1_porter.c     Sat Feb  3 01:51:55 2007
3
@@ -26,7 +26,7 @@
4
5
6
 #include <assert.h>
7
-#if !defined(__APPLE__)
8
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
9
 #include <malloc.h>
10
 #else
11
 #include <stdlib.h>
(-)amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c (+11 lines)
Line 0 Link Here
1
--- amarok/src/sqlite/fts1_tokenizer1.c.orig    Thu Feb  1 23:14:17 2007
2
+++ amarok/src/sqlite/fts1_tokenizer1.c Sat Feb  3 01:52:07 2007
3
@@ -18,7 +18,7 @@
4
5
6
 #include <assert.h>
7
-#if !defined(__APPLE__)
8
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
9
 #include <malloc.h>
10
 #else
11
 #include <stdlib.h>
(-)amarok/files/patch-amarok_src_statusbar_statusbar.cpp (+11 lines)
Line 0 Link Here
1
--- amarok/src/statusbar/statusbar.cpp.orig	Mon Dec 18 00:17:13 2006
2
+++ amarok/src/statusbar/statusbar.cpp	Mon Dec 18 00:13:27 2006
3
@@ -81,7 +81,7 @@
4
     m_slider->setMinimumWidth( m_timeLabel->width() );
5
 
6
     m_timeLabel2 = new TimeLabel( positionBox );
7
-    m_slider->setMinimumWidth( m_timeLabel2->width() );
8
+    m_slider->setMinimumWidth( m_timeLabel2->width() + 128 );
9
 
10
 
11
     // TODO Both labels need tooltips (string freeze?)
(-)amarok/pkg-plist (-5 / +13 lines)
Lines 3-13 Link Here
3
bin/amarokcollectionscanner
3
bin/amarokcollectionscanner
4
bin/amarok_daapserver.rb
4
bin/amarok_daapserver.rb
5
bin/amarok_proxy.rb
5
bin/amarok_proxy.rb
6
lib/libamarok.so
7
lib/libamarok.so.0
8
lib/libamarok.a
6
lib/libamarok.a
9
lib/libamarok.la
7
lib/libamarok.la
10
%%XMMS%%bin/amarok_xmmswrapper2
8
lib/libamarok.so
9
lib/libamarok.so.0
11
lib/kde3/konqsidebar_universalamarok.a
10
lib/kde3/konqsidebar_universalamarok.a
12
lib/kde3/konqsidebar_universalamarok.la
11
lib/kde3/konqsidebar_universalamarok.la
13
lib/kde3/konqsidebar_universalamarok.so
12
lib/kde3/konqsidebar_universalamarok.so
Lines 56-62 Link Here
56
share/apps/amarok/data/firstrun.m3u
55
share/apps/amarok/data/firstrun.m3u
57
share/apps/amarok/data/grid.png
56
share/apps/amarok/data/grid.png
58
share/apps/amarok/data/magnatune_logo.png
57
share/apps/amarok/data/magnatune_logo.png
59
share/apps/amarok/data/magnatune_start_page.html
60
share/apps/amarok/data/wirl1.png
58
share/apps/amarok/data/wirl1.png
61
share/apps/amarok/data/wirl2.png
59
share/apps/amarok/data/wirl2.png
62
share/apps/amarok/icons/crystalsvg/16x16/actions/covermanager.png
60
share/apps/amarok/icons/crystalsvg/16x16/actions/covermanager.png
Lines 436-442 Link Here
436
share/apps/amarok/images/currenttrack_repeat_small.png
434
share/apps/amarok/images/currenttrack_repeat_small.png
437
share/apps/amarok/images/currenttrack_stop.png
435
share/apps/amarok/images/currenttrack_stop.png
438
share/apps/amarok/images/currenttrack_stop_small.png
436
share/apps/amarok/images/currenttrack_stop_small.png
439
share/apps/amarok/images/description.png
440
share/apps/amarok/images/eq_active2.png
437
share/apps/amarok/images/eq_active2.png
441
share/apps/amarok/images/eq_inactive2.png
438
share/apps/amarok/images/eq_inactive2.png
442
share/apps/amarok/images/lastfm.png
439
share/apps/amarok/images/lastfm.png
Lines 474-479 Link Here
474
share/apps/amarok/ruby_lib/mongrel/debug.rb
471
share/apps/amarok/ruby_lib/mongrel/debug.rb
475
share/apps/amarok/ruby_lib/mongrel/handlers.rb
472
share/apps/amarok/ruby_lib/mongrel/handlers.rb
476
share/apps/amarok/ruby_lib/mongrel/init.rb
473
share/apps/amarok/ruby_lib/mongrel/init.rb
474
share/apps/amarok/ruby_lib/mongrel/mime_types.yml
477
share/apps/amarok/ruby_lib/mongrel/stats.rb
475
share/apps/amarok/ruby_lib/mongrel/stats.rb
478
share/apps/amarok/ruby_lib/mongrel/tcphack.rb
476
share/apps/amarok/ruby_lib/mongrel/tcphack.rb
479
share/apps/amarok/ruby_lib/rbconfig/datadir.rb
477
share/apps/amarok/ruby_lib/rbconfig/datadir.rb
Lines 990-995 Link Here
990
share/locale/en_GB/LC_MESSAGES/amarok.mo
988
share/locale/en_GB/LC_MESSAGES/amarok.mo
991
share/locale/es/LC_MESSAGES/amarok.mo
989
share/locale/es/LC_MESSAGES/amarok.mo
992
share/locale/et/LC_MESSAGES/amarok.mo
990
share/locale/et/LC_MESSAGES/amarok.mo
991
share/locale/fa/LC_MESSAGES/amarok.mo
993
share/locale/fi/LC_MESSAGES/amarok.mo
992
share/locale/fi/LC_MESSAGES/amarok.mo
994
share/locale/fr/LC_MESSAGES/amarok.mo
993
share/locale/fr/LC_MESSAGES/amarok.mo
995
share/locale/ga/LC_MESSAGES/amarok.mo
994
share/locale/ga/LC_MESSAGES/amarok.mo
Lines 1016-1021 Link Here
1016
share/locale/ru/LC_MESSAGES/amarok.mo
1015
share/locale/ru/LC_MESSAGES/amarok.mo
1017
share/locale/rw/LC_MESSAGES/amarok.mo
1016
share/locale/rw/LC_MESSAGES/amarok.mo
1018
share/locale/sl/LC_MESSAGES/amarok.mo
1017
share/locale/sl/LC_MESSAGES/amarok.mo
1018
share/locale/se/LC_MESSAGES/amarok.mo
1019
share/locale/sk/LC_MESSAGES/amarok.mo
1019
share/locale/sk/LC_MESSAGES/amarok.mo
1020
share/locale/sq/LC_MESSAGES/amarok.mo
1020
share/locale/sq/LC_MESSAGES/amarok.mo
1021
share/locale/sr/LC_MESSAGES/amarok.mo
1021
share/locale/sr/LC_MESSAGES/amarok.mo
Lines 1072-1083 Link Here
1072
@dirrmtry share/locale/rw
1072
@dirrmtry share/locale/rw
1073
@dirrmtry share/locale/sl/LC_MESSAGES
1073
@dirrmtry share/locale/sl/LC_MESSAGES
1074
@dirrmtry share/locale/sl
1074
@dirrmtry share/locale/sl
1075
@dirrmtry share/locale/se/LC_MESSAGES
1076
@dirrmtry share/locale/se
1075
@dirrmtry share/locale/sk/LC_MESSAGES
1077
@dirrmtry share/locale/sk/LC_MESSAGES
1076
@dirrmtry share/locale/sk
1078
@dirrmtry share/locale/sk
1079
@dirrmtry share/locale/sr/LC_MESSAGES
1080
@dirrmtry share/locale/sr
1077
@dirrmtry share/locale/tg/LC_MESSAGES
1081
@dirrmtry share/locale/tg/LC_MESSAGES
1078
@dirrmtry share/locale/tg
1082
@dirrmtry share/locale/tg
1079
@dirrmtry share/locale/uk/LC_MESSAGES
1083
@dirrmtry share/locale/uk/LC_MESSAGES
1080
@dirrmtry share/locale/uk
1084
@dirrmtry share/locale/uk
1085
@dirrmtry share/locale/zh_CN/LC_MESSAGES
1086
@dirrmtry share/locale/zh_CN
1087
@dirrmtry share/locale/zh_TW/LC_MESSAGES
1088
@dirrmtry share/locale/zh_TW
1081
@dirrm share/doc/HTML/sv/amarok
1089
@dirrm share/doc/HTML/sv/amarok
1082
@dirrm share/doc/HTML/ru/amarok
1090
@dirrm share/doc/HTML/ru/amarok
1083
@dirrm share/doc/HTML/pt_BR/amarok
1091
@dirrm share/doc/HTML/pt_BR/amarok

Return to bug 108711