SOURCES: hal-samsung_yp_z5.patch, hal-tools.patch - updated

arekm arekm at pld-linux.org
Tue Oct 31 20:41:04 CET 2006 

Author: arekm                        Date: Tue Oct 31 19:41:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   hal-samsung_yp_z5.patch (1.2 -> 1.3) , hal-tools.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/hal-samsung_yp_z5.patch
diff -u SOURCES/hal-samsung_yp_z5.patch:1.2 SOURCES/hal-samsung_yp_z5.patch:1.3
--- SOURCES/hal-samsung_yp_z5.patch:1.2	Wed Jul 26 21:36:55 2006
+++ SOURCES/hal-samsung_yp_z5.patch	Tue Oct 31 20:40:58 2006
@@ -1,11 +1,13 @@
 diff -aurN hal-0.5.7.1.orig/fdi/information/10freedesktop/10-usb-music-players.fdi hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi
 --- hal-0.5.7.1.orig/fdi/information/10freedesktop/10-usb-music-players.fdi	2006-02-04 18:27:35.000000000 +0100
 +++ hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi	2006-07-26 21:35:59.718616468 +0200
-@@ -274,6 +274,17 @@
-             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-           </match>  
-+          <!-- Samsung YP-Z5 -->
+@@ -258,7 +258,18 @@
+ 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
+ 	    <append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
+-          </match>  
++	  </match>
++	  <!-- Samsung YP-Z5 -->
 +          <match key="@storage.physical_device:usb.product_id" int="0x503c">
 +            <append key="info.capabilities" type="strlist">portable_audio_player</append>
 +            <merge key="info.category" type="string">portable_audio_player</merge>
@@ -16,6 +18,7 @@
 +            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
 +            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
 +          </match>
- 	</match>
-       </match>
-     </match>      
+ 	  <!-- Samsung YP-U2Z -->
+           <match key="@storage.physical_device:usb.product_id" int="0x5050">
+             <append key="info.capabilities" type="strlist">portable_audio_player</append>
+

================================================================
Index: SOURCES/hal-tools.patch
diff -u SOURCES/hal-tools.patch:1.1 SOURCES/hal-tools.patch:1.2
--- SOURCES/hal-tools.patch:1.1	Sun Mar 12 19:52:44 2006
+++ SOURCES/hal-tools.patch	Tue Oct 31 20:40:58 2006
@@ -1,7 +1,7 @@
-diff -aurN hal-0.5.7.orig/tools/hal-system-power-hibernate hal-0.5.7/tools/hal-system-power-hibernate
---- hal-0.5.7.orig/tools/hal-system-power-hibernate	2006-01-16 13:47:40.000000000 +0100
-+++ hal-0.5.7/tools/hal-system-power-hibernate	2006-03-12 19:34:20.647414496 +0100
-@@ -10,46 +10,19 @@
+diff -urN hal-0.5.8.1.org/tools/linux/hal-system-power-hibernate-linux hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux
+--- hal-0.5.8.1.org/tools/linux/hal-system-power-hibernate-linux	2006-09-19 22:23:25.000000000 +0200
++++ hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2006-10-31 21:21:28.542805500 +0100
+@@ -10,56 +10,29 @@
  	exit 1
  }
  
@@ -14,6 +14,15 @@
 -		unsupported
 -	fi
 -
+-#Mandriva support suspend-scripts 
+-elif [ -f /etc/mandriva-release ] ; then 
+-    if [ -x /usr/sbin/pmsuspend ] ; then 
+-	/usr/sbin/pmsuspend disk 
+-	RET=$? 
+-    else 
+-	unsupported 
+-    fi 
+-
 -#RedHat/Fedora only support pm-utils
 -elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] ; then
 -	if [ -x /usr/sbin/pm-hibernate ] ; then
@@ -24,17 +33,26 @@
 -	fi
 -
 -#Other distros just need to have *any* tools installed
-+if [ -x "/usr/bin/powersave" ] ; then
-+	$POWERSAVED_SUSPEND2DISK
-+	RET=$?
++if [ -x /usr/sbin/s2disk ] ; then
++    /usr/sbin/s2disk
++    RET=$?
 +elif [ -x "/usr/sbin/hibernate" ] ; then
-+	# Suspend2 tools installed
-+	/usr/sbin/hibernate --force
-+	RET=$?
++    # Suspend2 tools installed
++    /usr/sbin/hibernate --force
++    RET=$?
++elif [ -x /usr/bin/powersave ] ; then
++    $POWERSAVED_SUSPEND2DISK
++    RET=$?
++elif [ -x /usr/sbin/pmsuspend ] ; then 
++    /usr/sbin/pmsuspend disk 
++    RET=$? 
++elif [ -x /usr/sbin/pm-hibernate ] ; then
++    /usr/sbin/pm-hibernate
++    RET=$?
 +elif [ -w "/sys/power/state" ] ; then
-+	# Use the raw kernel sysfs interface
-+	echo "disk" > /sys/power/state
-+	RET=$?
++    # Use the raw kernel sysfs interface
++    echo "disk" > /sys/power/state
++    RET=$?
  else
 -	if [ -x "/usr/bin/powersave" ] ; then
 -	        $POWERSAVED_SUSPEND2DISK
@@ -57,14 +75,15 @@
 -		unsupported
 -		fi
 -	fi
-+	unsupported
++    unsupported
 +fi
  
