1 |
lavajoe 09/01/21 17:52:58 |
2 |
|
3 |
Added: squeezecenter-7.3.1-aac-transcode-gentoo.patch |
4 |
squeezecenter-7.3.1-build-perl-modules-gentoo.patch |
5 |
squeezecenter-7.3.1-json-xs-gentoo.patch |
6 |
Log: |
7 |
Add new version 7.3.1 |
8 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 media-sound/squeezecenter/files/squeezecenter-7.3.1-aac-transcode-gentoo.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.1-aac-transcode-gentoo.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.1-aac-transcode-gentoo.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: squeezecenter-7.3.1-aac-transcode-gentoo.patch |
17 |
=================================================================== |
18 |
--- convert.conf.old 2009-01-17 14:33:33.000000000 +0000 |
19 |
+++ convert.conf 2009-01-17 15:04:25.000000000 +0000 |
20 |
@@ -74,8 +74,8 @@ |
21 |
# specific combinations match before wildcards |
22 |
|
23 |
mov mp3 * * |
24 |
- # FRB:{BITRATE=-B %B} |
25 |
- [mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - - |
26 |
+ # FB:{BITRATE=-B %B} |
27 |
+ [faad] -q -w -f 2 $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ $BITRATE$ -x -r - - |
28 |
|
29 |
alc mp3 * * |
30 |
# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} |
31 |
@@ -158,9 +158,13 @@ |
32 |
[wvunpack] $FILE$ -rq $START$ $END$ -o - |
33 |
|
34 |
## you can comment this out if you want to use LAME to transcode AAC/MOV files to MP3. |
35 |
-mov aif * * |
36 |
- # FR |
37 |
- [mov123] $FILE$ |
38 |
+#mov aif * * |
39 |
+# # FR |
40 |
+# [mov123] $FILE$ |
41 |
+ |
42 |
+mov wav * * |
43 |
+ # F |
44 |
+ [faad] -q -w -f 2 $FILE$ |
45 |
|
46 |
wma wma * * |
47 |
- |
48 |
@@ -198,8 +202,8 @@ |
49 |
[mac] $FILE$ - -d | [flac] -cs --totally-silent --compression-level-0 - |
50 |
|
51 |
mov flc * * |
52 |
- # FR |
53 |
- [mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 - |
54 |
+ # F |
55 |
+ [faad] -q -w -f 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 - |
56 |
|
57 |
alc flc * * |
58 |
# F |
59 |
|
60 |
|
61 |
|
62 |
1.1 media-sound/squeezecenter/files/squeezecenter-7.3.1-build-perl-modules-gentoo.patch |
63 |
|
64 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.1-build-perl-modules-gentoo.patch?rev=1.1&view=markup |
65 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.1-build-perl-modules-gentoo.patch?rev=1.1&content-type=text/plain |
66 |
|
67 |
Index: squeezecenter-7.3.1-build-perl-modules-gentoo.patch |
68 |
=================================================================== |
69 |
--- Bin/build-perl-modules.pl.old 2009-01-04 17:55:46.000000000 +0000 |
70 |
+++ Bin/build-perl-modules.pl 2009-01-05 18:53:33.000000000 +0000 |
71 |
@@ -21,24 +21,12 @@ |
72 |
|
73 |
# NOTE: If you change this in a future version of SC, create a new |
74 |
# versioned directory under vendor/src for all files for that version |
75 |
-my $SOURCE = 'http://svn.slimdevices.com/repos/slim/vendor/src/7.3'; |
76 |
my $dlext = $Config{'dlext'}; |
77 |
|
78 |
# The list of all the packages needed. |
79 |
my %packages = ( |
80 |
'Class::XSAccessor::Array' => 'Class-XSAccessor-Array-0.05.tar.gz', |
81 |
- 'Compress::Zlib' => 'Compress-Zlib-1.41.tar.gz', |
82 |
- 'DBI' => 'DBI-1.604.tar.gz', |
83 |
- 'DBD::mysql' => 'DBD-mysql-3.0002.tar.gz', |
84 |
- 'Digest::SHA1' => 'Digest-SHA1-2.11.tar.gz', |
85 |
- 'Encode::Detect' => 'Encode-Detect-1.00.tar.gz', |
86 |
- 'JSON::XS' => 'JSON-XS-1.5.tar.gz', |
87 |
- 'HTML::Parser' => 'HTML-Parser-3.48.tar.gz', |
88 |
'POE::XS::Queue::Array' => 'POE-XS-Queue-Array-0.002.tar.gz', |
89 |
- 'Template' => 'Template-Toolkit-2.15.tar.gz', |
90 |
- 'Time::HiRes' => 'Time-HiRes-1.86.tar.gz', |
91 |
- 'XML::Parser::Expat' => 'XML-Parser-2.34.tar.gz', |
92 |
- 'YAML::Syck' => 'YAML-Syck-0.64.tar.gz', |
93 |
); |
94 |
|
95 |
# Don't need Class::C3::XS if you're running 5.10 |
96 |
@@ -196,36 +184,16 @@ |
97 |
} |
98 |
} |
99 |
|
100 |
+ # Utilise AutoXS::Header as we need that to support the following builds. |
101 |
+ chdir($pwd) or die "Couldn't change to $pwd : $!"; |
102 |
+ # Include this when performing the following builds. |
103 |
+ $ENV{'PERL5LIB'} = cwd() . "/AutoXS-Header-0.03/lib"; |
104 |
+ |
105 |
for my $package (@packages) { |
106 |
|
107 |
chdir($pwd) or die "Couldn't change to $pwd : $!"; |
108 |
|
109 |
- print "\nDownloading $package to: $pwd\n"; |
110 |
- |
111 |
- # Remove any previous version. |
112 |
- unlink $package; |
113 |
- |
114 |
- if ($downloadUsing eq 'lwp') { |
115 |
- |
116 |
- LWP::Simple::getstore("$SOURCE/$package?view=auto", $package); |
117 |
- |
118 |
- } elsif ($downloadUsing =~ /curl$/) { |
119 |
- |
120 |
- `$downloadUsing --silent -o $package $SOURCE/$package?view=auto`; |
121 |
- |
122 |
- } else { |
123 |
- |
124 |
- `$downloadUsing -q -O $package $SOURCE/$package?view=auto`; |
125 |
- } |
126 |
- |
127 |
- unless (-r $package) { |
128 |
- print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n"; |
129 |
- } |
130 |
- |
131 |
- print "Uncompressing..\n"; |
132 |
- `gzip -d < $package | tar xvf -`; |
133 |
- |
134 |
- unlink $package; |
135 |
+ print "\nBuilding $package\n"; |
136 |
|
137 |
# Just the directory name. |
138 |
my ($packageDir) = ($package =~ /(\S+?)\.tar\.gz/); |
139 |
--- Slim/bootstrap.pm.old 2008-11-22 15:14:07.000000000 +0000 |
140 |
+++ Slim/bootstrap.pm 2008-11-22 15:14:30.000000000 +0000 |
141 |
@@ -176,7 +176,6 @@ |
142 |
|
143 |
print "The following modules failed to load: $failed\n\n"; |
144 |
|
145 |
- print "To download and compile them, please run: $libPath/Bin/build-perl-modules.pl $failed\n\n"; |
146 |
print "Exiting..\n"; |
147 |
|
148 |
exit; |
149 |
|
150 |
|
151 |
|
152 |
1.1 media-sound/squeezecenter/files/squeezecenter-7.3.1-json-xs-gentoo.patch |
153 |
|
154 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.1-json-xs-gentoo.patch?rev=1.1&view=markup |
155 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.3.1-json-xs-gentoo.patch?rev=1.1&content-type=text/plain |
156 |
|
157 |
Index: squeezecenter-7.3.1-json-xs-gentoo.patch |
158 |
=================================================================== |
159 |
--- Slim/Formats/XML.pm.old 2009-01-17 21:27:29.000000000 +0000 |
160 |
+++ Slim/Formats/XML.pm 2009-01-17 21:40:14.000000000 +0000 |
161 |
@@ -13,7 +13,7 @@ |
162 |
use strict; |
163 |
use File::Slurp; |
164 |
use HTML::Entities; |
165 |
-use JSON::XS qw(from_json); |
166 |
+use JSON::XS qw(decode_json); |
167 |
use Scalar::Util qw(weaken); |
168 |
use URI::Escape qw(uri_escape); |
169 |
use XML::Simple; |
170 |
@@ -288,7 +288,7 @@ |
171 |
my $xml; |
172 |
|
173 |
if ( $type =~ /json/ ) { |
174 |
- $xml = from_json($$content); |
175 |
+ $xml = decode_json($$content); |
176 |
} |
177 |
else { |
178 |
$xml = xmlToHash($content); |