summaryrefslogtreecommitdiff
path: root/devel/sdl-devel/files/patch-ac
blob: 67930064f5d7141b95e5f5a257e46a26ada76b39 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
$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