]>
Commit | Line | Data |
---|---|---|
0469463c JB |
1 | --- xine-lib-1-rc8/configure.ac.orig 2004-12-14 23:06:47.000000000 +0100 |
2 | +++ xine-lib-1-rc8/configure.ac 2004-12-21 21:03:55.484299736 +0100 | |
3 | @@ -460,21 +460,6 @@ | |
4 | AM_PATH_OPENGL() | |
39303e0e JB |
5 | |
6 | ||
7 | -dnl --------------------------------------------- | |
8 | -dnl Check for platform which supports syncfb | |
9 | -dnl --------------------------------------------- | |
10 | - | |
11 | -case "$host_or_hostalias" in | |
12 | - *linux* ) | |
13 | - have_syncfb="yes" | |
14 | - ;; | |
15 | - *) | |
16 | - have_syncfb="no" | |
17 | - ;; | |
18 | -esac | |
19 | -AM_CONDITIONAL(HAVE_SYNCFB, test x"$have_syncfb" = "xyes") | |
20 | - | |
21 | - | |
22 | dnl ---------------------------------------------- | |
23 | dnl Check for usable video-for-linux (v4l) support | |
24 | dnl ---------------------------------------------- | |
0469463c JB |
25 | @@ -555,6 +540,21 @@ |
26 | esac | |
39303e0e JB |
27 | AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes") |
28 | ||
39303e0e JB |
29 | +dnl --------------------------------------------- |
30 | +dnl Check for platform which supports syncfb | |
31 | +dnl --------------------------------------------- | |
32 | + | |
33 | +case "$host_or_hostalias" in | |
34 | + *linux* ) | |
35 | + have_syncfb="yes" | |
36 | + ;; | |
37 | + *) | |
38 | + have_syncfb="no" | |
39 | + ;; | |
40 | +esac | |
41 | +AM_CONDITIONAL(HAVE_SYNCFB, test x"$have_syncfb" = "xyes") | |
42 | + | |
43 | + | |
0469463c JB |
44 | dnl |
45 | dnl Check if we can enable the xxmc plugin. | |
46 | dnl | |
47 | @@ -2451,7 +2451,7 @@ | |
48 | if test x"$no_x" != "xyes"; then | |
49 | echo " - XShm (X11 shared memory)" | |
50 | dnl synfb | |
51 | - if test x$ac_have_syncfb = "xyes"; then | |
52 | + if test x$have_syncfb = "xyes"; then | |
53 | echo " - SyncFB (for Matrox G200/G400 cards)" | |
54 | fi | |
55 | dnl Xv | |
56 | --- xine-lib-1-rc8/src/video_out/video_out_syncfb.c.orig 2004-12-12 23:01:28.000000000 +0100 | |
57 | +++ xine-lib-1-rc8/src/video_out/video_out_syncfb.c 2004-12-21 21:18:33.031892224 +0100 | |
58 | @@ -46,6 +46,7 @@ | |
59 | #include <sys/mman.h> | |
60 | #include <math.h> | |
61 | #include <fcntl.h> | |
62 | +#include <unistd.h> | |
63 | ||
64 | #include <X11/Xlib.h> | |
65 | #include <X11/Xutil.h> | |
66 | @@ -566,6 +567,7 @@ | |
39303e0e | 67 | |
0469463c JB |
68 | static void syncfb_overlay_blend(vo_driver_t* this_gen, vo_frame_t* frame_gen, vo_overlay_t* overlay) |
69 | { | |
70 | + syncfb_driver_t* this = (syncfb_driver_t *) this_gen; | |
71 | syncfb_frame_t* frame = (syncfb_frame_t *) frame_gen; | |
72 | ||
73 | /* alpha blend here */ |