- exit $RET
-diff -aurN hal-0.5.7.orig/tools/hal-system-power-set-power-save hal-0.5.7/tools/hal-system-power-set-power-save
---- hal-0.5.7.orig/tools/hal-system-power-set-power-save	2005-11-29 18:47:54.000000000 +0100
-+++ hal-0.5.7/tools/hal-system-power-set-power-save	2006-03-12 19:31:46.200893936 +0100
-@@ -7,38 +7,16 @@
+ #Refresh devices as a resume can do funny things
+ for type in button battery ac_adapter
+diff -urN hal-0.5.8.1.org/tools/linux/hal-system-power-set-power-save-linux hal-0.5.8.1/tools/linux/hal-system-power-set-power-save-linux
+--- hal-0.5.8.1.org/tools/linux/hal-system-power-set-power-save-linux	2006-09-19 22:23:25.000000000 +0200
++++ hal-0.5.8.1/tools/linux/hal-system-power-set-power-save-linux	2006-10-31 21:18:22.463176250 +0100
+@@ -7,38 +7,25 @@
  	exit 1
  }
  
@@ -93,15 +112,22 @@
 -elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] ; then
 -	if [ -x "/usr/sbin/pm-powersave" ] ; then
 -		if [ $value = "true" ]; then
--			/usr/sbin/pm-powersave on
+-			/usr/sbin/pm-powersave true
 -			RET=$?
 -		elif [ $value = "false" ]; then
--			/usr/sbin/pm-powersave off
+-			/usr/sbin/pm-powersave false
 -			RET=$?
 -		fi
 -	else
 -		unsupported
--	fi
++elif [ -x "/usr/sbin/pm-powersave" ] ; then
++	if [ $value = "true" ]; then
++		/usr/sbin/pm-powersave true
++		RET=$?
++	elif [ $value = "false" ]; then
++		/usr/sbin/pm-powersave false
++		RET=$?
+ 	fi
 -
  else
 -	# cannot set proc stuff here, so error out
@@ -110,11 +136,11 @@
 +fi
  
  exit $RET
--
-diff -aurN hal-0.5.7.orig/tools/hal-system-power-suspend hal-0.5.7/tools/hal-system-power-suspend
---- hal-0.5.7.orig/tools/hal-system-power-suspend	2006-02-19 00:00:55.000000000 +0100
-+++ hal-0.5.7/tools/hal-system-power-suspend	2006-03-12 19:33:01.498446968 +0100
-@@ -28,48 +28,16 @@
+ 
+diff -urN hal-0.5.8.1.org/tools/linux/hal-system-power-suspend-linux hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux
+--- hal-0.5.8.1.org/tools/linux/hal-system-power-suspend-linux	2006-09-19 22:23:25.000000000 +0200
++++ hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2006-10-31 21:20:50.544430750 +0100
+@@ -28,73 +28,26 @@
  	exit 0
  fi
  
@@ -128,6 +154,21 @@
 -		unsupported
 -	fi
 -
+-#Mandriva supports suspend-scripts 
+-elif [ -f "/etc/mandriva-release" ] ; then 
+-    # TODO: fix pmsuspend to take a --wakeup-alarm argument 
+-    if [ $seconds_to_sleep != "0" ] ; then 
+-	alarm_not_supported 
+-    fi 
+-    
+-    if [ -x "/usr/sbin/pmsuspend" ] ; then 
+-	/usr/sbin/pmsuspend memory
+-	RET=$? 
+-    else 
+-        # TODO: add support 
+-	unsupported 
+-    fi 
+-
 -#RedHat/Fedora only support pm-utils
 -elif [ -f "/etc/redhat-release" ] || [ -f "/etc/fedora-release" ] ; then
 -	# TODO: fix pm-suspend to take a --wakeup-alarm argument
@@ -144,13 +185,31 @@
 -		unsupported
 -	fi
 -
+-#FreeBSD uses zzz to suspend for both ACPI and APM
+-elif [ "x`uname -s`" = "xFreeBSD" ] ; then
+-	if [ -x /usr/sbin/zzz ] ; then
+-		/usr/sbin/zzz
+-		RET=$?
+-	else
+-		unsupported
+-	fi
+-
 -#Other distros just need to have *any* tools installed
-+if [ -x "/usr/bin/powersave" ] ; then
-+	$POWERSAVED_SUSPEND2RAM
++if [ -x /usr/sbin/s2ram ]; then
++	/usr/sbin/s2ram
++	RET=$?
++elif [ -x /usr/bin/powersave ] ; then
++        $POWERSAVED_SUSPEND2RAM
++	RET=$?
++elif [ -x "/usr/sbin/pm-suspend" ] ; then
++	/usr/sbin/pm-suspend
++	RET=$?
++elif [ -x "/usr/sbin/pmi" ] ; then
++        /usr/sbin/pmi action suspend force
 +	RET=$?
 +elif [ -w "/sys/power/state" ] ; then
-+	# Use the raw kernel sysfs interface
-+	echo "mem" > /sys/power/state
++        # Use the raw kernel sysfs interface
++        echo "mem" > /sys/power/state
 +	RET=$?
  else
 -	if [ -x "/usr/bin/powersave" ] ; then
@@ -168,8 +227,9 @@
 -	    unsupported
 -	    fi
 -	fi
-+	# TODO: add other scripts support
-+	unsupported
++        # TODO: add other scripts support
++        unsupported
 +fi
  
- exit $RET
+ #Refresh devices as a resume can do funny things
+ for type in button battery ac_adapter
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/hal-samsung_yp_z5.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/hal-tools.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list