From 7eadd8aa3344e38a6a2fc2f7ba46255a340b7a3b Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Fri, 26 Dec 2008 15:33:03 +0000
Subject: Improve detection of newer PSP models and update capabilities (AAC,
 new media folder path) for newer PSP firmwares.

---
 sysutils/hal-info/Makefile         |  3 ++-
 sysutils/hal-info/distinfo         |  3 ++-
 sysutils/hal-info/patches/patch-ab | 23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 sysutils/hal-info/patches/patch-ab

(limited to 'sysutils')

diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index e4f4b58915a..cc47f80acd7 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/26 15:33:03 jmcneill Exp $
 #
 
 DISTNAME=		hal-info-20081022
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 
diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo
index 34b8c28b589..21ea9e07bb9 100644
--- a/sysutils/hal-info/distinfo
+++ b/sysutils/hal-info/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/12/26 15:33:04 jmcneill Exp $
 
 SHA1 (hal-info-20081022.tar.gz) = f5e6b6351eafaf71946a581922ddb86e9f48641d
 RMD160 (hal-info-20081022.tar.gz) = fae14fe9d603329f4839ac7aee6f4602f591dc1b
 Size (hal-info-20081022.tar.gz) = 226411 bytes
 SHA1 (patch-aa) = 487e4a30c0cb80f96a07db3a5f68d4f81cf585e2
+SHA1 (patch-ab) = 2b0e3f2ba9a362e0b4fb203987d124ea7e971281
diff --git a/sysutils/hal-info/patches/patch-ab b/sysutils/hal-info/patches/patch-ab
new file mode 100644
index 00000000000..af58a614025
--- /dev/null
+++ b/sysutils/hal-info/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2008/12/26 15:33:04 jmcneill Exp $
+
+--- fdi/information/10freedesktop/10-usb-music-players.fdi.orig	2008-10-20 04:51:31.000000000 -0400
++++ fdi/information/10freedesktop/10-usb-music-players.fdi	2008-12-26 10:32:13.000000000 -0500
+@@ -911,14 +911,16 @@
+ 
+     <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" string_outof="Sony;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>
+           <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
++          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+           <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
++	  <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ 	  <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
+           <merge key="storage.drive_type" type="string">memory_stick</merge>
+         </match>
-- 
cgit v1.2.3