rpms/xorg-x11-drv-v4l/devel v4l-0.1.1-ioctl-fix.patch, NONE, 1.1 xorg-x11-drv-v4l.spec, 1.15, 1.16
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Tue Aug 28 17:19:51 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-v4l/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24257
Modified Files:
xorg-x11-drv-v4l.spec
Added Files:
v4l-0.1.1-ioctl-fix.patch
Log Message:
* Tue Aug 28 2007 Adam Jackson <ajax at redhat.com> 0.1.1-8
- Fix ioctl argument on LP64 machines. (#250070)
v4l-0.1.1-ioctl-fix.patch:
--- NEW FILE v4l-0.1.1-ioctl-fix.patch ---
diff -Nrbu xf86-video-v4l-0.1.1/src/v4l.c xf86-video-v4l-0.1.1-OK/src/v4l.c
--- xf86-video-v4l-0.1.1/src/v4l.c 2006-04-08 05:51:30.000000000 +0400
+++ xf86-video-v4l-0.1.1-OK/src/v4l.c 2007-07-27 17:19:50.000000000 +0400
@@ -593,7 +593,8 @@
if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
perror("ioctl VIDIOCSAUDIO");
} else if (attribute == xvFreq) {
- if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&value))
+ unsigned long freq = value;
+ if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
perror("ioctl VIDIOCSFREQ");
} else if (0 != pPPriv->yuv_format &&
pPPriv->myfmt->setAttribute) {
@@ -645,7 +646,9 @@
ret = BadValue;
}
} else if (attribute == xvFreq) {
- ioctl(V4L_FD,VIDIOCGFREQ,value);
+ unsigned long freq;
+ ioctl(V4L_FD,VIDIOCGFREQ,&freq);
+ *value = freq;
} else if (0 != pPPriv->yuv_format &&
pPPriv->myfmt->getAttribute) {
/* not mine -> pass to yuv scaler driver */
Index: xorg-x11-drv-v4l.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-v4l/devel/xorg-x11-drv-v4l.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-v4l.spec 23 Aug 2007 18:41:46 -0000 1.15
+++ xorg-x11-drv-v4l.spec 28 Aug 2007 17:19:19 -0000 1.16
@@ -5,13 +5,14 @@
Summary: Xorg X11 v4l video driver
Name: xorg-x11-drv-v4l
Version: 0.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch0: v4l-0.1.1-ioctl-fix.patch
ExcludeArch: s390 s390x
@@ -24,6 +25,7 @@
%prep
%setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .ioctl
%build
%configure --disable-static
@@ -47,6 +49,9 @@
%{_mandir}/man4/v4l.4*
%changelog
+* Tue Aug 28 2007 Adam Jackson <ajax at redhat.com> 0.1.1-8
+- Fix ioctl argument on LP64 machines. (#250070)
+
* Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.1.1-7
- Rebuild for ppc toolchain bug
More information about the fedora-extras-commits
mailing list