update to 3.93; add a patch to fix some compile time warnings because OpenGL

support is disabled.
This commit is contained in:
robert 2004-06-25 00:14:38 +00:00
parent 1d8aaa262c
commit 3fcb82b52b
3 changed files with 44 additions and 5 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2004/05/15 23:27:26 robert Exp $
# $OpenBSD: Makefile,v 1.6 2004/06/25 00:14:38 robert Exp $
ONLY_FOR_ARCHS= i386 macppc
COMMENT= "TV viewing application for bktr(4) cards"
DISTNAME= xawtv-3.92
DISTNAME= xawtv-3.93
CATEGORIES= x11
MAINTAINER= Robert Nagy <robert@openbsd.org>

View File

@ -1,3 +1,3 @@
MD5 (xawtv-3.92.tar.gz) = 5a59209805d0ef92958ce547b12d17c8
RMD160 (xawtv-3.92.tar.gz) = 4d62e6f4e3052f079f930c6aa03d4beda342a940
SHA1 (xawtv-3.92.tar.gz) = 03b9fa5bb23672b503608387c3acbe480a59574a
MD5 (xawtv-3.93.tar.gz) = 8d2731e6e95f173f41a0ddc875d55804
RMD160 (xawtv-3.93.tar.gz) = dc5b07c383aa00232e1ae2f09b1779b2d30e45b5
SHA1 (xawtv-3.93.tar.gz) = 9fcdae210979b3e004c7b530130673add54abc89

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-x11_blit_c,v 1.1 2004/06/25 00:14:38 robert Exp $
--- x11/blit.c.orig Tue May 4 11:41:59 2004
+++ x11/blit.c Fri Jun 25 02:14:46 2004
@@ -42,7 +42,9 @@
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 @@
return 0;
}
+#if HAVE_GL
static int
catch_gl_error(Display * dpy, XErrorEvent * event)
{
@@ -97,6 +100,7 @@
gl_error++;
return 0;
}
+#endif
/* ------------------------------------------------------------------------ */
/* plain X11 stuff */
@@ -672,7 +676,9 @@
STATUS_BROKEN = 1,
STATUS_CONVERT = 2,
STATUS_XVIDEO = 3,
+#if HAVE_GL
STATUS_OPENGL = 4,
+#endif
};
struct blit_state {