[gentoo-commits] gentoo-x86 commit in media-sound/squeezecenter/files: squeezecenter-7.3.2-json-xs-gentoo.patch squeezecenter-7.3.2-aac-transcode-gentoo.patch squeezecenter-7.3.2-build-perl-modules-gentoo.patch

[Joe Peterson (lavajoe)]

lavajoe     09/01/26 03:29:21

  Added:                squeezecenter-7.3.2-json-xs-gentoo.patch
                        squeezecenter-7.3.2-aac-transcode-gentoo.patch
                        squeezecenter-7.3.2-build-perl-modules-gentoo.patch
  Log:
  Add new version 7.3.2
  (Portage version: 2.1.6.7/cvs/Linux i686)

Revision  Changes    Path
1.1                  media-sound/squeezecenter/files/squeezecenter-7.3.2-json-xs-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.2-json-xs-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.2-json-xs-gentoo.patch?rev=1.1&content-type=text/plain

Index: squeezecenter-7.3.2-json-xs-gentoo.patch
===================================================================
--- Slim/Formats/XML.pm.old	2009-01-17 21:27:29.000000000 +0000
+++ Slim/Formats/XML.pm	2009-01-17 21:40:14.000000000 +0000
@@ -13,7 +13,7 @@
 use strict;
 use File::Slurp;
 use HTML::Entities;
-use JSON::XS qw(from_json);
+use JSON::XS qw(decode_json);
 use Scalar::Util qw(weaken);
 use URI::Escape qw(uri_escape);
 use XML::Simple;
@@ -288,7 +288,7 @@
 	my $xml;
 	
 	if ( $type =~ /json/ ) {
-		$xml = from_json($$content);
+		$xml = decode_json($$content);
 	}
 	else {
 		$xml = xmlToHash($content);



1.1                  media-sound/squeezecenter/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch?rev=1.1&content-type=text/plain

Index: squeezecenter-7.3.2-aac-transcode-gentoo.patch
===================================================================
--- convert.conf.old	2009-01-21 12:10:24.000000000 +0000
+++ convert.conf	2009-01-21 20:22:05.000000000 +0000
@@ -74,8 +74,8 @@
 # specific combinations match before wildcards
 
 mov mp3 * *
-	# FRB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
-	[mov123] $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - -
+	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
+	[faad] -q -w -f 2 $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - -
 
 alc mp3 * *
 	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
@@ -158,9 +158,12 @@
 	[wvunpack] $FILE$ -rq $START$ $END$ -o -
 
 ## you can comment this out if you want to use LAME to transcode AAC/MOV files to MP3.
-mov aif * *
-	# FR
-	[mov123] $FILE$
+#mov aif * *
+#	# FR
+#	[mov123] $FILE$
+mov wav * *
+	# F
+	[faad] -q -w -f 2 $FILE$
 
 wma wma * *
 	-
@@ -198,8 +201,8 @@
 	[mac] $FILE$ - -d | [flac] -cs --totally-silent --compression-level-0 -
 
 mov flc * *
-	# FR
-	[mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 -
+	# F
+	[faad] -q -w -f 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 -
 
 alc flc * *
 	# F



1.1                  media-sound/squeezecenter/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch?rev=1.1&content-type=text/plain

Index: squeezecenter-7.3.2-build-perl-modules-gentoo.patch
===================================================================
--- Bin/build-perl-modules.pl.old	2009-01-04 17:55:46.000000000 +0000
+++ Bin/build-perl-modules.pl	2009-01-05 18:53:33.000000000 +0000
@@ -21,24 +21,12 @@
 
 # NOTE: If you change this in a future version of SC, create a new
 # versioned directory under vendor/src for all files for that version
-my $SOURCE = 'http://svn.slimdevices.com/repos/slim/vendor/src/7.3';
 my $dlext  = $Config{'dlext'};
 
 # The list of all the packages needed.
 my %packages = (
 	'Class::XSAccessor::Array' => 'Class-XSAccessor-Array-0.05.tar.gz',
-	'Compress::Zlib'           => 'Compress-Zlib-1.41.tar.gz',
-	'DBI'                      => 'DBI-1.604.tar.gz',
-	'DBD::mysql'               => 'DBD-mysql-3.0002.tar.gz',
-	'Digest::SHA1'             => 'Digest-SHA1-2.11.tar.gz',
-	'Encode::Detect'           => 'Encode-Detect-1.00.tar.gz',
-	'JSON::XS'                 => 'JSON-XS-1.5.tar.gz',
-	'HTML::Parser'             => 'HTML-Parser-3.48.tar.gz',
 	'POE::XS::Queue::Array'    => 'POE-XS-Queue-Array-0.002.tar.gz',
-	'Template'                 => 'Template-Toolkit-2.15.tar.gz',
-	'Time::HiRes'              => 'Time-HiRes-1.86.tar.gz',
-	'XML::Parser::Expat'       => 'XML-Parser-2.34.tar.gz',
-	'YAML::Syck'               => 'YAML-Syck-0.64.tar.gz',
 );
 
 # Don't need Class::C3::XS if you're running 5.10
@@ -196,36 +184,16 @@
 		}
 	}
 
+	# Utilise AutoXS::Header as we need that to support the following builds.
+	chdir($pwd) or die "Couldn't change to $pwd : $!";
+	# Include this when performing the following builds.
+	$ENV{'PERL5LIB'} = cwd() . "/AutoXS-Header-0.03/lib";
+
 	for my $package (@packages) {
 
 		chdir($pwd) or die "Couldn't change to $pwd : $!";
 
-		print "\nDownloading $package to: $pwd\n";
-
-		# Remove any previous version.
-		unlink $package;
-
-		if ($downloadUsing eq 'lwp') {
-
-			LWP::Simple::getstore("$SOURCE/$package?view=auto", $package);
-
-		} elsif ($downloadUsing =~ /curl$/) {
-
-			`$downloadUsing --silent -o $package $SOURCE/$package?view=auto`;
-
-		} else {
-
-			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
-		}
-
-		unless (-r $package) {
-			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
-		}
-
-		print "Uncompressing..\n";
-		`gzip -d < $package | tar xvf -`;
-
-		unlink $package;
+		print "\nBuilding $package\n";
 
 		# Just the directory name.
 		my ($packageDir) = ($package =~ /(\S+?)\.tar\.gz/);
--- Slim/bootstrap.pm.old	2008-11-22 15:14:07.000000000 +0000
+++ Slim/bootstrap.pm	2008-11-22 15:14:30.000000000 +0000
@@ -176,7 +176,6 @@
 
 		print "The following modules failed to load: $failed\n\n";
 
-		print "To download and compile them, please run: $libPath/Bin/build-perl-modules.pl $failed\n\n";
 		print "Exiting..\n";
 
 		exit;