[mythtv] [PATCH] Compile error on Debian unstable/experimental

[David Engel]

Due to package dependencies, I've been forced to use libc6 package
from Debian experimental.  This resulted in a couple of compile errors
for Myth.  One of the errors was due to a bad interaction between
glibc and kernel headers.  The other error, however, appears to be a
Myth/IVTV problem.  The patch below fixes the Myth/IVTV error for me.

I'm pretty sure the change in ivtv-ext-api.h is valid.  Frankly, I'm
not sure why it compiled before.  Perhaps the newer kernel headers are
more strict about defining ioctls.

I'm not sure about the change in videoout_ivtv.cpp.  It compiles fine
for me, but might not for someone else with different glibc/kernel
headers.

David
-- 
David Engel
dlengel at attbi.com

Index: libs/libmythtv/ivtv-ext-api.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/ivtv-ext-api.h,v
retrieving revision 1.3
diff -u -r1.3 ivtv-ext-api.h
--- libs/libmythtv/ivtv-ext-api.h	13 Sep 2003 06:52:52 -0000	1.3
+++ libs/libmythtv/ivtv-ext-api.h	28 Oct 2003 04:21:02 -0000
@@ -144,14 +144,14 @@
   int y1;
 };
 
-#define IVTVFB_IOCTL_GET_STATE          _IOR('@', 1, sizeof(struct ivtvfb_ioctl_state_info))
-#define IVTVFB_IOCTL_SET_STATE          _IOW('@', 2, sizeof(struct ivtvfb_ioctl_state_info))
-#define IVTVFB_IOCTL_PREP_FRAME         _IOW('@', 3, 2*4)
-#define IVTVFB_IOCTL_BLT_COPY           _IOW('@', 4, sizeof(struct ivtvfb_ioctl_blt_copy_args))
-#define IVTVFB_IOCTL_GET_ACTIVE_BUFFER  _IOR('@', 5, sizeof(struct ivtv_osd_coords))
-#define IVTVFB_IOCTL_SET_ACTIVE_BUFFER  _IOW('@', 6, sizeof(struct ivtv_osd_coords))
-#define IVTVFB_IOCTL_GET_FRAME_BUFFER   _IOR('@', 7, sizeof(struct ivtvfb_ioctl_get_frame_buffer))
+#define IVTVFB_IOCTL_GET_STATE          _IOR('@', 1, struct ivtvfb_ioctl_state_info)
+#define IVTVFB_IOCTL_SET_STATE          _IOW('@', 2, struct ivtvfb_ioctl_state_info)
+#define IVTVFB_IOCTL_PREP_FRAME         _IOW('@', 3, struct ivtvfb_ioctl_dma_host_to_ivtv_args)
+#define IVTVFB_IOCTL_BLT_COPY           _IOW('@', 4, struct ivtvfb_ioctl_blt_copy_args)
+#define IVTVFB_IOCTL_GET_ACTIVE_BUFFER  _IOR('@', 5, struct ivtv_osd_coords)
+#define IVTVFB_IOCTL_SET_ACTIVE_BUFFER  _IOW('@', 6, struct ivtv_osd_coords)
+#define IVTVFB_IOCTL_GET_FRAME_BUFFER   _IOR('@', 7, struct ivtvfb_ioctl_get_frame_buffer)
 
 #define IVTVFB_STATUS_ENABLED           (1 << 0)
 #define IVTVFB_STATUS_GLOBAL_ALPHA      (1 << 1)
Index: libs/libmythtv/videoout_ivtv.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/videoout_ivtv.cpp,v
retrieving revision 1.14
diff -u -r1.14 videoout_ivtv.cpp
--- libs/libmythtv/videoout_ivtv.cpp	26 Oct 2003 07:38:54 -0000	1.14
+++ libs/libmythtv/videoout_ivtv.cpp	28 Oct 2003 04:21:04 -0000
@@ -13,8 +13,8 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/user.h>
-#include <linux/fb.h>
+//#include <linux/fb.h>
 
 #include <map>
 #include <iostream>