| 1 |
lavajoe 12/05/30 18:45:33 |
| 2 |
|
| 3 |
Modified: gentoo-filepaths.pm |
| 4 |
Added: |
| 5 |
logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch |
| 6 |
Log: |
| 7 |
Fix playlist dir issue (bug #416923) |
| 8 |
|
| 9 |
(Portage version: 2.1.10.56/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: gentoo-filepaths.pm |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- gentoo-filepaths.pm 12 Apr 2012 05:56:03 -0000 1.1 |
| 25 |
+++ gentoo-filepaths.pm 30 May 2012 18:45:33 -0000 1.2 |
| 26 |
@@ -1,6 +1,6 @@ |
| 27 |
# Copyright 1999-2012 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm,v 1.1 2012/04/12 05:56:03 lavajoe Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm,v 1.2 2012/05/30 18:45:33 lavajoe Exp $ |
| 31 |
|
| 32 |
# This file contains a custom OS package to provide information on the |
| 33 |
# installation structure on Gentoo. |
| 34 |
@@ -38,21 +38,34 @@ |
| 35 |
my ($class, $dir) = @_; |
| 36 |
|
| 37 |
my @dirs = (); |
| 38 |
- |
| 39 |
- # Use the default behaviour to locate the directory. |
| 40 |
- push @dirs, $class->SUPER::dirsFor($dir); |
| 41 |
|
| 42 |
# Overrides for specific directories. |
| 43 |
if ($dir eq 'Plugins') { |
| 44 |
|
| 45 |
- # User-installed plugins are in a different place. |
| 46 |
+ # Look in the normal places. |
| 47 |
+ push @dirs, $class->SUPER::dirsFor($dir); |
| 48 |
+ |
| 49 |
+ # User-installed plugins are in a different place, so add it. |
| 50 |
push @dirs, '/var/lib/logitechmediaserver/Plugins'; |
| 51 |
|
| 52 |
+ } elsif ($dir eq 'ClientPlaylists') { |
| 53 |
+ |
| 54 |
+ # LMS would normally try to put client playlists in the prefs |
| 55 |
+ # directory, but they aren't really prefs since they're dynamic |
| 56 |
+ # state of the clients. Effectively, they're the same as the |
| 57 |
+ # database cache, so we move these under /var/lib. |
| 58 |
+ push @dirs, '/var/lib/logitechmediaserver/ClientPlaylists'; |
| 59 |
+ |
| 60 |
} elsif ($dir =~ /^(?:prefs)$/) { |
| 61 |
|
| 62 |
# Server and plugin preferences are in a different place. |
| 63 |
push @dirs, $::prefsdir || '/etc/logitechmediaserver'; |
| 64 |
|
| 65 |
+ } else { |
| 66 |
+ |
| 67 |
+ # Use the default behaviour to locate the directory. |
| 68 |
+ push @dirs, $class->SUPER::dirsFor($dir); |
| 69 |
+ |
| 70 |
} |
| 71 |
|
| 72 |
return wantarray() ? @dirs : $dirs[0]; |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.1 media-sound/logitechmediaserver-bin/files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/logitechmediaserver-bin/files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch?rev=1.1&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/logitechmediaserver-bin/files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch?rev=1.1&content-type=text/plain |
| 80 |
|
| 81 |
Index: logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch |
| 82 |
=================================================================== |
| 83 |
--- Slim/Player/Playlist.pm.orig 2012-05-29 12:52:03.351548099 +0100 |
| 84 |
+++ Slim/Player/Playlist.pm 2012-05-29 12:52:32.676570561 +0100 |
| 85 |
@@ -1042,7 +1042,7 @@ |
| 86 |
$id =~ s/://g; |
| 87 |
|
| 88 |
return Slim::Utils::Misc::fileURLFromPath( |
| 89 |
- catfile(Slim::Utils::OSDetect::dirsFor('prefs'), "clientplaylist_$id.m3u") |
| 90 |
+ catfile(Slim::Utils::OSDetect::dirsFor('ClientPlaylists'), "clientplaylist_$id.m3u") |
| 91 |
); |
| 92 |
} |
Archives