17fa2fb91c
- fill in missing ioctls xawtv might use in xioctl() - link libossaudio into lib/xawtv/snd-oss.so - install bin/record and bin/pia, since they are now working* - sync patches a'la update-patches *still a possible issue with SNDCTL_DSP_GETISPACE which should be fixed soon "if it works please go ahead" robert@ (MAINTAINER)
40 lines
1.1 KiB
Plaintext
40 lines
1.1 KiB
Plaintext
$OpenBSD: patch-x11_blit_c,v 1.2 2007/09/28 08:24:42 jakemsr Exp $
|
|
--- x11/blit.c.orig Tue May 4 02:41:59 2004
|
|
+++ x11/blit.c Thu Sep 27 15:37:48 2007
|
|
@@ -42,7 +42,9 @@ static unsigned int display_bytes = 0;
|
|
static unsigned int pixmap_bytes = 0;
|
|
static bool x11_byteswap = 0;
|
|
static int no_mitshm = 0;
|
|
+#if HAVE_GL
|
|
static int gl_error = 0;
|
|
+#endif
|
|
|
|
#if HAVE_LIBXV
|
|
static int ver, rel, req, ev, err;
|
|
@@ -90,6 +92,7 @@ catch_no_mitshm(Display * dpy, XErrorEvent * event)
|
|
return 0;
|
|
}
|
|
|
|
+#if HAVE_GL
|
|
static int
|
|
catch_gl_error(Display * dpy, XErrorEvent * event)
|
|
{
|
|
@@ -97,6 +100,7 @@ catch_gl_error(Display * dpy, XErrorEvent * event)
|
|
gl_error++;
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
/* plain X11 stuff */
|
|
@@ -672,7 +676,9 @@ enum blit_status {
|
|
STATUS_BROKEN = 1,
|
|
STATUS_CONVERT = 2,
|
|
STATUS_XVIDEO = 3,
|
|
+#if HAVE_GL
|
|
STATUS_OPENGL = 4,
|
|
+#endif
|
|
};
|
|
|
|
struct blit_state {
|