rpms/hal-info/F-10 0001-Also-detect-the-new-PSP-3000-in-storage-mode.patch, NONE, 1.1 0001-Correct-PSP-music-player-entry.patch, NONE, 1.1 hal-info.spec, 1.33, 1.34

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/hal-info/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5279

Modified Files:
	hal-info.spec 
Added Files:
	0001-Also-detect-the-new-PSP-3000-in-storage-mode.patch 
	0001-Correct-PSP-music-player-entry.patch 
Log Message:
* Tue Nov 18 2008 - Bastien Nocera <bnocera at redhat.com> - 20081022-2
- Add patches for the PSP 3000


0001-Also-detect-the-new-PSP-3000-in-storage-mode.patch:

--- NEW FILE 0001-Also-detect-the-new-PSP-3000-in-storage-mode.patch ---
>From 9844e5fb89c6a85e25de7670a03e7e4a7d4a02d1 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Nov 2008 18:34:48 +0100
Subject: [PATCH] Also detect the new PSP-3000 in storage mode

Vendor name is SONY (not Sony), and the product name is "PSP" MS
(yes, that's with the quotes in the HAL output).
---
 .../10freedesktop/10-usb-music-players.fdi         |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 75cdcaa..2783385 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -936,8 +936,8 @@
 
     <match key="info.category" string="storage">
       <!-- Sony PSP (PlayStation Portable) -->
-      <match key="storage.vendor" string="Sony">
-        <match key="storage.model" string="PSP">
+      <match key="storage.vendor" prefix_ncase="SONY">
+        <match key="storage.model" contains="PSP">
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
           <!-- NOTE: for backward compatibility until key get removed finally -->
           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-- 
1.6.0.3


0001-Correct-PSP-music-player-entry.patch:

--- NEW FILE 0001-Correct-PSP-music-player-entry.patch ---
>From 5a2aeed5c5eb211059bab0855d6c43e9bc22aa84 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 13 Nov 2008 18:13:02 +0100
Subject: [PATCH] Correct PSP music player entry

- Default folder depth is 0, as putting the files in a sub-directory,
actually puts them in separate playlists.
- Add mention of WMA and MP4 support (WMA requires to be enabled in
the preferences on the system, but if a user has WMAs, he's more
than likely going to enable the option, saving transcoding)
---
 .../10freedesktop/10-usb-music-players.fdi         |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2783385..fc7d93b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -942,9 +942,12 @@
           <!-- NOTE: for backward compatibility until key get removed finally -->
           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
           <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
 	  <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
+          <merge key="portable_audio_player.folder_depth" type="int">0</merge>
           <merge key="storage.drive_type" type="string">memory_stick</merge>
         </match>
       </match>
-- 
1.6.0.3



Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/F-10/hal-info.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- hal-info.spec	22 Oct 2008 12:44:21 -0000	1.33
+++ hal-info.spec	18 Nov 2008 14:14:07 -0000	1.34
@@ -1,11 +1,15 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20081022
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+# http://lists.freedesktop.org/archives/hal/2008-November/012605.html
+# http://lists.freedesktop.org/archives/hal/2008-November/012625.html
+Patch0: 0001-Also-detect-the-new-PSP-3000-in-storage-mode.patch
+Patch1: 0001-Correct-PSP-music-player-entry.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: hal >= 0.5.10
@@ -17,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -35,6 +41,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Tue Nov 18 2008 - Bastien Nocera <bnocera at redhat.com> - 20081022-2
+- Add patches for the PSP 3000
+
 * Mon Oct 22 2008 Richard Hughes <rhughes at redhat.com> - 20081022-1
 - Update to latest upstream release