Added patches from FreeBSD ports

libsdl-org · Jun 19, 2001 · adb20fd · adb20fd
1 parent c246507
commit adb20fd
Show file tree

Hide file tree

Showing 14 changed files with 1,334 additions and 1 deletion.
diff --git a/configure.in b/configure.in
@@ -749,6 +749,37 @@ CheckSVGA()
     fi
 }
 
+dnl Find the VGL includes and libraries
+CheckVGL()
+{
+    AC_ARG_ENABLE(video-vgl,
+[  --enable-video-vgl     use VGL video driver [default=no]],
+                  , enable_video_vgl=no)
+    if test x$enable_video = xyes -a x$enable_video_vgl = xyes; then
+        AC_MSG_CHECKING(for libVGL support)
+        video_vgl=no
+        AC_TRY_COMPILE([
+         #include <sys/fbio.h>
+         #include <sys/consio.h>
+         #include <sys/kbio.h>
+         #include <vgl.h>
+        ],[
+         VGLBitmap bitmap;
+         exit(bitmap.PyxelBytes);
+        ],[
+        video_vgl=yes
+        ])
+        AC_MSG_RESULT($video_vgl)
+        if test x$video_vgl = xyes; then
+            CFLAGS="$CFLAGS -DENABLE_VGL"
+            SYSTEM_LIBS="$SYSTEM_LIBS -lvgl"
+
+            VIDEO_SUBDIRS="$VIDEO_SUBDIRS vgl"
+            VIDEO_DRIVERS="$VIDEO_DRIVERS vgl/libvideo_vgl.la"
+        fi
+    fi
+}
+
 dnl Find the AAlib includes
 CheckAAlib()
 {
@@ -1202,6 +1233,7 @@ case "$target" in
         CheckX11
         CheckDGA
         CheckSVGA
+        CheckVGL
         CheckAAlib
         CheckOpenGL
         CheckPTHREAD
@@ -2044,6 +2076,7 @@ src/video/macdsp/Makefile
 src/video/macrom/Makefile
 src/video/quartz/Makefile
 src/video/svga/Makefile
+src/video/vgl/Makefile
 src/video/aalib/Makefile
 src/video/wincommon/Makefile
 src/video/windib/Makefile

diff --git a/docs.html b/docs.html
@@ -16,6 +16,7 @@ <H2>
 Major changes since SDL 1.0.0:
 </H2>
 <UL>
+	<LI> 1.2.2: Added FreeBSD VGL video driver from FreeBSD ports
 	<LI> 1.2.1: Added Linux PlayStation 2 Graphics Synthesizer support
 	<LI> 1.2.1: Added an audio driver that writes to disk (thanks Ryan!)
 	<LI> 1.2.1: Mouse wheel sends mouse button (4/5) events on Windows

diff --git a/src/video/Makefile.am b/src/video/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libvideo.la
 
 # Define which subdirectories need to be built
 SUBDIRS = @VIDEO_SUBDIRS@
-DIST_SUBDIRS = dummy x11 dga nanox fbcon svga ggi aalib \
+DIST_SUBDIRS = dummy x11 dga nanox fbcon vgl svga ggi aalib \
                wincommon windib windx5 \
                maccommon macdsp macrom quartz \
                bwindow ps2gs photon cybergfx

diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
@@ -343,6 +343,9 @@ extern VideoBootStrap PS2GS_bootstrap;
 #ifdef ENABLE_GGI
 extern VideoBootStrap GGI_bootstrap;
 #endif
+#ifdef ENABLE_VGL
+extern VideoBootStrap VGL_bootstrap;
+#endif
 #ifdef ENABLE_SVGALIB
 extern VideoBootStrap SVGALIB_bootstrap;
 #endif

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -63,6 +63,9 @@ static VideoBootStrap *bootstrap[] = {
 #ifdef ENABLE_GGI
 	&GGI_bootstrap,
 #endif
+#ifdef ENABLE_VGL
+	&VGL_bootstrap,
+#endif
 #ifdef ENABLE_SVGALIB
 	&SVGALIB_bootstrap,
 #endif

diff --git a/src/video/svga/SDL_svgaevents.c b/src/video/svga/SDL_svgaevents.c
@@ -28,6 +28,7 @@ static char rcsid =
 /* Handle the event stream, converting X11 events into SDL events */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <vga.h>
 #include <vgamouse.h>

diff --git a/src/video/vgl/Makefile.am b/src/video/vgl/Makefile.am
@@ -0,0 +1,15 @@
+
+## Makefile.am for SDL using the libVGL video driver
+
+noinst_LTLIBRARIES = libvideo_vgl.la
+libvideo_vgl_la_SOURCES = $(VGL_SRCS)
+
+# The SDL libVGL video driver sources
+VGL_SRCS = 			\
+	SDL_vglvideo.h		\
+	SDL_vglevents.c		\
+	SDL_vglevents_c.h	\
+	SDL_vglmouse.c		\
+	SDL_vglmouse_c.h	\
+	SDL_vglvideo.c
+