4 files changed, 24 insertions, 28 deletions
diff --git a/audio/squeezeboxserver/files/patch-Slim-Utils-Log.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_Log.pm
index 25d5aa8a1a81..ac4e83c45130 100644
--- a/audio/squeezeboxserver/files/patch-Slim-Utils-Log.pm
+++ b/audio/squeezeboxserver/files/patch-Slim_Utils_Log.pm
@@ -1,15 +1,15 @@
---- Slim/Utils/Log.pm	2010-04-01 13:21:54.000000000 +0100
-+++ Slim/Utils/Log.pm	2010-06-07 09:08:34.000000000 +0100
-@@ -134,7 +134,7 @@
+--- Slim/Utils/Log.pm.orig	2011-01-24 15:15:39 UTC
++++ Slim/Utils/Log.pm
+@@ -134,7 +134,7 @@ sub init {
  	# Make sure recreate option is set if user has an existing log.conf
  	if ( !main::ISWINDOWS && !$ENV{NYTPROF} ) {
  		$config{'log4perl.appender.server.recreate'}              = 1;
 -		$config{'log4perl.appender.server.recreate_check_signal'} = 'USR1';
 +		$config{'log4perl.appender.server.recreate_check_signal'} = 'HUP';
  	}
- 	
- 	# Change to syslog if requested
-@@ -985,7 +985,7 @@
+ 	else {
+ 		$config{'log4perl.appender.server.recreate'}              = 0;
+@@ -989,7 +989,7 @@ sub _defaultAppenders {
  
  	if ( !main::ISWINDOWS && !$ENV{NYTPROF} ) {
  		$defaultAppenders{server}->{recreate}              = 1;
diff --git a/audio/squeezeboxserver/files/patch-convert.conf b/audio/squeezeboxserver/files/patch-convert.conf
index 4d6c53fbd6ab..04d630cf8c24 100644
--- a/audio/squeezeboxserver/files/patch-convert.conf
+++ b/audio/squeezeboxserver/files/patch-convert.conf
@@ -1,7 +1,7 @@
---- convert.conf.orig
+--- convert.conf.orig	2011-01-24 15:16:10 UTC
 +++ convert.conf
-@@ -82,8 +82,8 @@
- 	[faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - -
+@@ -86,8 +86,8 @@ sls mp3 * *
+ 	[sls] $FILE$ - -s | [lame] --silent -q $QUALITY$ $RESAMPLE$ $BITRATE$ - -
  
  mov mp3 * *
 -	# FRB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
@@ -10,8 +10,8 @@
 +	[faad] -q -w -f 2 $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --little-endian - -
  
  alc mp3 * *
- 	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
-@@ -115,7 +115,7 @@
+ 	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}T:{START=-j %s}
+@@ -127,7 +127,7 @@ mpc mp3 * *
  
  ape mp3 * *
  	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
@@ -20,9 +20,9 @@
  
  wvp mp3 * *
  	# FB:{BITRATE=-B %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D}
-@@ -173,9 +173,9 @@
- 	# IF
- 	[faad] -q -w -f 2 -b 1 -s 44100 $FILE$
+@@ -197,9 +197,9 @@ sls pcm * *
+ 	# F
+ 	[sls] $FILE$ - -r -s
  
 -mov aif * *
 +mov wav * *
@@ -32,8 +32,8 @@
  
  wma wma * *
  	-
-@@ -221,8 +221,8 @@
- 	[faad] -q -w -f 1 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes -
+@@ -264,8 +264,8 @@ sls flc * *
+ 	[sls] $FILE$ - -s | [sox] -q -t wav - -t flac -C 0 $RESAMPLE$ -
  
  mov flc * *
 -	# FR
@@ -42,4 +42,4 @@
 +	[faad] -w -q -f 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 -
  
  alc flc * *
- 	# F
+ 	# FT:{START=-j %s}D:{RESAMPLE=-r %d}
diff --git a/audio/squeezeboxserver/files/patch-dbix-class-bug.diff b/audio/squeezeboxserver/files/patch-dbix-class-bug.diff
index 0e0684251df1..4745e571a74b 100644
--- a/audio/squeezeboxserver/files/patch-dbix-class-bug.diff
+++ b/audio/squeezeboxserver/files/patch-dbix-class-bug.diff
@@ -1,8 +1,8 @@
 Index: Slim/Schema.pm
 ===================================================================
---- Slim/Schema.pm	(revision 31006)
-+++ Slim/Schema.pm	(working copy)
-@@ -274,11 +274,15 @@
+--- Slim/Schema.pm.orig	2011-01-24 15:15:39 UTC
++++ Slim/Schema.pm
+@@ -274,11 +274,15 @@ sub _connect {
  	# For custom exceptions
  	$class->storage_type('Slim::Schema::Storage');
  	
@@ -19,11 +19,9 @@ Index: Slim/Schema.pm
  		PrintError    => 0,
  		Taint         => 1,
  		on_connect_do => [
-Index: scanner.pl
-===================================================================
---- scanner.pl	(revision 31006)
-+++ scanner.pl	(working copy)
-@@ -236,9 +236,6 @@
+--- scanner.pl.orig	2011-03-21 13:05:58 UTC
++++ scanner.pl
+@@ -236,9 +236,6 @@ sub main {
  
  	main::INFOLOG && $log->info("Squeezebox Server Scanner done init...\n");
  
@@ -33,5 +31,3 @@ Index: scanner.pl
  	my $scanType = 'SETUP_STANDARDRESCAN';
  
  	if ($wipe) {
-
---------------020502080403070605040408--
diff --git a/audio/squeezeboxserver/files/patch-modules.conf b/audio/squeezeboxserver/files/patch-modules.conf
index cf83507518cc..d607ecdd0eb6 100644
--- a/audio/squeezeboxserver/files/patch-modules.conf
+++ b/audio/squeezeboxserver/files/patch-modules.conf
@@ -1,4 +1,4 @@
---- modules.conf.orig
+--- modules.conf.orig	2011-03-21 19:56:39 UTC
 +++ modules.conf
 @@ -5,7 +5,7 @@
  # <module> <min_version> [ <max_version> ]