rpms/pm-utils/devel pm-utils-0.19-vidhooks.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 14 04:20:39 UTC 2006
- Previous message (by thread): rpms/pirut/devel .cvsignore, 1.22, 1.23 pirut.spec, 1.23, 1.24 sources, 1.23, 1.24
- Next message (by thread): rpms/booty/devel .cvsignore, 1.46, 1.47 booty.spec, 1.50, 1.51 sources, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pjones
Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23625
Modified Files:
pm-utils-0.19-vidhooks.patch
Log Message:
- fix Makefile.am/Makefile.in for functions-*
pm-utils-0.19-vidhooks.patch:
Makefile.am | 3 +
Makefile.in | 3 +
functions | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
functions-ati | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
functions-intel | 29 ++++++++++++++++
functions-nvidia | 30 +++++++++++++++++
hooks/20video | 34 +++++++------------
7 files changed, 265 insertions(+), 21 deletions(-)
Index: pm-utils-0.19-vidhooks.patch
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19-vidhooks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pm-utils-0.19-vidhooks.patch 14 Jun 2006 02:59:28 -0000 1.1
+++ pm-utils-0.19-vidhooks.patch 14 Jun 2006 04:20:20 -0000 1.2
@@ -1,6 +1,105 @@
---- pm/functions 16 May 2006 15:15:05 -0000 1.19
-+++ pm/functions 14 Jun 2006 02:47:40 -0000
-@@ -30,6 +30,97 @@ source_configs()
+--- /dev/null 2006-06-09 14:24:51.853484500 -0400
++++ pm-utils-0.19/pm/functions-ati 2006-06-14 00:15:55.000000000 -0400
+@@ -0,0 +1,96 @@
++#!/bin/bash
++
++get_lcd_status()
++{
++ if [ ! -x /usr/sbin/radeontool ]; then
++ echo "error"
++ return 2
++ fi
++ STATUS=$(/usr/sbin/radeontool light | cut -d\ -f5 2>/dev/null)
++ RETVAL=0
++ case "x$STATUS" in
++ "xon")
++ echo "on"
++ RETVAL=0
++ ;;
++ "xoff")
++ echo "off"
++ RETVAL=1
++ ;;
++ *)
++ echo "error"
++ RETVAL=2
++ ;;
++ esac
++ return $RETVAL
++}
++
++lcd_off()
++{
++ if [ "$(get_lcd_status)" != "on" ]; then
++ return
++ fi
++ [ -x /usr/sbin/radeontool] && /usr/sbin/radeontool light off
++}
++
++lcd_on()
++{
++ if [ "$(get_lcd_status)" != "off" ]; then
++ return
++ fi
++ [ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool light on
++}
++
++get_crt_status()
++{
++ if [ ! -x /usr/sbin/radeontool ]; then
++ echo "error"
++ return 2
++ fi
++ STATUS=$(/usr/sbin/radeontool light | cut -d\ -f5 2>/dev/null)
++ RETVAL=0
++ case "x$STATUS" in
++ "xon")
++ echo "on"
++ RETVAL=0
++ ;;
++ "xoff")
++ echo "off"
++ RETVAL=1
++ ;;
++ *)
++ echo "error"
++ RETVAL=2
++ ;;
++ esac
++ return $RETVAL
++}
++
++crt_off()
++{
++ if [ "$(get_lcd_status)" != "on" ]; then
++ return
++ fi
++ [ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac off
++}
++
++crt_on()
++{
++ if [ "$(get_lcd_status)" != "on" ]; then
++ return
++ fi
++ [ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac on
++}
++
++[ -x /usr/sbin/vbetool ] || return
++
++suspend_video()
++{
++ /usr/sbin/vbetool dpms suspend >/dev/null 2>&1
++}
++
++resume_video()
++{
++# /usr/sbin/vbetool dpms on >/dev/null 2>&1
++ :
++}
+--- pm-utils-0.19/pm/functions.vidhooks 2006-06-13 22:50:37.000000000 -0400
++++ pm-utils-0.19/pm/functions 2006-06-14 00:15:55.000000000 -0400
+@@ -30,6 +30,97 @@
source_configs
@@ -98,8 +197,8 @@
take_suspend_lock()
{
VT=$(/usr/bin/fgconsole)
---- pm/hooks/20video 27 Apr 2006 08:05:43 -0000 1.7
-+++ pm/hooks/20video 14 Jun 2006 02:47:40 -0000
+--- pm-utils-0.19/pm/hooks/20video.vidhooks 2006-06-13 22:50:37.000000000 -0400
++++ pm-utils-0.19/pm/hooks/20video 2006-06-14 00:15:55.000000000 -0400
@@ -2,27 +2,19 @@
. /etc/pm/functions
@@ -141,107 +240,8 @@
case "$1" in
suspend)
---- pm/functions-ati.old 1969-12-31 19:00:00.000000000 -0500
-+++ pm/functions-ati 2006-06-13 22:43:58.000000000 -0400
-@@ -0,0 +1,96 @@
-+#!/bin/bash
-+
-+get_lcd_status()
-+{
-+ if [ ! -x /usr/sbin/radeontool ]; then
-+ echo "error"
-+ return 2
-+ fi
-+ STATUS=$(/usr/sbin/radeontool light | cut -d\ -f5 2>/dev/null)
-+ RETVAL=0
-+ case "x$STATUS" in
-+ "xon")
-+ echo "on"
-+ RETVAL=0
-+ ;;
-+ "xoff")
-+ echo "off"
-+ RETVAL=1
-+ ;;
-+ *)
-+ echo "error"
-+ RETVAL=2
-+ ;;
-+ esac
-+ return $RETVAL
-+}
-+
-+lcd_off()
-+{
-+ if [ "$(get_lcd_status)" != "on" ]; then
-+ return
-+ fi
-+ [ -x /usr/sbin/radeontool] && /usr/sbin/radeontool light off
-+}
-+
-+lcd_on()
-+{
-+ if [ "$(get_lcd_status)" != "off" ]; then
-+ return
-+ fi
-+ [ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool light on
-+}
-+
-+get_crt_status()
-+{
-+ if [ ! -x /usr/sbin/radeontool ]; then
-+ echo "error"
-+ return 2
-+ fi
-+ STATUS=$(/usr/sbin/radeontool light | cut -d\ -f5 2>/dev/null)
-+ RETVAL=0
-+ case "x$STATUS" in
-+ "xon")
-+ echo "on"
-+ RETVAL=0
-+ ;;
-+ "xoff")
-+ echo "off"
-+ RETVAL=1
-+ ;;
-+ *)
-+ echo "error"
-+ RETVAL=2
-+ ;;
-+ esac
-+ return $RETVAL
-+}
-+
-+crt_off()
-+{
-+ if [ "$(get_lcd_status)" != "on" ]; then
-+ return
-+ fi
-+ [ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac off
-+}
-+
-+crt_on()
-+{
-+ if [ "$(get_lcd_status)" != "on" ]; then
-+ return
-+ fi
-+ [ -x /usr/sbin/radeontool ] && /usr/sbin/radeontool dac on
-+}
-+
-+[ -x /usr/sbin/vbetool ] || return
-+
-+suspend_video()
-+{
-+ /usr/sbin/vbetool dpms suspend >/dev/null 2>&1
-+}
-+
-+resume_video()
-+{
-+# /usr/sbin/vbetool dpms on >/dev/null 2>&1
-+ :
-+}
---- pm/functions-intel.old 1969-12-31 19:00:00.000000000 -0500
-+++ pm/functions-intel 2006-06-13 22:43:58.000000000 -0400
+--- /dev/null 2006-06-09 14:24:51.853484500 -0400
++++ pm-utils-0.19/pm/functions-intel 2006-06-14 00:15:55.000000000 -0400
@@ -0,0 +1,29 @@
+#!/bin/bash
+
@@ -272,8 +272,8 @@
+{
+ /usr/sbin/vbetool dpms off >/dev/null 2>&1
+}
---- pm/functions-nvidia.old 1969-12-31 19:00:00.000000000 -0500
-+++ pm/functions-nvidia 2006-06-13 22:43:58.000000000 -0400
+--- /dev/null 2006-06-09 14:24:51.853484500 -0400
++++ pm-utils-0.19/pm/functions-nvidia 2006-06-14 00:15:55.000000000 -0400
@@ -0,0 +1,30 @@
+#!/bin/bash
+
@@ -305,3 +305,27 @@
+{
+ /usr/sbin/vbetool dpms off >/dev/null 2>&1
+}
+--- pm-utils-0.19/pm/Makefile.am.vidhooks 2006-06-14 00:16:49.000000000 -0400
++++ pm-utils-0.19/pm/Makefile.am 2006-06-14 00:17:13.000000000 -0400
+@@ -4,6 +4,9 @@
+
+ extra_SCRIPTS = \
+ functions \
++ functions-ati \
++ functions-intel \
++ functions-nvidia \
+ config
+
+ EXTRA_DIST = \
+--- pm-utils-0.19/pm/Makefile.in.vidhooks 2006-06-14 00:16:53.000000000 -0400
++++ pm-utils-0.19/pm/Makefile.in 2006-06-14 00:17:20.000000000 -0400
+@@ -136,6 +136,9 @@
+ extradir = $(sysconfdir)/pm
+ extra_SCRIPTS = \
+ functions \
++ functions-ati \
++ functions-intel \
++ functions-nvidia \
+ config
+
+ EXTRA_DIST = \
- Previous message (by thread): rpms/pirut/devel .cvsignore, 1.22, 1.23 pirut.spec, 1.23, 1.24 sources, 1.23, 1.24
- Next message (by thread): rpms/booty/devel .cvsignore, 1.46, 1.47 booty.spec, 1.50, 1.51 sources, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list