1 |
lavajoe 08/08/31 19:56:41 |
2 |
|
3 |
Added: mDNSResponder-gentoo.patch filepaths-gentoo.patch |
4 |
Removed: dbcreate-7.0-gentoo.sql |
5 |
mDNSResponder-7.0-gentoo.patch |
6 |
Gentoo-plugins-7.0.2-README.txt |
7 |
dbdrop-7.0-gentoo.sql filepaths-7.0.2-gentoo.patch |
8 |
squeezecenter-7.0.logrotate.d |
9 |
avahi-7.0-squeezecenter.service |
10 |
squeezecenter-7.0.prefs squeezecenter-7.0.conf.d |
11 |
squeezecenter-7.0.2.init.d squeezecenter-7.0.init.d |
12 |
Log: |
13 |
Add new version 7.2.0; remove old ebuilds and files |
14 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686) |
15 |
|
16 |
Revision Changes Path |
17 |
1.1 media-sound/squeezecenter/files/mDNSResponder-gentoo.patch |
18 |
|
19 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch?rev=1.1&view=markup |
20 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch?rev=1.1&content-type=text/plain |
21 |
|
22 |
Index: mDNSResponder-gentoo.patch |
23 |
=================================================================== |
24 |
--- Slim/Networking/mDNS.pm.old 2008-07-22 12:25:06.000000000 +0100 |
25 |
+++ Slim/Networking/mDNS.pm 2008-07-22 12:26:38.000000000 +0100 |
26 |
@@ -131,11 +131,10 @@ |
27 |
|
28 |
my ($name, $port) = @$data; |
29 |
|
30 |
+ print CONF "\n"; |
31 |
print CONF "$name\n"; |
32 |
print CONF "$service\n"; |
33 |
- print CONF "TXT\n"; |
34 |
print CONF "$port\n"; |
35 |
- print CONF "\n"; |
36 |
} |
37 |
|
38 |
close(CONF); |
39 |
|
40 |
|
41 |
|
42 |
1.1 media-sound/squeezecenter/files/filepaths-gentoo.patch |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/filepaths-gentoo.patch?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/filepaths-gentoo.patch?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: filepaths-gentoo.patch |
48 |
=================================================================== |
49 |
--- Slim/Utils/OSDetect.pm.old 2008-07-22 12:25:34.000000000 +0100 |
50 |
+++ Slim/Utils/OSDetect.pm 2008-07-22 12:27:06.000000000 +0100 |
51 |
@@ -253,6 +253,58 @@ |
52 |
warn "dirsFor: Didn't find a match request: [$dir]\n"; |
53 |
} |
54 |
|
55 |
+ } elsif (isGentoo()) { |
56 |
+ |
57 |
+ if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL)$/) { |
58 |
+ |
59 |
+ push @dirs, "/usr/share/squeezecenter/$dir"; |
60 |
+ |
61 |
+ } elsif ($dir =~ /^(?:lib)$/) { |
62 |
+ |
63 |
+ push @dirs, "/usr/lib/squeezecenter"; |
64 |
+ |
65 |
+ } elsif ($dir eq 'UserPluginRoot') { |
66 |
+ |
67 |
+ push @dirs, "/var/lib/squeezecenter"; |
68 |
+ |
69 |
+ } elsif ($dir eq 'Plugins') { |
70 |
+ |
71 |
+ push @dirs, "/var/lib/squeezecenter/Plugins"; |
72 |
+ push @dirs, "/usr/lib/" . $Config{'package'} . "/vendor_perl/" . $Config{'version'} . "/Slim/Plugin" |
73 |
+ |
74 |
+ } elsif ($dir eq 'strings' || $dir eq 'revision') { |
75 |
+ |
76 |
+ push @dirs, "/usr/share/squeezecenter"; |
77 |
+ |
78 |
+ } elsif ($dir =~ /^(?:types|convert)$/) { |
79 |
+ |
80 |
+ push @dirs, "/etc/squeezecenter"; |
81 |
+ |
82 |
+ } elsif ($dir =~ /^(?:prefs)$/) { |
83 |
+ |
84 |
+ push @dirs, "/var/lib/squeezecenter/prefs"; |
85 |
+ |
86 |
+ } elsif ($dir eq 'log') { |
87 |
+ |
88 |
+ push @dirs, "/var/log/squeezecenter"; |
89 |
+ |
90 |
+ } elsif ($dir eq 'cache') { |
91 |
+ |
92 |
+ push @dirs, "/var/lib/squeezecenter/cache"; |
93 |
+ |
94 |
+ } elsif ($dir eq 'MySQL') { |
95 |
+ |
96 |
+ # Do nothing - use the depended upon MySQL install. |
97 |
+ |
98 |
+ } elsif ($dir =~ /^(?:music|playlists)$/) { |
99 |
+ |
100 |
+ push @dirs, ''; |
101 |
+ |
102 |
+ } else { |
103 |
+ |
104 |
+ warn "dirsFor: Didn't find a match request: [$dir]\n"; |
105 |
+ } |
106 |
+ |
107 |
# Red Hat/Fedora/SUSE RPM specific paths. |
108 |
} elsif (isRHorSUSE()) { |
109 |
|
110 |
@@ -465,6 +517,19 @@ |
111 |
return isReadyNAS(); |
112 |
} |
113 |
|
114 |
+sub isGentoo { |
115 |
+ |
116 |
+ # Initialize |
117 |
+ my $OS = OS(); |
118 |
+ my $details = details(); |
119 |
+ |
120 |
+ if ($details->{'osName'} eq 'Gentoo') { |
121 |
+ return 1; |
122 |
+ } |
123 |
+ |
124 |
+ return 0; |
125 |
+} |
126 |
+ |
127 |
sub isRHorSUSE { |
128 |
|
129 |
# Initialize |
130 |
@@ -586,6 +651,10 @@ |
131 |
|
132 |
$osDetails{'osName'} = 'Debian'; |
133 |
|
134 |
+ } elsif (-f '/etc/gentoo-release') { |
135 |
+ |
136 |
+ $osDetails{'osName'} = 'Gentoo'; |
137 |
+ |
138 |
} elsif (-f '/etc/redhat_release' || -f '/etc/redhat-release') { |
139 |
|
140 |
$osDetails{'osName'} = 'Red Hat'; |
141 |
@@ -603,7 +672,7 @@ |
142 |
$osDetails{'osArch'} = $Config{'myarchname'}; |
143 |
|
144 |
# package specific addition to @INC to cater for plugin locations |
145 |
- if (isDebian()) { |
146 |
+ if (isDebian() || isGentoo()) { |
147 |
|
148 |
unshift @INC, '/usr/share/squeezecenter'; |
149 |
unshift @INC, '/usr/share/squeezecenter/CPAN'; |
150 |
--- Slim/Music/Import.pm.old 2008-07-22 12:24:32.000000000 +0100 |
151 |
+++ Slim/Music/Import.pm 2008-07-22 12:27:06.000000000 +0100 |
152 |
@@ -128,7 +128,7 @@ |
153 |
|
154 |
$command = '/usr/libexec/squeezecenter-scanner'; |
155 |
|
156 |
- } elsif (Slim::Utils::OSDetect::isDebian()) { |
157 |
+ } elsif (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isGentoo()) { |
158 |
|
159 |
$command = '/usr/sbin/squeezecenter-scanner'; |
160 |
|
161 |
--- Slim/bootstrap.pm.old 2008-07-22 12:24:09.000000000 +0100 |
162 |
+++ Slim/bootstrap.pm 2008-07-22 12:27:06.000000000 +0100 |
163 |
@@ -97,8 +97,9 @@ |
164 |
|
165 |
my @SlimINC = (); |
166 |
|
167 |
- if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) { |
168 |
- # On Debian, RH and SUSE, our CPAN directory is located in the same dir as strings.txt |
169 |
+ if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) { |
170 |
+ # On Debian, Gentoo, RH and SUSE, our CPAN directory is located in the |
171 |
+ # same dir as strings.txt |
172 |
$libPath = Slim::Utils::OSDetect::dirsFor('strings'); |
173 |
} |
174 |
|
175 |
@@ -125,6 +126,14 @@ |
176 |
$libPath, |
177 |
); |
178 |
|
179 |
+ if (Slim::Utils::OSDetect::isGentoo()) { |
180 |
+ # On Gentoo, the lib directory is located separately to the CPAN |
181 |
+ # directory as it's not architecture-independent, and make sure we |
182 |
+ # also look at the separate user plugins directory. |
183 |
+ push @SlimINC, Slim::Utils::OSDetect::dirsFor('lib'); |
184 |
+ push @SlimINC, Slim::Utils::OSDetect::dirsFor('UserPluginRoot'); |
185 |
+ } |
186 |
+ |
187 |
$d_startup && printf("Got \@INC containing:\n%s\n\n", join("\n", @INC)); |
188 |
|
189 |
# This works like 'use lib' |
190 |
--- Slim/Utils/MySQLHelper.pm.old 2008-07-22 12:25:31.000000000 +0100 |
191 |
+++ Slim/Utils/MySQLHelper.pm 2008-07-22 12:27:06.000000000 +0100 |
192 |
@@ -152,7 +152,7 @@ |
193 |
|
194 |
# Because we use the system MySQL, we need to point to the right |
195 |
# directory for the errmsg. files. Default to english. |
196 |
- if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) { |
197 |
+ if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) { |
198 |
|
199 |
$config{'language'} = '/usr/share/mysql/english'; |
200 |
} |