patch_dest/squeezecenter-7.3.3-aac-transcode-gentoo.patch patch_dest/squeezecenter-7.3.3-build-perl-modules-gentoo.patch patch_dest/squeezecenter-7.3.3-json-xs-gentoo.patch patch_dest/squeezecenter-7.3.3-mDNSResponder-gentoo.patch squeezecenter-7.3.3.ebuild stage/files/squeezecenter-7.3.3-aac-transcode-gentoo.patch stage/files/squeezecenter-7.3.3-build-perl-modules-gentoo.patch stage/files/squeezecenter-7.3.3-json-xs-gentoo.patch stage/files/squeezecenter-7.3.3-mDNSResponder-gentoo.patch stage/squeezecenter-7.3.3.ebuild @@ -39,6 +39,7 @@ my %packages = ( '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 patch_source/Bin/build-perl-modules.pl.old @@ -1,6 +1,6 @@ package Slim::bootstrap; -# $Id: bootstrap.pm 23670 2008-10-23 15:32:50Z mherger $ +# $Id: bootstrap.pm 26009 2009-04-16 16:31:59Z andy $ # # SqueezeCenter Copyright 2001-2007 Logitech. # This program is free software; you can redistribute it and/or @@ -191,7 +191,12 @@ sub loadModules { print "The following CPAN modules were found but cannot work with SqueezeCenter:\n"; for my $module ( sort keys %{$failed} ) { - print " $module (loaded " . $failed->{$module}->{loaded} . ", need " . $failed->{$module}->{need} . ")\n"; + if ( $failed->{$module}->{loaded} eq $failed->{$module}->{need} && $failed->{$module}->{msg} ) { + print " $module:\n" . $failed->{$module}->{msg} . "\n"; + } + else { + print " $module (loaded " . $failed->{$module}->{loaded} . ", need " . $failed->{$module}->{need} . ")\n"; + } } print "\n"; @@ -327,6 +332,9 @@ sub tryModuleLoad { sub check_valid_versions { my $modules; my $failed = {}; + + # Don't load all these modules in the scanner + return $failed if main::SCANNER; # don't check validity on Windows binary - it's all built in return $failed if $0 =~ /scanner\.exe/i; @@ -350,8 +358,10 @@ sub check_valid_versions { eval { $mod->VERSION( $ver || 0 ); 1; }; } if ( $@ ) { + my $msg = $@; + # If the object file is missing we'll get an error but the versions will match - if ( $@ =~ /Can't locate loadable object/ ) { + if ( $msg =~ /Can't locate loadable object/ ) { $failed->{$mod} = { loaded => $mod->VERSION . ' but missing object file', need => $ver, @@ -361,6 +371,7 @@ sub check_valid_versions { $failed->{$mod} = { loaded => $mod->VERSION || '<not found>', need => $ver, + msg => $msg, }; } } patch_source/Slim/bootstrap.pm @@ -1,6 +1,6 @@ package Slim::bootstrap; -# $Id: bootstrap.pm 23670 2008-10-23 15:32:50Z mherger $ +# $Id: bootstrap.pm 26009 2009-04-16 16:31:59Z andy $ # # SqueezeCenter Copyright 2001-2007 Logitech. # This program is free software; you can redistribute it and/or @@ -192,7 +192,12 @@ sub loadModules { print "The following CPAN modules were found but cannot work with SqueezeCenter:\n"; for my $module ( sort keys %{$failed} ) { - print " $module (loaded " . $failed->{$module}->{loaded} . ", need " . $failed->{$module}->{need} . ")\n"; + if ( $failed->{$module}->{loaded} eq $failed->{$module}->{need} && $failed->{$module}->{msg} ) { + print " $module:\n" . $failed->{$module}->{msg} . "\n"; + } + else { + print " $module (loaded " . $failed->{$module}->{loaded} . ", need " . $failed->{$module}->{need} . ")\n"; + } } print "\n"; @@ -328,6 +333,9 @@ sub tryModuleLoad { sub check_valid_versions { my $modules; my $failed = {}; + + # Don't load all these modules in the scanner + return $failed if main::SCANNER; # don't check validity on Windows binary - it's all built in return $failed if $0 =~ /scanner\.exe/i; @@ -351,8 +359,10 @@ sub check_valid_versions { eval { $mod->VERSION( $ver || 0 ); 1; }; } if ( $@ ) { + my $msg = $@; + # If the object file is missing we'll get an error but the versions will match - if ( $@ =~ /Can't locate loadable object/ ) { + if ( $msg =~ /Can't locate loadable object/ ) { $failed->{$mod} = { loaded => $mod->VERSION . ' but missing object file', need => $ver, @@ -362,6 +372,7 @@ sub check_valid_versions { $failed->{$mod} = { loaded => $mod->VERSION || '<not found>', need => $ver, + msg => $msg, }; } } patch_source/Slim/bootstrap.pm.old @@ -1,4 +1,4 @@ -# $Id: convert.conf 24695 2009-01-16 22:58:14Z andy $ +# $Id: convert.conf 25391 2009-03-07 13:22:05Z adrian $ # # Configuration file for transcoding # @@ -73,6 +73,14 @@ # specific combinations match before wildcards +mp4 mp3 * * + # FB:{BITRATE=-B %B} + [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - + +aac mp3 * * + # IFB:{BITRATE=-B %B} + [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - + mov mp3 * * # 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 - - @@ -131,7 +139,7 @@ ogg ogg * * - ogg aif * * - [sox] -q -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - + [sox] -q -t ogg $FILE$ -t raw -r 44100 -c 2 -2 -s $-x$ - wma wav * * # F:{PATH=%f}R:{PATH=%F} @@ -157,10 +165,14 @@ wvp wav * * # FT:{START=--skip=%t}U:{END=--until=%v} [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$ +mp4 wav * * + # F + [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ + +aac wav * * + # IF + [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ + mov wav * * # F [faad] -q -w -f 2 $FILE$ @@ -186,7 +198,7 @@ wav flc * * ogg flc * * # IFRD:{RESAMPLE=-r %d} - [sox] -t ogg $FILE$ -t wav $RESAMPLE$ - | [flac] -cs --compression-level-0 --totally-silent - + [sox] -t ogg $FILE$ -t flac -C 0 $RESAMPLE$ - wma flc * * # F:{PATH=%f}R:{PATH=%F} @@ -200,6 +212,14 @@ ape flc * * # F [mac] $FILE$ - -d | [flac] -cs --totally-silent --compression-level-0 - +mp4 flc * * + # F + [faad] -q -w -f 1 $FILE$ | [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 - + mov flc * * # 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 - patch_source/convert.conf @@ -1,4 +1,4 @@ -# $Id: convert.conf 24695 2009-01-16 22:58:14Z andy $ +# $Id: convert.conf 25391 2009-03-07 13:22:05Z adrian $ # # Configuration file for transcoding # @@ -73,6 +73,14 @@ # specific combinations match before wildcards +mp4 mp3 * * + # FB:{BITRATE=-B %B} + [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - + +aac mp3 * * + # IFB:{BITRATE=-B %B} + [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 - - @@ -131,7 +139,7 @@ ogg ogg * * - ogg aif * * - [sox] -q -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - + [sox] -q -t ogg $FILE$ -t raw -r 44100 -c 2 -2 -s $-x$ - wma wav * * # F:{PATH=%f}R:{PATH=%F} @@ -157,7 +165,14 @@ wvp wav * * # FT:{START=--skip=%t}U:{END=--until=%v} [wvunpack] $FILE$ -rq $START$ $END$ -o - -## you can comment this out if you want to use LAME to transcode AAC/MOV files to MP3. +mp4 wav * * + # F + [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ + +aac wav * * + # IF + [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ + mov aif * * # FR [mov123] $FILE$ @@ -183,7 +198,7 @@ wav flc * * ogg flc * * # IFRD:{RESAMPLE=-r %d} - [sox] -t ogg $FILE$ -t wav $RESAMPLE$ - | [flac] -cs --compression-level-0 --totally-silent - + [sox] -t ogg $FILE$ -t flac -C 0 $RESAMPLE$ - wma flc * * # F:{PATH=%f}R:{PATH=%F} @@ -197,6 +212,14 @@ ape flc * * # F [mac] $FILE$ - -d | [flac] -cs --totally-silent --compression-level-0 - +mp4 flc * * + # F + [faad] -q -w -f 1 $FILE$ | [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 - + mov flc * * # FR [mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 - patch_source/convert.conf.old patch_dest/mDNSResponder-gentoo.patch patch_dest/squeezecenter-7.3.2-aac-transcode-gentoo.patch patch_dest/squeezecenter-7.3.2-build-perl-modules-gentoo.patch patch_dest/squeezecenter-7.3.2-json-xs-gentoo.patch patch_dest/squeezecenter-7.3.2-r2-json-xs-gentoo.patch stage/files/mDNSResponder-gentoo.patch stage/files/squeezecenter-7.3.2-aac-transcode-gentoo.patch stage/files/squeezecenter-7.3.2-build-perl-modules-gentoo.patch stage/files/squeezecenter-7.3.2-json-xs-gentoo.patch stage/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch bbd78bcd4b267dda4bfb9aaec2a1f6870d2bd3b7 75893ffa464fdb14a6960464c35d059e2c014658 Stuart Hickinbottom stuart@hickinbottom.com http://github.com/hickinbottoms/squeezecenter-ebuild-for-gentoo/commit/582c01f9aeb5391f59e53ea1e2130473a95afd09 582c01f9aeb5391f59e53ea1e2130473a95afd09 2009-05-26T05:12:33-07:00 2009-05-26T05:12:33-07:00 Merge branch 'develop-7.3' de48aae73776dcced78656386a8db5528eab44e2 Stuart Hickinbottom stuart@hickinbottom.com