freebsd-ports/devel/sdl12/files/patch-ac

$FreeBSD$

--- configure.orig	Tue Mar 27 06:39:34 2001
+++ configure	Mon Apr  2 11:25:59 2001
@@ -84,6 +84,8 @@
 ac_help="$ac_help
   --enable-video-svga     use SVGAlib video driver [default=no]"
 ac_help="$ac_help
+  --enable-video-vgl     use VGL video driver [default=no]"
+ac_help="$ac_help
   --enable-video-aalib    use AAlib video driver [default=no]"
 ac_help="$ac_help
   --enable-video-opengl   include OpenGL context creation [default=yes]"
@@ -621,7 +623,7 @@
 SDL_MAJOR_VERSION=1
 SDL_MINOR_VERSION=2
 SDL_MICRO_VERSION=0
-SDL_INTERFACE_AGE=0
+SDL_INTERFACE_AGE=3
 SDL_BINARY_AGE=0
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 
@@ -634,9 +636,9 @@
 
 # libtool versioning
 LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
-LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
+LT_CURRENT=$SDL_INTERFACE_AGE
 LT_REVISION=$SDL_INTERFACE_AGE
-LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
+LT_AGE=$SDL_INTERFACE_AGE
 
 
 
@@ -3042,7 +3044,7 @@
 
 
 SDL_CFLAGS=""
-SDL_LIBS="-lSDL"
+SDL_LIBS="-lSDL-1.1"
 
 
 case "$target" in
@@ -5226,6 +5228,57 @@
     fi
 }
 
+CheckVGL()
+{
+    # Check whether --enable-video-vgl or --disable-video-vgl was given.
+if test "${enable_video_vgl+set}" = set; then
+  enableval="$enable_video_vgl"
+  :
+else
+  enable_video_vgl=no
+fi
+
+    if test x$enable_video = xyes -a x$enable_video_vgl = xyes; then
+        echo $ac_n "checking for libVGL support""... $ac_c" 1>&6
+echo "configure:5162: checking for libVGL support" >&5
+        video_vgl=no
+        cat > conftest.$ac_ext <<EOF
+#line 5165 "configure"
+#include "confdefs.h"
+
+         #include <sys/fbio.h>
+         #include <sys/consio.h>
+         #include <sys/kbio.h>
+         #include <vgl.h>
+        
+int main() {
+
+         VGLBitmap bitmap;
+         exit(bitmap.PixelBytes);
+        
+; return 0; }
+EOF
+if { (eval echo configure:5180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+        video_vgl=yes
+        
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+        echo "$ac_t""$video_vgl" 1>&6
+        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
+}
+
 CheckAAlib()
 {
     # Check whether --enable-video-aalib or --disable-video-aalib was given.
@@ -5451,8 +5504,8 @@
 #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
             ;;
         *-*-freebsd*)
-            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-            pthread_lib="-pthread"
+            pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
+            pthread_lib="${PTHREAD_LIBS}"
             ;;
         *-*-openbsd*)
             pthread_cflags="-D_REENTRANT"
@@ -6193,6 +6246,7 @@
         CheckX11
         CheckDGA
         CheckSVGA
+        CheckVGL
         CheckAAlib
         CheckOpenGL
         CheckPTHREAD
@@ -6378,10 +6432,10 @@
   cat >>$new <$old
 
         # Set up files for the audio library
-        if test x$enable_audio = xyes; then
-            AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
-            AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
-        fi
+        #if test x$enable_audio = xyes; then
+        #    AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
+        #    AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
+        #fi
         # Set up files for the joystick library
         # (No joystick support yet)
         if test x$enable_joystick = xyes; then
@@ -8818,6 +8872,7 @@
 src/video/macdsp/Makefile
 src/video/macrom/Makefile
 src/video/svga/Makefile
+src/video/vgl/Makefile
 src/video/aalib/Makefile
 src/video/wincommon/Makefile
 src/video/windib/Makefile
@@ -9042,6 +9097,7 @@
 src/video/macdsp/Makefile
 src/video/macrom/Makefile
 src/video/svga/Makefile
+src/video/vgl/Makefile
 src/video/aalib/Makefile
 src/video/wincommon/Makefile
 src/video/windib/Makefile