rpms/apmud/devel apmud-1.0.0-fb-ioctls.patch, NONE, 1.1 apmud.spec, 1.7, 1.8
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Mon Sep 11 07:07:53 UTC 2006
Author: dwmw2
Update of /cvs/extras/rpms/apmud/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24836
Modified Files:
apmud.spec
Added Files:
apmud-1.0.0-fb-ioctls.patch
Log Message:
fix mirror tool ioctl definitions
apmud-1.0.0-fb-ioctls.patch:
--- NEW FILE apmud-1.0.0-fb-ioctls.patch ---
--- apmud/contrib/m3mirror.c~ 2006-09-11 07:52:55.000000000 +0100
+++ apmud/contrib/m3mirror.c 2006-09-11 07:58:27.000000000 +0100
@@ -5,16 +5,15 @@
#include <string.h>
#include <unistd.h>
#include <sys/ioctl.h>
+#include <stdint.h>
#define ATY_MIRROR_LCD_ON 0x00000001
#define ATY_MIRROR_CRT_ON 0x00000002
-#define __u32 unsigned int
-
/* out param: u32* backlight value: 0 to 15 */
-#define FBIO_ATY128_GET_MIRROR _IOR('@', 1, sizeof(__u32*))
+#define FBIO_ATY128_GET_MIRROR _IOR('@', 1, uint32_t)
/* in param: u32* backlight value: 0 to 15 */
-#define FBIO_ATY128_SET_MIRROR _IOW('@', 2, sizeof(__u32*))
+#define FBIO_ATY128_SET_MIRROR _IOW('@', 2, uint32_t)
static void
usage(void)
--- apmud/contrib/m6mirror.c~ 2006-09-11 07:52:55.000000000 +0100
+++ apmud/contrib/m6mirror.c 2006-09-11 07:59:39.000000000 +0100
@@ -5,14 +5,13 @@
#include <unistd.h>
#include <errno.h>
#include <sys/ioctl.h>
+#include <stdint.h>
#define ATY_RADEON_LCD_ON 0x00000001
#define ATY_RADEON_CRT_ON 0x00000002
-#define __u32 unsigned int
-
-#define FBIO_RADEON_GET_MIRROR _IOR('@', 3, sizeof(__u32*))
-#define FBIO_RADEON_SET_MIRROR _IOW('@', 4, sizeof(__u32*))
+#define FBIO_RADEON_GET_MIRROR _IOR('@', 3, uint32_t)
+#define FBIO_RADEON_SET_MIRROR _IOW('@', 4, uint32_t)
static void
Index: apmud.spec
===================================================================
RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apmud.spec 11 Sep 2006 06:35:17 -0000 1.7
+++ apmud.spec 11 Sep 2006 07:07:53 -0000 1.8
@@ -2,7 +2,7 @@
Name: apmud
Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Power management daemon for Apple PowerPC laptops
Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz
@@ -12,6 +12,7 @@
Patch1: apmud-1.0.0-init.patch
Patch2: pmud-0.10-fixes.patch
Patch3: apmud-1.0.0-fcntl.patch
+Patch4: apmud-1.0.0-fb-ioctls.patch
License: GPL
Group: Utilities/System
BuildRoot: %{_tmppath}/pmud-%{version}-buildroot
@@ -38,6 +39,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS"
@@ -95,6 +97,9 @@
%{_prefix}/share/man/man8/*
%changelog
+* Mon Sep 11 2006 David Woodhouse <dwmw2 at infradead.org> 1.0.0-6
+- Fix ioctl definitions in m3mirror and m6mirror
+
* Mon Sep 11 2006 David Woodhouse <dwmw2 at infradead.org> 1.0.0-5
- Rebuild
More information about the fedora-extras-commits
mailing list