diff options
Diffstat (limited to 'media-sound/squeezecenter/files')
30 files changed, 0 insertions, 1831 deletions
diff --git a/media-sound/squeezecenter/files/Gentoo-plugins-README.txt b/media-sound/squeezecenter/files/Gentoo-plugins-README.txt deleted file mode 100644 index fa27cdc20801..000000000000 --- a/media-sound/squeezecenter/files/Gentoo-plugins-README.txt +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/Gentoo-plugins-README.txt,v 1.1 2008/08/03 04:35:29 lavajoe Exp $ - -The standard SqueezeCenter package is installed differently on Gentoo in order -that the installation complies with Gentoo's filesystem layout. These notes -are provided to give guidance for installing plugins within this modified -layout. - -INSTALLING PLUGINS - -The installation instructions of plugins should be followed but with the -following Gentoo specifics: - -* Plugins should be installed into the directory: - /var/lib/squeezecenter/Plugins -* Extension binaries (which sometimes accompany plugins) should be installed - into the directory: - /usr/lib/squeezecenter/Bin - -BACKGROUND - -Those interested can refer to the following for details of Gentoo's filesystem -standard: -http://devmanual.gentoo.org/general-concepts/filesystem/index.html diff --git a/media-sound/squeezecenter/files/avahi-squeezecenter.service b/media-sound/squeezecenter/files/avahi-squeezecenter.service deleted file mode 100644 index 6643b3fe8d56..000000000000 --- a/media-sound/squeezecenter/files/avahi-squeezecenter.service +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" standalone='no'?><!--*-nxml-*--> -<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> - -<service-group> - - <name>SqueezeCenter</name> - - <service> - <type>_http._tcp</type> - <port>9000</port> - </service> - - <service> - <type>_slimhttp._tcp</type> - <port>9000</port> - </service> - -</service-group> diff --git a/media-sound/squeezecenter/files/dbcreate-gentoo.sql b/media-sound/squeezecenter/files/dbcreate-gentoo.sql deleted file mode 100644 index 939b75a90bad..000000000000 --- a/media-sound/squeezecenter/files/dbcreate-gentoo.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE DATABASE __DATABASE__; - -GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER - ON *.* - TO '__DBUSER__'@'localhost' - IDENTIFIED BY '__DBPASSWORD__' diff --git a/media-sound/squeezecenter/files/dbdrop-gentoo.sql b/media-sound/squeezecenter/files/dbdrop-gentoo.sql deleted file mode 100644 index 1d3bc8d696aa..000000000000 --- a/media-sound/squeezecenter/files/dbdrop-gentoo.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP DATABASE __DATABASE__; -DROP USER '__DBUSER__'@'localhost'; diff --git a/media-sound/squeezecenter/files/filepaths-7.1-gentoo.patch b/media-sound/squeezecenter/files/filepaths-7.1-gentoo.patch deleted file mode 100644 index c5c00e28f432..000000000000 --- a/media-sound/squeezecenter/files/filepaths-7.1-gentoo.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- Slim/Utils/OSDetect.pm.old 2008-07-22 12:25:34.000000000 +0100 -+++ Slim/Utils/OSDetect.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -253,6 +253,58 @@ - warn "dirsFor: Didn't find a match request: [$dir]\n"; - } - -+ } elsif (isGentoo()) { -+ -+ if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL)$/) { -+ -+ push @dirs, "/usr/share/squeezecenter/$dir"; -+ -+ } elsif ($dir =~ /^(?:lib)$/) { -+ -+ push @dirs, "/usr/lib/squeezecenter"; -+ -+ } elsif ($dir eq 'UserPluginRoot') { -+ -+ push @dirs, "/var/lib/squeezecenter"; -+ -+ } elsif ($dir eq 'Plugins') { -+ -+ push @dirs, "/var/lib/squeezecenter/Plugins"; -+ push @dirs, "/usr/lib/" . $Config{'package'} . "/vendor_perl/" . $Config{'version'} . "/Slim/Plugin" -+ -+ } elsif ($dir eq 'strings' || $dir eq 'revision') { -+ -+ push @dirs, "/usr/share/squeezecenter"; -+ -+ } elsif ($dir =~ /^(?:types|convert)$/) { -+ -+ push @dirs, "/etc/squeezecenter"; -+ -+ } elsif ($dir =~ /^(?:prefs)$/) { -+ -+ push @dirs, "/var/lib/squeezecenter/prefs"; -+ -+ } elsif ($dir eq 'log') { -+ -+ push @dirs, "/var/log/squeezecenter"; -+ -+ } elsif ($dir eq 'cache') { -+ -+ push @dirs, "/var/lib/squeezecenter/cache"; -+ -+ } elsif ($dir eq 'MySQL') { -+ -+ # Do nothing - use the depended upon MySQL install. -+ -+ } elsif ($dir =~ /^(?:music|playlists)$/) { -+ -+ push @dirs, ''; -+ -+ } else { -+ -+ warn "dirsFor: Didn't find a match request: [$dir]\n"; -+ } -+ - # Red Hat/Fedora/SUSE RPM specific paths. - } elsif (isRHorSUSE()) { - -@@ -465,6 +517,19 @@ - return isReadyNAS(); - } - -+sub isGentoo { -+ -+ # Initialize -+ my $OS = OS(); -+ my $details = details(); -+ -+ if ($details->{'osName'} eq 'Gentoo') { -+ return 1; -+ } -+ -+ return 0; -+} -+ - sub isRHorSUSE { - - # Initialize -@@ -586,6 +651,10 @@ - - $osDetails{'osName'} = 'Debian'; - -+ } elsif (-f '/etc/gentoo-release') { -+ -+ $osDetails{'osName'} = 'Gentoo'; -+ - } elsif (-f '/etc/redhat_release' || -f '/etc/redhat-release') { - - $osDetails{'osName'} = 'Red Hat'; -@@ -603,7 +672,7 @@ - $osDetails{'osArch'} = $Config{'myarchname'}; - - # package specific addition to @INC to cater for plugin locations -- if (isDebian()) { -+ if (isDebian() || isGentoo()) { - - unshift @INC, '/usr/share/squeezecenter'; - unshift @INC, '/usr/share/squeezecenter/CPAN'; ---- Slim/Music/Import.pm.old 2008-07-22 12:24:32.000000000 +0100 -+++ Slim/Music/Import.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -128,7 +128,7 @@ - - $command = '/usr/libexec/squeezecenter-scanner'; - -- } elsif (Slim::Utils::OSDetect::isDebian()) { -+ } elsif (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isGentoo()) { - - $command = '/usr/sbin/squeezecenter-scanner'; - ---- Slim/bootstrap.pm.old 2008-07-22 12:24:09.000000000 +0100 -+++ Slim/bootstrap.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -97,8 +97,9 @@ - - my @SlimINC = (); - -- if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) { -- # On Debian, RH and SUSE, our CPAN directory is located in the same dir as strings.txt -+ if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) { -+ # On Debian, Gentoo, RH and SUSE, our CPAN directory is located in the -+ # same dir as strings.txt - $libPath = Slim::Utils::OSDetect::dirsFor('strings'); - } - -@@ -125,6 +126,14 @@ - $libPath, - ); - -+ if (Slim::Utils::OSDetect::isGentoo()) { -+ # On Gentoo, the lib directory is located separately to the CPAN -+ # directory as it's not architecture-independent, and make sure we -+ # also look at the separate user plugins directory. -+ push @SlimINC, Slim::Utils::OSDetect::dirsFor('lib'); -+ push @SlimINC, Slim::Utils::OSDetect::dirsFor('UserPluginRoot'); -+ } -+ - $d_startup && printf("Got \@INC containing:\n%s\n\n", join("\n", @INC)); - - # This works like 'use lib' ---- Slim/Utils/MySQLHelper.pm.old 2008-07-22 12:25:31.000000000 +0100 -+++ Slim/Utils/MySQLHelper.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -152,7 +152,7 @@ - - # Because we use the system MySQL, we need to point to the right - # directory for the errmsg. files. Default to english. -- if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) { -+ if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) { - - $config{'language'} = '/usr/share/mysql/english'; - } diff --git a/media-sound/squeezecenter/files/filepaths-gentoo.patch b/media-sound/squeezecenter/files/filepaths-gentoo.patch deleted file mode 100644 index c5c00e28f432..000000000000 --- a/media-sound/squeezecenter/files/filepaths-gentoo.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- Slim/Utils/OSDetect.pm.old 2008-07-22 12:25:34.000000000 +0100 -+++ Slim/Utils/OSDetect.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -253,6 +253,58 @@ - warn "dirsFor: Didn't find a match request: [$dir]\n"; - } - -+ } elsif (isGentoo()) { -+ -+ if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL)$/) { -+ -+ push @dirs, "/usr/share/squeezecenter/$dir"; -+ -+ } elsif ($dir =~ /^(?:lib)$/) { -+ -+ push @dirs, "/usr/lib/squeezecenter"; -+ -+ } elsif ($dir eq 'UserPluginRoot') { -+ -+ push @dirs, "/var/lib/squeezecenter"; -+ -+ } elsif ($dir eq 'Plugins') { -+ -+ push @dirs, "/var/lib/squeezecenter/Plugins"; -+ push @dirs, "/usr/lib/" . $Config{'package'} . "/vendor_perl/" . $Config{'version'} . "/Slim/Plugin" -+ -+ } elsif ($dir eq 'strings' || $dir eq 'revision') { -+ -+ push @dirs, "/usr/share/squeezecenter"; -+ -+ } elsif ($dir =~ /^(?:types|convert)$/) { -+ -+ push @dirs, "/etc/squeezecenter"; -+ -+ } elsif ($dir =~ /^(?:prefs)$/) { -+ -+ push @dirs, "/var/lib/squeezecenter/prefs"; -+ -+ } elsif ($dir eq 'log') { -+ -+ push @dirs, "/var/log/squeezecenter"; -+ -+ } elsif ($dir eq 'cache') { -+ -+ push @dirs, "/var/lib/squeezecenter/cache"; -+ -+ } elsif ($dir eq 'MySQL') { -+ -+ # Do nothing - use the depended upon MySQL install. -+ -+ } elsif ($dir =~ /^(?:music|playlists)$/) { -+ -+ push @dirs, ''; -+ -+ } else { -+ -+ warn "dirsFor: Didn't find a match request: [$dir]\n"; -+ } -+ - # Red Hat/Fedora/SUSE RPM specific paths. - } elsif (isRHorSUSE()) { - -@@ -465,6 +517,19 @@ - return isReadyNAS(); - } - -+sub isGentoo { -+ -+ # Initialize -+ my $OS = OS(); -+ my $details = details(); -+ -+ if ($details->{'osName'} eq 'Gentoo') { -+ return 1; -+ } -+ -+ return 0; -+} -+ - sub isRHorSUSE { - - # Initialize -@@ -586,6 +651,10 @@ - - $osDetails{'osName'} = 'Debian'; - -+ } elsif (-f '/etc/gentoo-release') { -+ -+ $osDetails{'osName'} = 'Gentoo'; -+ - } elsif (-f '/etc/redhat_release' || -f '/etc/redhat-release') { - - $osDetails{'osName'} = 'Red Hat'; -@@ -603,7 +672,7 @@ - $osDetails{'osArch'} = $Config{'myarchname'}; - - # package specific addition to @INC to cater for plugin locations -- if (isDebian()) { -+ if (isDebian() || isGentoo()) { - - unshift @INC, '/usr/share/squeezecenter'; - unshift @INC, '/usr/share/squeezecenter/CPAN'; ---- Slim/Music/Import.pm.old 2008-07-22 12:24:32.000000000 +0100 -+++ Slim/Music/Import.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -128,7 +128,7 @@ - - $command = '/usr/libexec/squeezecenter-scanner'; - -- } elsif (Slim::Utils::OSDetect::isDebian()) { -+ } elsif (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isGentoo()) { - - $command = '/usr/sbin/squeezecenter-scanner'; - ---- Slim/bootstrap.pm.old 2008-07-22 12:24:09.000000000 +0100 -+++ Slim/bootstrap.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -97,8 +97,9 @@ - - my @SlimINC = (); - -- if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) { -- # On Debian, RH and SUSE, our CPAN directory is located in the same dir as strings.txt -+ if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) { -+ # On Debian, Gentoo, RH and SUSE, our CPAN directory is located in the -+ # same dir as strings.txt - $libPath = Slim::Utils::OSDetect::dirsFor('strings'); - } - -@@ -125,6 +126,14 @@ - $libPath, - ); - -+ if (Slim::Utils::OSDetect::isGentoo()) { -+ # On Gentoo, the lib directory is located separately to the CPAN -+ # directory as it's not architecture-independent, and make sure we -+ # also look at the separate user plugins directory. -+ push @SlimINC, Slim::Utils::OSDetect::dirsFor('lib'); -+ push @SlimINC, Slim::Utils::OSDetect::dirsFor('UserPluginRoot'); -+ } -+ - $d_startup && printf("Got \@INC containing:\n%s\n\n", join("\n", @INC)); - - # This works like 'use lib' ---- Slim/Utils/MySQLHelper.pm.old 2008-07-22 12:25:31.000000000 +0100 -+++ Slim/Utils/MySQLHelper.pm 2008-07-22 12:27:06.000000000 +0100 -@@ -152,7 +152,7 @@ - - # Because we use the system MySQL, we need to point to the right - # directory for the errmsg. files. Default to english. -- if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) { -+ if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) { - - $config{'language'} = '/usr/share/mysql/english'; - } diff --git a/media-sound/squeezecenter/files/gentoo-filepaths.pm b/media-sound/squeezecenter/files/gentoo-filepaths.pm deleted file mode 100644 index 1a0564b6ad25..000000000000 --- a/media-sound/squeezecenter/files/gentoo-filepaths.pm +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/gentoo-filepaths.pm,v 1.1 2008/12/20 01:24:43 lavajoe Exp $ - -# This file contains a custom OS package to provide information on the -# installation structure on Gentoo. It is based on the Debian OS equivalent -# that is built into SqueezeCenter. - -package Slim::Utils::OS::Custom; - -use strict; -use File::Spec::Functions qw(:ALL); -use FindBin qw($Bin); -use Config; - -use base qw(Slim::Utils::OS::Linux); - -sub initDetails { - my $class = shift; - - $class->{osDetails} = $class->SUPER::initDetails(); - - $class->{osDetails}->{isGentoo} = 1 ; - - # Make sure we can find any CPAN modules packaged with SqueezeCenter. - unshift @INC, '/usr/share/squeezecenter/CPAN'; - - # Make sure plugin files are found. - push @INC, '/var/lib/squeezecenter'; - - return $class->{osDetails}; -} - -=head2 dirsFor( $dir ) - -Return OS Specific directories. - -Argument $dir is a string to indicate which of the SqueezeCenter directories we -need information for. - -=cut - -sub dirsFor { - my ($class, $dir) = @_; - - my @dirs = (); - - if ($dir eq 'oldprefs') { - - push @dirs, $class->SUPER::dirsFor($dir); - - } elsif ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) { - - push @dirs, "/usr/share/squeezecenter/$dir"; - - } elsif ($dir eq 'Plugins') { - - push @dirs, $class->SUPER::dirsFor($dir); - push @dirs, "/var/lib/squeezecenter/Plugins", "/usr/lib/" . $Config{'package'} . "/vendor_perl/" . $Config{'version'} . "/Slim/Plugin"; - - } elsif ($dir =~ /^(?:strings|revision)$/) { - - push @dirs, "/usr/share/squeezecenter"; - - } elsif ($dir eq 'libpath') { - - push @dirs, "/usr/lib/squeezecenter"; - - # Because we use the system MySQL, we need to point to the right - # directory for the errmsg. files. Default to english. - } elsif ($dir eq 'mysql-language') { - - push @dirs, "/usr/share/mysql/english"; - - } elsif ($dir =~ /^(?:types|convert)$/) { - - push @dirs, "/etc/squeezecenter"; - - } elsif ($dir =~ /^(?:prefs)$/) { - - push @dirs, $::prefsdir || "/var/lib/squeezecenter/prefs"; - - } elsif ($dir eq 'log') { - - push @dirs, $::logdir || "/var/log/squeezecenter"; - - } elsif ($dir eq 'cache') { - - push @dirs, $::cachedir || "/var/lib/squeezecenter/cache"; - - } elsif ($dir =~ /^(?:music|playlists)$/) { - - push @dirs, ''; - - } else { - - warn "dirsFor: Didn't find a match request: [$dir]\n"; - } - - return wantarray() ? @dirs : $dirs[0]; -} - -# Bug 9488, always decode on Ubuntu/Debian -sub decodeExternalHelperPath { - return Slim::Utils::Unicode::utf8decode_locale($_[1]); -} - -sub scanner { - return '/usr/sbin/squeezecenter-scanner'; -} - - -1; - - - - -1; - -__END__ diff --git a/media-sound/squeezecenter/files/mDNSResponder-7.1-gentoo.patch b/media-sound/squeezecenter/files/mDNSResponder-7.1-gentoo.patch deleted file mode 100644 index 8a3559ed1ee8..000000000000 --- a/media-sound/squeezecenter/files/mDNSResponder-7.1-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Slim/Networking/mDNS.pm.old 2008-07-22 12:25:06.000000000 +0100 -+++ Slim/Networking/mDNS.pm 2008-07-22 12:26:38.000000000 +0100 -@@ -131,11 +131,10 @@ - - my ($name, $port) = @$data; - -+ print CONF "\n"; - print CONF "$name\n"; - print CONF "$service\n"; -- print CONF "TXT\n"; - print CONF "$port\n"; -- print CONF "\n"; - } - - close(CONF); diff --git a/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch b/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch deleted file mode 100644 index daa2a4ea8bb8..000000000000 --- a/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Slim/Networking/mDNS.pm.old 2008-10-27 08:09:02.000000000 +0000 -+++ Slim/Networking/mDNS.pm 2008-10-27 08:09:02.000000000 +0000 -@@ -131,11 +131,10 @@ - - my ($name, $port) = @$data; - -+ print CONF "\n"; - print CONF "$name\n"; - print CONF "$service\n"; -- print CONF "TXT\n"; - print CONF "$port\n"; -- print CONF "\n"; - } - - close(CONF); diff --git a/media-sound/squeezecenter/files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch deleted file mode 100644 index 0055b1a49fd8..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- Bin/build-perl-modules.pl.old 2008-11-18 19:07:45.000000000 +0000 -+++ Bin/build-perl-modules.pl 2008-11-18 19:42:04.000000000 +0000 -@@ -21,13 +21,11 @@ - - # 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.2'; - my $dlext = $Config{'dlext'}; - - # The list of all the packages needed. - my %packages = ( - 'Class::XSAccessor::Array' => 'Class-XSAccessor-Array-0.05.tar.gz', -- 'Class::C3::XS' => 'Class-C3-XS-0.08.tar.gz', - 'Compress::Zlib' => 'Compress-Zlib-1.41.tar.gz', - 'DBI' => 'DBI-1.604.tar.gz', - 'DBD::mysql' => 'DBD-mysql-3.0002.tar.gz', -@@ -197,36 +195,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; diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.0-build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.0-build-perl-modules-gentoo.patch deleted file mode 100644 index 6ae452f8604d..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.0-build-perl-modules-gentoo.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- Bin/build-perl-modules.pl.old 2008-11-18 19:07:45.000000000 +0000 -+++ Bin/build-perl-modules.pl 2008-11-18 19:42:04.000000000 +0000 -@@ -21,13 +21,11 @@ - - # 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', -- 'Class::C3::XS' => 'Class-C3-XS-0.08.tar.gz', - 'Compress::Zlib' => 'Compress-Zlib-1.41.tar.gz', - 'DBI' => 'DBI-1.604.tar.gz', - 'DBD::mysql' => 'DBD-mysql-3.0002.tar.gz', -@@ -197,36 +195,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; diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.1-aac-transcode-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.1-aac-transcode-gentoo.patch deleted file mode 100644 index 75d9f7f38de1..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.1-aac-transcode-gentoo.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- convert.conf.old 2009-01-17 14:33:33.000000000 +0000 -+++ convert.conf 2009-01-17 15:04:25.000000000 +0000 -@@ -74,8 +74,8 @@ - # specific combinations match before wildcards - - mov mp3 * * -- # FRB:{BITRATE=-B %B} -- [mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - - -+ # FB:{BITRATE=-B %B} -+ [faad] -q -w -f 2 $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ $BITRATE$ -x -r - - - - alc mp3 * * - # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} -@@ -158,9 +158,13 @@ - [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 +202,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 diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.1-build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.1-build-perl-modules-gentoo.patch deleted file mode 100644 index 37de856422d6..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.1-build-perl-modules-gentoo.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- 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; diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.1-json-xs-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.1-json-xs-gentoo.patch deleted file mode 100644 index a1c4e080614a..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.1-json-xs-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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); diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch deleted file mode 100644 index 8500e3d57071..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch deleted file mode 100644 index 37de856422d6..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- 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; diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.2-json-xs-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.2-json-xs-gentoo.patch deleted file mode 100644 index a1c4e080614a..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.2-json-xs-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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); diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch deleted file mode 100644 index 1b9ae030201c..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Slim/Formats/XML.pm.old 2009-03-23 20:59:53.000000000 +0000 -+++ Slim/Formats/XML.pm 2009-03-23 21:00:02.000000000 +0000 -@@ -13,7 +13,7 @@ - use strict; - use File::Slurp; - use HTML::Entities; --use JSON::XS qw(from_json); -+use JSON::XS::VersionOneAndTwo; - use Scalar::Util qw(weaken); - use URI::Escape qw(uri_escape); - use XML::Simple; ---- Slim/Plugin/LastFM/ProtocolHandler.pm.old 2009-03-23 20:54:42.000000000 +0000 -+++ Slim/Plugin/LastFM/ProtocolHandler.pm 2009-03-23 20:55:15.000000000 +0000 -@@ -7,7 +7,7 @@ - use strict; - use base qw(Slim::Player::Protocols::HTTP); - --use JSON::XS qw(from_json); -+use JSON::XS::VersionOneAndTwo; - use URI::Escape qw(uri_escape_utf8); - - use Slim::Player::Playlist; ---- Slim/Plugin/Sirius/ProtocolHandler.pm.old 2009-03-23 20:55:21.000000000 +0000 -+++ Slim/Plugin/Sirius/ProtocolHandler.pm 2009-03-23 20:55:34.000000000 +0000 -@@ -19,7 +19,7 @@ - use Slim::Utils::Timers; - - use HTTP::Request; --use JSON::XS qw(from_json); -+use JSON::XS::VersionOneAndTwo; - use URI::Escape qw(uri_escape); - - my $log = Slim::Utils::Log->addLogCategory( { diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-aac-transcode-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-aac-transcode-gentoo.patch deleted file mode 100644 index de0f6bd2e1e8..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-aac-transcode-gentoo.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- convert.conf.old 2009-06-17 10:48:13.000000000 +0100 -+++ convert.conf 2009-06-17 10:48:13.000000000 +0100 -@@ -82,8 +82,8 @@ - [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - - - 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} -@@ -173,9 +173,9 @@ - # IF - [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ - --mov aif * * -- # FR -- [mov123] $FILE$ -+mov wav * * -+ # F -+ [faad] -q -w -f 2 $FILE$ - - wma wma * * - - -@@ -221,8 +221,8 @@ - [faad] -q -w -f 1 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes - - - 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 diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-build-perl-modules-gentoo.patch deleted file mode 100644 index b40f1fcb6e90..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-build-perl-modules-gentoo.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- Bin/build-perl-modules.pl.old 2009-06-17 10:48:13.513324795 +0100 -+++ Bin/build-perl-modules.pl 2009-05-26 12:37:27.147159782 +0100 -@@ -21,25 +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', -- 'GD' => 'GD-2.35.tar.gz', - ); - - # Don't need Class::C3::XS if you're running 5.10 -@@ -197,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 2009-06-17 10:48:13.000000000 +0100 -+++ Slim/bootstrap.pm 2009-06-17 10:48:13.581149121 +0100 -@@ -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; diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-json-xs-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-json-xs-gentoo.patch deleted file mode 100644 index 507f1580e421..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-json-xs-gentoo.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Slim/Formats/XML.pm.old 2009-03-23 20:59:53.000000000 +0000 -+++ Slim/Formats/XML.pm 2009-06-17 10:48:13.000000000 +0100 -@@ -13,7 +13,7 @@ - use strict; - use File::Slurp; - use HTML::Entities; --use JSON::XS qw(from_json); -+use JSON::XS::VersionOneAndTwo; - use Scalar::Util qw(weaken); - use URI::Escape qw(uri_escape); - use XML::Simple; ---- Slim/Plugin/LastFM/ProtocolHandler.pm.old 2009-03-23 21:44:12.045581972 +0000 -+++ Slim/Plugin/LastFM/ProtocolHandler.pm 2009-06-17 10:48:13.000000000 +0100 -@@ -7,7 +7,7 @@ - use strict; - use base qw(Slim::Player::Protocols::HTTP); - --use JSON::XS qw(from_json); -+use JSON::XS::VersionOneAndTwo; - use URI::Escape qw(uri_escape_utf8); - - use Slim::Player::Playlist; ---- Slim/Plugin/Sirius/ProtocolHandler.pm.old 2009-03-23 21:44:12.000000000 +0000 -+++ Slim/Plugin/Sirius/ProtocolHandler.pm 2009-06-17 10:48:13.547934811 +0100 -@@ -19,7 +19,7 @@ - use Slim::Utils::Timers; - - use HTTP::Request; --use JSON::XS qw(from_json); -+use JSON::XS::VersionOneAndTwo; - use URI::Escape qw(uri_escape); - - my $log = Slim::Utils::Log->addLogCategory( { diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-mDNSResponder-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-mDNSResponder-gentoo.patch deleted file mode 100644 index 6cb5739c37f5..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-mDNSResponder-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Slim/Networking/mDNS.pm.old 2009-03-10 21:09:33.000000000 +0000 -+++ Slim/Networking/mDNS.pm 2009-03-10 21:09:33.000000000 +0000 -@@ -131,11 +131,10 @@ - - my ($name, $port) = @$data; - -+ print CONF "\n"; - print CONF "$name\n"; - print CONF "$service\n"; -- print CONF "TXT\n"; - print CONF "$port\n"; -- print CONF "\n"; - } - - close(CONF); diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-r1-aac-transcode-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-r1-aac-transcode-gentoo.patch deleted file mode 100644 index 97cadbc27b90..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-r1-aac-transcode-gentoo.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- convert.conf.old 2009-06-26 19:51:50.000000000 +0100 -+++ convert.conf 2009-07-10 08:30:31.000000000 +0100 -@@ -75,15 +75,15 @@ - - mp4 mp3 * * - # FB:{BITRATE=-B %B} -- [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 | [lame] --silent -q $QUALITY$ $BITRATE - - - - aac mp3 * * - # IFB:{BITRATE=-B %B} -- [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 | [lame] --silent -q $QUALITY$ $BITRATE - - - - 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} -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - - - - alc mp3 * * - # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} -@@ -167,15 +167,15 @@ - - mp4 wav * * - # F -- [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 - - aac wav * * - # IF -- [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 - --mov aif * * -- # FR -- [mov123] $FILE$ -+mov wav * * -+ # F -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 - - wma wma * * - - -@@ -214,15 +214,15 @@ - - mp4 flc * * - # F -- [faad] -q -w -f 1 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes - -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes - - - aac flc * * - # IF -- [faad] -q -w -f 1 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes - -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes - - - mov flc * * -- # FR -- [mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 - -+ # F -+ [mplayer] -novideo -ao pcm:file=/dev/fd/4 $FILE$ 4>&1 1>/dev/null 2>&1 | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 - - - alc flc * * - # F diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave-2.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave-2.patch deleted file mode 100644 index 934aa5c836bf..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: Slim/Player/SqueezeSlave.pm -=================================================================== ---- Slim/Player/SqueezeSlave.pm (revision 26719) -+++ Slim/Player/SqueezeSlave.pm (revision 26720) -@@ -102,6 +102,7 @@ - ); - - sub dBToFixed { -+ my $client = shift; - my $db = shift; - - # Map a floating point dB value to a 16.16 fixed point value to -@@ -147,7 +148,7 @@ - # With new style volume, let's try -49.5dB as the lowest - # value. - my $db = ($volume - 100)/2; -- $newGain = dBToFixed($db); -+ $newGain = $client->dBToFixed($db); - } - - my $data = pack('NNCCNN', $oldGain, $oldGain, $prefs->client($client)->get('digitalVolumeControl'), $preamp, $newGain, $newGain); -@@ -203,6 +204,9 @@ - sub hasDigitalOut { - return 0; - } -+sub hasPowerControl { -+ return 0; -+} - - sub pcm_sample_rates { - my $client = shift; diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave-3.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave-3.patch deleted file mode 100644 index 3634fd3a3079..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave-3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Slim/Player/SqueezeSlave.pm -=================================================================== ---- Slim/Player/SqueezeSlave.pm (revision 25815) -+++ Slim/Player/SqueezeSlave.pm (revision 25816) -@@ -133,7 +133,7 @@ - my $newvolume = shift; - - my $volume = $client->Slim::Player::Client::volume($newvolume, @_); -- my $preamp = 255 - int(2 * $prefs->client($client)->get('preampVolumeControl')); -+ my $preamp = 255 - int(2 * ($prefs->client($client)->get('preampVolumeControl') || 0)); - - if (defined($newvolume)) { - # Old style volume: diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave.patch deleted file mode 100644 index 3ade990a358e..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter-7.3.3-squeezeslave.patch +++ /dev/null @@ -1,514 +0,0 @@ -Index: Slim/Networking/Slimproto.pm -=================================================================== ---- Slim/Networking/Slimproto.pm (revision 25808) -+++ Slim/Networking/Slimproto.pm (revision 25809) -@@ -1081,7 +1081,7 @@ - } elsif ($deviceids[$deviceid] eq 'squeezeslave') { - - $client_class = 'Slim::Player::SqueezeSlave'; -- $display_class = 'Slim::Display::NoDisplay'; -+ $display_class = 'Slim::Display::Text'; - - } elsif ($deviceids[$deviceid] eq 'squeezeplay' || $deviceids[$deviceid] eq 'controller') { - -Index: Slim/Player/SqueezeSlave.pm -=================================================================== ---- Slim/Player/SqueezeSlave.pm (revision 25808) -+++ Slim/Player/SqueezeSlave.pm (revision 25809) -@@ -36,22 +36,9 @@ - our $defaultPrefs = { - 'replayGainMode' => 0, - 'minSyncAdjust' => 30, # ms -+ 'maxBitrate' => 0, # no bitrate limiting - }; - --# Keep track of direct stream redirects --our $redirects = {}; -- -- --sub new { -- my $class = shift; -- -- my $client = $class->SUPER::new(@_); -- -- bless $client, $class; -- -- return $client; --} -- - sub initPrefs { - my $client = shift; - -@@ -74,7 +61,7 @@ - - sub modelName { 'Squeezeslave' } - --sub hasIR { return 0; } -+sub hasIR { 1 } - - # in order of preference based on whether we're connected via wired or wireless... - sub formats { -@@ -130,6 +117,17 @@ - } - } - -+sub canDoReplayGain { -+ my $client = shift; -+ my $replay_gain = shift; -+ -+ if (defined($replay_gain)) { -+ return $client->dBToFixed($replay_gain); -+ } -+ -+ return 0; -+} -+ - sub volume { - my $client = shift; - my $newvolume = shift; -@@ -304,4 +302,28 @@ - } - - -+# We need to implement this to allow us to receive SETD commands -+# and we need SETD to support custom display widths -+sub directBodyFrame { -+ return 1; -+} -+ -+# Allow the player to define it's display width -+sub playerSettingsFrame { -+ my $client = shift; -+ my $data_ref = shift; -+ -+ my $value; -+ my $id = unpack('C', $$data_ref); -+ -+ # New SETD command 0xfe for display width -+ if ($id == 0xfe) { -+ $value = (unpack('CC', $$data_ref))[1]; -+ if ($value > 10 && $value < 200) { -+ $client->display->widthOverride(1, $value); -+ $client->update; -+ } -+ } -+} -+ - 1; -Index: Slim/Display/Text.pm -=================================================================== ---- Slim/Display/Text.pm (revision 25808) -+++ Slim/Display/Text.pm (revision 25809) -@@ -14,8 +14,8 @@ - =head1 DESCRIPTION - - L<Slim::Display::Text> -- Display code for text (character) based displays: Slimp3, SB1 -- - 40 character x 2 lines -+ Display code for text (character) based displays: Slimp3, SB1, squeezeslave -+ - 40 (or client controlled) character x 2 lines - - server side animation - - =cut -@@ -33,6 +33,8 @@ - my $scroll_pad_scroll = 6; # chars of padding between scrolling text - my $scroll_pad_ticker = 8; # chars of padding in ticker mode - -+my $defaultWidth = 40; # default character width of display (unless client tells us otherwise) -+ - our $defaultPrefs = { - 'doublesize' => 0, - 'offDisplaySize' => 0, -@@ -44,34 +46,7 @@ - 'playingDisplayModes' => [0..5] - }; - --# Display Modes - --my @modes = ( -- # mode 0 -- { desc => ['BLANK'], -- bar => 0, secs => 0, width => 40, }, -- # mode 1 -- { desc => ['ELAPSED'], -- bar => 0, secs => 1, width => 40, }, -- # mode 2 -- { desc => ['REMAINING'], -- bar => 0, secs => -1, width => 40, }, -- # mode 3 -- { desc => ['PROGRESS_BAR'], -- bar => 1, secs => 0, width => 40, }, -- # mode 4 -- { desc => ['ELAPSED', 'AND', 'PROGRESS_BAR'], -- bar => 1, secs => 1, width => 40, }, -- # mode 5 -- { desc => ['REMAINING', 'AND', 'PROGRESS_BAR'], -- bar => 1, secs => -1, width => 40, }, -- # mode 6 -- { desc => ['SETUP_SHOWBUFFERFULLNESS'], -- bar => 1, secs => 0, width => 40, fullness => 1, }, --); -- --my $nmodes = $#modes; -- - sub initPrefs { - my $display = shift; - -@@ -101,7 +76,8 @@ - } - - sub displayWidth { -- return 40; -+ my $display = shift; -+ return $display->widthOverride || $defaultWidth; - } - - sub vfdmodel { -@@ -109,7 +85,6 @@ - my $client = $display->client; - - if ($client->isa('Slim::Player::SLIMP3')) { -- - if ($client->revision >= 2.2) { - my $mac = $client->macaddress(); - if ($mac eq '00:04:20:03:04:e0') { -@@ -124,7 +99,8 @@ - } else { - return 'noritake-katakana'; - } -- -+ } elsif ($client->isa('Slim::Player::SqueezeSlave')) { -+ return 'squeezeslave'; - } else { - # Squeezebox 1 - return 'noritake-european'; -@@ -198,11 +174,11 @@ - $sc->{newscroll} = 0; - $sc->{present} = 1; - -- # force initialisation of cache if size = 0 (used to init cache) -- if ($sc->{ssize} != 40) { -- $sc->{ssize} = 40; -+ # force (re)initialisation of cache if size changed -+ if ($sc->{ssize} != $display->displayWidth) { - $sc->{double} = 0; - $sc->{changed} = 1; -+ $sc->{ssize} = $display->displayWidth; - } - - # check display hash for text size definitions -@@ -232,12 +208,13 @@ - if ($sc->{changed}) { - foreach my $l (0..1) { - $sc->{line}[$l] = undef; $sc->{linetext}[$l] = ''; $sc->{linefinish}[$l] = 0; -- $sc->{overlay}[$l] = undef; $sc->{overlaytext}[$l] = ''; $sc->{overlaystart}[$l] = 40; -+ $sc->{overlay}[$l] = undef; $sc->{overlaytext}[$l] = ''; $sc->{overlaystart}[$l] = $display->displayWidth; - $sc->{center}[$l] = undef; $sc->{centertext}[$l] = ''; - } - $sc->{scroll} = 0; - $sc->{scrollline} = undef; - } -+ - if (!$scroll) { - $sc->{scroll} = 0; - $sc->{scrollline} = undef; -@@ -298,17 +275,17 @@ - } else { - $sc->{overlaytext}[$l] = ''; - } -- if (lineLength($sc->{overlaytext}[$l]) > 40 ) { -- $sc->{overlaytext}[$l] = subString($sc->{overlaytext}[$l], 0, 40); -- $sc->{overlaystart}[$l] = 40; -+ if (lineLength($sc->{overlaytext}[$l]) > $display->displayWidth ) { -+ $sc->{overlaytext}[$l] = subString($sc->{overlaytext}[$l], 0, $display->displayWidth); -+ $sc->{overlaystart}[$l] = $display->displayWidth; - } else { -- $sc->{overlaystart}[$l] = 40 - lineLength($sc->{overlaytext}[$l]); -+ $sc->{overlaystart}[$l] = $display->displayWidth - lineLength($sc->{overlaytext}[$l]); - } - $sc->{changed} = 1; - } elsif (!defined($screen->{overlay}[$l]) && defined($sc->{overlay}[$l])) { - $sc->{overlay}[$l] = undef; - $sc->{overlaytext}[$l] = ''; -- $sc->{overlaystart}[$l] = 40; -+ $sc->{overlaystart}[$l] = $display->displayWidth; - $sc->{changed} = 1; - } - } -@@ -320,22 +297,22 @@ - $sc->{center}[$l] = $screen->{center}[$l]; - next if ($double && $l == 0); - if (!$double) { -- my $len = lineLength($sc->{center}[$l]); -- if ($len < 39) { -- $sc->{centertext}[$l] = ' ' x ((40 - $len)/2) . $screen->{center}[$l] . -- ' ' x (40 - $len - int((40 - $len)/2)); -+ my $len = lineLength($screen->{center}[$l]); -+ if ($len < $display->displayWidth - 1) { -+ $sc->{centertext}[$l] = ' ' x (($display->displayWidth - $len)/2) . $screen->{center}[$l] . -+ ' ' x ($display->displayWidth - $len - int(($display->displayWidth - $len)/2)); - } else { -- $sc->{centertext}[$l] = subString($sc->{center}[$l] . ' ', 0 ,40); -+ $sc->{centertext}[$l] = subString($screen->{center}[$l] . ' ', 0, $display->displayWidth); - } - } else { - my ($center1, $center2) = Slim::Display::Lib::TextVFD::doubleSize($client,$screen->{center}[1]); - my $len = lineLength($center1); -- if ($len < 39) { -- $sc->{centertext}[0] = ' ' x ((40 - $len)/2) . $center1 . ' ' x (40 - $len - int((40 - $len)/2)); -- $sc->{centertext}[1] = ' ' x ((40 - $len)/2) . $center2 . ' ' x (40 - $len - int((40 - $len)/2)); -+ if ($len < $display->displayWidth - 1) { -+ $sc->{centertext}[0] = ' ' x (($display->displayWidth - $len)/2) . $center1 . ' ' x ($display->displayWidth - $len - int(($display->displayWidth - $len)/2)); -+ $sc->{centertext}[1] = ' ' x (($display->displayWidth - $len)/2) . $center2 . ' ' x ($display->displayWidth - $len - int(($display->displayWidth - $len)/2)); - } else { -- $sc->{centertext}[0] = subString($center1 . ' ', 0 ,40); -- $sc->{centertext}[1] = subString($center2 . ' ', 0 ,40); -+ $sc->{centertext}[0] = subString($center1 . ' ', 0 ,$display->displayWidth); -+ $sc->{centertext}[1] = subString($center2 . ' ', 0 ,$display->displayWidth); - } - } - $sc->{changed} = 1; -@@ -426,11 +403,11 @@ - $sc->{scrollstart} = 0; - if ($scroll == 1) { - # normal wrapped text scrolling -- $scrolltext .= ' ' x $scroll_pad_scroll . subString($scrolltext, 0, 40); -+ $scrolltext .= ' ' x $scroll_pad_scroll . subString($scrolltext, 0, $display->displayWidth); - $sc->{scrollend} = $sc->{linefinish}[$l] + $scroll_pad_scroll; - } else { - # don't wrap text - scroll to end only -- $sc->{scrollend} = $sc->{linefinish}[$l] - 40; -+ $sc->{scrollend} = $sc->{linefinish}[$l] - $display->displayWidth; - } - - if (!$double || $l == 0) { -@@ -472,7 +449,7 @@ - my $line2 = $$line2start . $$line2end; - - $display->killAnimation(); -- $display->pushUpdate([\$line1, \$line2, 0, 5, 40, 0.02]); -+ $display->pushUpdate([\$line1, \$line2, 0, 4, $display->displayWidth, 0.02]); - } - - sub pushRight { -@@ -489,7 +466,7 @@ - my $line2 = $$line2end . $$line2start; - - $display->killAnimation(); -- $display->pushUpdate([\$line1, \$line2, 40, -5, 0, 0.02]); -+ $display->pushUpdate([\$line1, \$line2, $display->displayWidth, -4, 0, 0.02]); - } - - sub pushUp { -@@ -536,9 +513,12 @@ - my ($line1, $line2, $offset, $delta, $end, $deltatime) = @$params; - - $offset += $delta; -+ # With custom widths, offset may not be a factor of the width, so fix up to avoid problems! -+ $offset=$end if ($delta > 0 && $offset > $end); -+ $offset=$end if ($delta < 0 && $offset < $end); - -- my $screenline1 = subString($$line1, $offset, 40); -- my $screenline2 = subString($$line2, $offset, 40); -+ my $screenline1 = subString($$line1, $offset, $display->displayWidth); -+ my $screenline2 = subString($$line2, $offset, $display->displayWidth); - - Slim::Display::Lib::TextVFD::vfdUpdate($display->client, $screenline1, $screenline2); - -@@ -556,7 +536,7 @@ - - my $render = $display->render($display->renderCache()); - my $line1 = ${$render->{screen1}->{lineref}[1]}; -- my $line2 = ' ' x 40; -+ my $line2 = ' ' x $display->displayWidth; - - Slim::Display::Lib::TextVFD::vfdUpdate($display->client, $line1, $line2); - -@@ -569,7 +549,7 @@ - my $display = shift; - - my $render = $display->render($display->renderCache()); -- my $line1 = ' ' x 40; -+ my $line1 = ' ' x $display->displayWidth; - my $line2 = ${$render->{screen1}->{lineref}[0]}; - - Slim::Display::Lib::TextVFD::vfdUpdate($display->client, $line1, $line2); -@@ -598,12 +578,37 @@ - } - - sub modes { -+ my $display = shift; -+ # Display Modes -+ -+ my @modes = ( -+ # mode 0 -+ { desc => ['BLANK'], -+ bar => 0, secs => 0, width => $display->displayWidth, }, -+ # mode 1 -+ { desc => ['ELAPSED'], -+ bar => 0, secs => 1, width => $display->displayWidth, }, -+ # mode 2 -+ { desc => ['REMAINING'], -+ bar => 0, secs => -1, width => $display->displayWidth, }, -+ # mode 3 -+ { desc => ['PROGRESS_BAR'], -+ bar => 1, secs => 0, width => $display->displayWidth, }, -+ # mode 4 -+ { desc => ['ELAPSED', 'AND', 'PROGRESS_BAR'], -+ bar => 1, secs => 1, width => $display->displayWidth, }, -+ # mode 5 -+ { desc => ['REMAINING', 'AND', 'PROGRESS_BAR'], -+ bar => 1, secs => -1, width => $display->displayWidth, }, -+ # mode 6 -+ { desc => ['SETUP_SHOWBUFFERFULLNESS'], -+ bar => 1, secs => 0, width => $display->displayWidth, fullness => 1, }, -+ ); -+ - return \@modes; - } - --sub nmodes { -- return $nmodes; --} -+sub nmodes { 6 } - - sub scrollUpdateDisplay { - # update scrolling for character display -@@ -637,11 +642,11 @@ - } else { - # both lines scrolling - if ($padlen) { -- $line1 = subString(${$scroll->{scrollline1ref}} . $pad, $scroll->{offset}, 40); -- $line2 = subString(${$scroll->{scrollline2ref}} . $pad, $scroll->{offset}, 40); -+ $line1 = subString(${$scroll->{scrollline1ref}} . $pad, $scroll->{offset}, $display->displayWidth); -+ $line2 = subString(${$scroll->{scrollline2ref}} . $pad, $scroll->{offset}, $display->displayWidth); - } else { -- $line1 = subString(${$scroll->{scrollline1ref}}, $scroll->{offset}, 40); -- $line2 = subString(${$scroll->{scrollline2ref}}, $scroll->{offset}, 40); -+ $line1 = subString(${$scroll->{scrollline1ref}}, $scroll->{offset}, $display->displayWidth); -+ $line2 = subString(${$scroll->{scrollline2ref}}, $scroll->{offset}, $display->displayWidth); - } - } - -Index: Slim/Display/Lib/TextVFD.pm -=================================================================== ---- Slim/Display/Lib/TextVFD.pm (revision 25808) -+++ Slim/Display/Lib/TextVFD.pm (revision 25809) -@@ -66,7 +66,6 @@ - - my $vfdReset = $vfdCodeCmd . $vfdCommand{"INCSC"} . $vfdCodeCmd . $vfdCommand{"HOME"}; - --my $spaces = ' ' x 40; - - my %symbolmap = ( - 'katakana' => { -@@ -86,6 +85,13 @@ - 'rightarrow' => chr(0x7e), - 'hardspace' => chr(0x20), - 'solidblock' => chr(0x1f), -+ }, -+ 'squeezeslave' => { # These are from an Imon VFD, but squeezeslave can remap for other types -+ 'rightarrow' => chr(0x10), -+ 'hardspace' => chr(0x20), -+ 'solidblock' => chr(0x0B), -+ 'notesymbol' => chr(0x91), -+ 'bell' => chr(0x98), - } - ); - -@@ -121,6 +127,21 @@ - 'Zbottom' => '/', - 'leftvbar' => '|', - 'rightvbar' => '|', -+ 'rightprogress0' => ']', -+ 'rightprogress1' => ']', -+ 'rightprogress2' => ']', -+ 'rightprogress3' => ']', -+ 'rightprogress4' => ']', -+ 'leftprogress0' => '[', -+ 'leftprogress1' => '[', -+ 'leftprogress2' => '[', -+ 'leftprogress3' => '[', -+ 'leftprogress4' => '[', -+ 'middleprogress0' => ' ', -+ 'middleprogress1' => '.', -+ 'middleprogress2' => ':', -+ 'middleprogress3' => '!', -+ 'middleprogress4' => '|', - ); - - sub vfdUpdate { -@@ -133,6 +154,9 @@ - my $cur = -1; - my $pos; - -+ my $displaywidth = $client->display->displayWidth; -+ my $spaces = ' ' x $displaywidth; -+ - # convert to the VFD char set - my $lang = $client->vfdmodel; - if (!$lang) { -@@ -225,8 +249,10 @@ - - my $encodedCustom = "\x1F" . $custom . "\x1F"; - -- if ($usedCustom < 8) { # Room to add this one -+ my $maxCustom = $lang eq "squeezeslave" ? 0 : 8; # squeezeslave doesn't allow any custom character definitions - -+ if ($usedCustom < $maxCustom) { # Room to add this one -+ - while(defined $customUsed{$nextChr}) { - - $nextChr = chr(ord($nextChr)+1); -@@ -266,7 +292,6 @@ - delete $newCustom{$custom}; - } - } -- - if ($lang eq 'european') { - # why can't we all just get along? - $line =~ tr{\x1f\x92\xa1\xa2\xa3\xa4\xa5\xa6\xa8\xa9\xab\xad\xaf \xbb\xbf \xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf \xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf \xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef \xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff} -@@ -275,8 +300,9 @@ - # translate iso8859-1 to vfd charset - $line =~ tr{\x1f\x92\x0e\x0f\x5c\x70\x7e\x7f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff} - {\xff\x27\x19\x7e\x8c\xf0\x8e\x8f\x20\x98\xec\x92\xeb\x5c\x98\x8f\xde\x63\x61\x3c\xa3\x2d\x72\xb0\xdf\xb7\x32\x33\x60\xe4\xf1\x94\x2c\x31\xdf\x3e\x25\x25\x25\x3f\x81\x81\x82\x82\x80\x81\x90\x99\x45\x45\x45\x45\x49\x49\x49\x49\x44\xee\x4f\x4f\x4f\x4f\x86\x78\x30\x55\x55\x55\x8a\x59\x70\xe2\x84\x83\x84\x84\xe1\x84\x91\x99\x65\x65\x65\x65\x69\x69\x69\x69\x95\xee\x6f\x6f\x6f\x6f\xef\xfd\x88\x75\x75\x75\xf5\x79\xf0\x79}; -- } elsif ($lang eq 'latin1') { -+ } elsif (($lang eq 'latin1') || ($lang eq 'squeezeslave')) { - # golly, the latin1 character map _is_ latin1. Also, translate funky windows apostrophes to legal ones. -+ # squeezeslave uses latin1 too - $line =~ tr{\x92} - {\x26}; - }; -@@ -287,9 +313,10 @@ - my $vfdmodel = $client->vfdmodel(); - - # force the display out of 4 bit mode if it got there somehow, then set the brightness -+ # not used for Squeezeslave - if ( $vfdmodel =~ 'futaba') { - $vfddata .= $vfdCodeCmd . $vfdBrightFutaba[$brightness]; -- } else { -+ } elsif ( $vfdmodel ne 'squeezeslave') { - $vfddata .= $noritakeBrightPrelude . $vfdBright[$brightness]; - } - -@@ -310,17 +337,17 @@ - $line =~ s/(.)/$vfdCodeChar$1/gos; - - # split the line in two and move the cursor to the second line -- $line = substr($line, 0, 80) . $vfdCodeCmd . $vfdCommand{"HOME2"} . substr($line, 80); -+ $line = substr($line, 0, 2 * $displaywidth) . $vfdCodeCmd . $vfdCommand{"HOME2"} . substr($line, 2 * $displaywidth); - - $vfddata .= $line; - - # set the cursor - if ($cur >= 0) { - -- if ($cur < 40) { -+ if ($cur < $displaywidth) { - $vfddata .= $vfdCodeCmd.(pack 'C', (0b10000000 + $cur)); - } else { -- $vfddata .= $vfdCodeCmd.(pack 'C', (0b11000000 + $cur - 40)); -+ $vfddata .= $vfdCodeCmd.(pack 'C', (0b11000000 + $cur - $displaywidth)); - } - - # turn on the cursor diff --git a/media-sound/squeezecenter/files/squeezecenter.conf.d b/media-sound/squeezecenter/files/squeezecenter.conf.d deleted file mode 100644 index 4faca2bf422d..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter.conf.d +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/conf.d/squeezecenter - -# Niceness level for the SqueezeCenter process. If not specified then the -# default is to run at standard priority. Uncomment the following to run at a -# high priority (in order to try to minimise drop-outs due to audio starvation -# of the players). Note that this requires "OpenRC", which will become the -# standard init system for Gentoo at some point. If you are not using OpenRC -# yet, this setting will have no effect: -#SC_NICENESS=-10 - -# Default path of your music library and playlists. You can leave these -# undefined and configure them through the web interface instead. -#SC_MUSIC_DIR=/mnt/media/Music -#SC_PLAYLISTS_DIR=/mnt/media/Playlists - -# The following contains any other options you want to specify, such as default -# logging options. The example below will prevent the discovery and display of -# UPnP devices within your players. -# -# See "squeezecenter-server --help" for a full list of possible options, -# but note that many of them are supplied by /etc/init.d/squeezecenter -# and so don't need to be present here. -#SC_OPTS="--noupnp" diff --git a/media-sound/squeezecenter/files/squeezecenter.init.d b/media-sound/squeezecenter/files/squeezecenter.init.d deleted file mode 100755 index 7082830bcb86..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter.init.d +++ /dev/null @@ -1,50 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.init.d,v 1.3 2008/12/20 01:24:43 lavajoe Exp $ - -# These fit the SqueezeCenter ebuild and so shouldn't need to be changed; -# user-servicable parts go in /etc/conf.d/squeezecenter. -pidfile=/var/run/squeezecenter/squeezecenter.pid -logdir=/var/log/squeezecenter -varlibdir=/var/lib/squeezecenter -prefsdir=${varlibdir}/prefs -cachedir=${varlibdir}/cache -prefsfile=${prefsdir}/squeezecenter.prefs -scuser=squeezecenter -scname=squeezecenter-server - -depend() { - need net mysql -} - -start() { - ebegin "Starting SqueezeCenter" - - export SSD_NICELEVEL=${SC_NICENESS} - cd / - start-stop-daemon \ - --start --exec /usr/bin/perl /usr/sbin/${scname} \ - --pidfile ${pidfile} \ - --startas /usr/sbin/${scname} \ - --chuid ${scuser} \ - -- \ - --quiet --daemon \ - --pidfile=${pidfile} \ - --cachedir=${cachedir} \ - --prefsfile=${prefsfile} \ - --prefsdir=${prefsdir} \ - --logdir=${logdir} \ - --audiodir=${SC_MUSIC_DIR} \ - --playlistdir=${SC_PLAYLISTS_DIR} \ - ${SC_OPTS} - - - eend $? "Failed to start SqueezeCenter" -} - -stop() { - ebegin "Stopping SqueezeCenter" - start-stop-daemon -o --stop --pidfile ${pidfile} - eend $? "Failed to stop SqueezeCenter" -} diff --git a/media-sound/squeezecenter/files/squeezecenter.logrotate.d b/media-sound/squeezecenter/files/squeezecenter.logrotate.d deleted file mode 100644 index 8ef9c789e4e9..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter.logrotate.d +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.logrotate.d,v 1.1 2008/08/03 04:35:29 lavajoe Exp $ - -/var/log/squeezecenter/scanner.log /var/log/squeezecenter/server.log /var/log/squeezecenter/perfmon.log { - missingok - notifempty - copytruncate - rotate 5 - size 100k -} diff --git a/media-sound/squeezecenter/files/squeezecenter.prefs b/media-sound/squeezecenter/files/squeezecenter.prefs deleted file mode 100644 index a14b3fab8375..000000000000 --- a/media-sound/squeezecenter/files/squeezecenter.prefs +++ /dev/null @@ -1,3 +0,0 @@ -dbusername: squeezecenter -dbpassword: TBA -dbsource: dbi:mysql:database=squeezecenter;mysql_socket=/var/run/mysqld/mysqld.sock |