diff --git a/configure b/configure index 80bce42b3a06099f395c88a728338b8b26fae349..079ae42622c4514e98e29038fd81815da9bd31cb 100755 --- a/configure +++ b/configure @@ -3553,6 +3553,96 @@ echo "configure: warning: XFree86 VMODE extension not found!!" 1>&2 fi done + + for ac_hdr in X11/extensions/Xvlib.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3562: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 3567 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + echo $ac_n "checking for XvShmCreateImage in -lXv""... $ac_c" 1>&6 +echo "configure:3593: checking for XvShmCreateImage in -lXv" >&5 +ac_lib_var=`echo Xv'_'XvShmCreateImage | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lXv $X_LIBS -lXext -lX11 $X_EXTRA_LIBS + $LIBS" +cat > conftest.$ac_ext <<EOF +#line 3602 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XvShmCreateImage(); + +int main() { +XvShmCreateImage() +; return 0; } +EOF +if { (eval echo configure:3613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_XVIDEO 1 +EOF + + X_PRE_LIBS="$X_PRE_LIBS -lXv" + +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: XVideo extension not found !!" 1>&2 + +fi +done + + else @@ -3566,17 +3656,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3570: checking for $ac_hdr" >&5 +echo "configure:3660: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3575 "configure" +#line 3665 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3605,19 +3695,19 @@ done if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes" then echo $ac_n "checking "for up-to-date OpenGL version"""... $ac_c" 1>&6 -echo "configure:3609: checking "for up-to-date OpenGL version"" >&5 +echo "configure:3699: checking "for up-to-date OpenGL version"" >&5 if eval "test \"`echo '$''{'wine_cv_opengl_version_OK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3614 "configure" +#line 3704 "configure" #include "confdefs.h" #include <GL/gl.h> int main() { GLenum test = GL_UNSIGNED_SHORT_5_6_5; ; return 0; } EOF -if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_opengl_version_OK="yes" else @@ -3634,21 +3724,21 @@ fi echo "$ac_t""$wine_cv_opengl_version_OK" 1>&6 echo $ac_n "checking "for thread-safe OpenGL version"""... $ac_c" 1>&6 -echo "configure:3638: checking "for thread-safe OpenGL version"" >&5 +echo "configure:3728: checking "for thread-safe OpenGL version"" >&5 if eval "test \"`echo '$''{'wine_cv_opengl_version_threadsafe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_libs=$LIBS LIBS="$X_LIBS -lGL" cat > conftest.$ac_ext <<EOF -#line 3645 "configure" +#line 3735 "configure" #include "confdefs.h" int main() { pthread_getspecific(); ; return 0; } EOF -if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wine_cv_opengl_version_threadsafe="yes" else @@ -3667,7 +3757,7 @@ echo "$ac_t""$wine_cv_opengl_version_threadsafe" 1>&6 if test "$wine_cv_opengl_version_OK" = "yes" -a \( "$wine_cv_opengl_version_threadsafe" = "no" -o $OPENGL = "yes" \) then echo $ac_n "checking for glXCreateContext in -lGL""... $ac_c" 1>&6 -echo "configure:3671: checking for glXCreateContext in -lGL" >&5 +echo "configure:3761: checking for glXCreateContext in -lGL" >&5 ac_lib_var=`echo GL'_'glXCreateContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3675,7 +3765,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3679 "configure" +#line 3769 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3686,7 +3776,7 @@ int main() { glXCreateContext() ; return 0; } EOF -if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3719,7 +3809,7 @@ EOF if test $ac_cv_lib_GL_glXCreateContext = "yes" then echo $ac_n "checking for glXGetProcAddressARB in -lGL""... $ac_c" 1>&6 -echo "configure:3723: checking for glXGetProcAddressARB in -lGL" >&5 +echo "configure:3813: checking for glXGetProcAddressARB in -lGL" >&5 ac_lib_var=`echo GL'_'glXGetProcAddressARB | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3727,7 +3817,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3731 "configure" +#line 3821 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3738,7 +3828,7 @@ int main() { glXGetProcAddressARB() ; return 0; } EOF -if { (eval echo configure:3742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3765,12 +3855,12 @@ fi if test $ac_cv_lib_GL_glXGetProcAddressARB = "yes" then echo $ac_n "checking "for OpenGL extension functions prototypes"""... $ac_c" 1>&6 -echo "configure:3769: checking "for OpenGL extension functions prototypes"" >&5 +echo "configure:3859: checking "for OpenGL extension functions prototypes"" >&5 if eval "test \"`echo '$''{'wine_cv_extension_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3774 "configure" +#line 3864 "configure" #include "confdefs.h" #include <GL/gl.h> #ifdef HAVE_GL_GLEXT_H @@ -3781,7 +3871,7 @@ int main() { PFNGLCOLORTABLEEXTPROC test_proc; ; return 0; } EOF -if { (eval echo configure:3785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_extension_prototypes="yes" else @@ -3826,17 +3916,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3830: checking for $ac_hdr" >&5 +echo "configure:3920: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3835 "configure" +#line 3925 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3865,7 +3955,7 @@ done if test "$ac_cv_header_ncurses_h" = "yes" then echo $ac_n "checking for waddch in -lncurses""... $ac_c" 1>&6 -echo "configure:3869: checking for waddch in -lncurses" >&5 +echo "configure:3959: checking for waddch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3873,7 +3963,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3877 "configure" +#line 3967 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3884,7 +3974,7 @@ int main() { waddch() ; return 0; } EOF -if { (eval echo configure:3888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3915,7 +4005,7 @@ fi if test "$ac_cv_lib_ncurses_waddch" = "yes" then echo $ac_n "checking for resizeterm in -lncurses""... $ac_c" 1>&6 -echo "configure:3919: checking for resizeterm in -lncurses" >&5 +echo "configure:4009: checking for resizeterm in -lncurses" >&5 ac_lib_var=`echo ncurses'_'resizeterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3923,7 +4013,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3927 "configure" +#line 4017 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3934,7 +4024,7 @@ int main() { resizeterm() ; return 0; } EOF -if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3958,7 +4048,7 @@ else fi echo $ac_n "checking for getbkgd in -lncurses""... $ac_c" 1>&6 -echo "configure:3962: checking for getbkgd in -lncurses" >&5 +echo "configure:4052: checking for getbkgd in -lncurses" >&5 ac_lib_var=`echo ncurses'_'getbkgd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3966,7 +4056,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3970 "configure" +#line 4060 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3977,7 +4067,7 @@ int main() { getbkgd() ; return 0; } EOF -if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4005,17 +4095,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4009: checking for $ac_hdr" >&5 +echo "configure:4099: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4014 "configure" +#line 4104 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4044,7 +4134,7 @@ done if test "$ac_cv_header_curses_h" = "yes" then echo $ac_n "checking for waddch in -lcurses""... $ac_c" 1>&6 -echo "configure:4048: checking for waddch in -lcurses" >&5 +echo "configure:4138: checking for waddch in -lcurses" >&5 ac_lib_var=`echo curses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4052,7 +4142,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4056 "configure" +#line 4146 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4063,7 +4153,7 @@ int main() { waddch() ; return 0; } EOF -if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4093,7 +4183,7 @@ fi if test "$ac_cv_lib_curses_waddch" = "yes" then echo $ac_n "checking for resizeterm in -lcurses""... $ac_c" 1>&6 -echo "configure:4097: checking for resizeterm in -lcurses" >&5 +echo "configure:4187: checking for resizeterm in -lcurses" >&5 ac_lib_var=`echo curses'_'resizeterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4101,7 +4191,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4105 "configure" +#line 4195 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4112,7 +4202,7 @@ int main() { resizeterm() ; return 0; } EOF -if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4136,7 +4226,7 @@ else fi echo $ac_n "checking for getbkgd in -lcurses""... $ac_c" 1>&6 -echo "configure:4140: checking for getbkgd in -lcurses" >&5 +echo "configure:4230: checking for getbkgd in -lcurses" >&5 ac_lib_var=`echo curses'_'getbkgd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4144,7 +4234,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4148 "configure" +#line 4238 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4155,7 +4245,7 @@ int main() { getbkgd() ; return 0; } EOF -if { (eval echo configure:4159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4184,12 +4274,12 @@ fi fi echo $ac_n "checking "for GNU style IPX support"""... $ac_c" 1>&6 -echo "configure:4188: checking "for GNU style IPX support"" >&5 +echo "configure:4278: checking "for GNU style IPX support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ipx_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4193 "configure" +#line 4283 "configure" #include "confdefs.h" #include <sys/socket.h> #include <netipx/ipx.h> @@ -4197,7 +4287,7 @@ int main() { ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_gnu="yes" else @@ -4222,12 +4312,12 @@ fi if test "$ac_cv_c_ipx_gnu" = "no" then echo $ac_n "checking "for linux style IPX support"""... $ac_c" 1>&6 -echo "configure:4226: checking "for linux style IPX support"" >&5 +echo "configure:4316: checking "for linux style IPX support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ipx_linux'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4231 "configure" +#line 4321 "configure" #include "confdefs.h" #include <sys/socket.h> #include <asm/types.h> @@ -4236,7 +4326,7 @@ int main() { ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_linux="yes" else @@ -4263,17 +4353,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4267: checking for $ac_hdr" >&5 +echo "configure:4357: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4272 "configure" +#line 4362 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4301,12 +4391,12 @@ done echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 -echo "configure:4305: checking "for Open Sound System"" >&5 +echo "configure:4395: checking "for Open Sound System"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4310 "configure" +#line 4400 "configure" #include "confdefs.h" #if defined(HAVE_SYS_SOUNDCARD_H) @@ -4327,7 +4417,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" else @@ -4350,12 +4440,12 @@ EOF fi echo $ac_n "checking "for Open Sound System/MIDI interface"""... $ac_c" 1>&6 -echo "configure:4354: checking "for Open Sound System/MIDI interface"" >&5 +echo "configure:4444: checking "for Open Sound System/MIDI interface"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem_midi'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4359 "configure" +#line 4449 "configure" #include "confdefs.h" #if defined(HAVE_SYS_SOUNDCARD_H) @@ -4376,7 +4466,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem_midi="yes" else @@ -4405,7 +4495,7 @@ if test "x${GCC}" = "xyes" then CFLAGS="$CFLAGS -Wall" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 -echo "configure:4409: checking "for gcc strength-reduce bug"" >&5 +echo "configure:4499: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4413,7 +4503,7 @@ else ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <<EOF -#line 4417 "configure" +#line 4507 "configure" #include "confdefs.h" int main(void) { @@ -4424,7 +4514,7 @@ int main(void) { exit( Array[1] != -2 ); } EOF -if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" else @@ -4447,7 +4537,7 @@ fi echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 -echo "configure:4451: checking "whether external symbols need an underscore prefix"" >&5 +echo "configure:4541: checking "whether external symbols need an underscore prefix"" >&5 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4459,14 +4549,14 @@ _ac_test: .long 0 EOF cat > conftest.$ac_ext <<EOF -#line 4463 "configure" +#line 4553 "configure" #include "confdefs.h" extern int ac_test; int main() { if (ac_test) return 1 ; return 0; } EOF -if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_extern_prefix="yes" else @@ -4490,7 +4580,7 @@ fi echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 -echo "configure:4494: checking "whether assembler accepts .string"" >&5 +echo "configure:4584: checking "whether assembler accepts .string"" >&5 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4500,14 +4590,14 @@ cat > conftest_asm.s <<EOF .string "test" EOF cat > conftest.$ac_ext <<EOF -#line 4504 "configure" +#line 4594 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_asm_string="yes" else @@ -4534,21 +4624,21 @@ LDSHARED="" if test "$LIBEXT" = "so" then echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6 -echo "configure:4538: checking "whether we can build a Linux dll"" >&5 +echo "configure:4628: checking "whether we can build a Linux dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0" cat > conftest.$ac_ext <<EOF -#line 4545 "configure" +#line 4635 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_linux="yes" else @@ -4568,21 +4658,21 @@ echo "$ac_t""$ac_cv_c_dll_linux" 1>&6 LDSHARED="\$(CC) -shared -Wl,-soname,\$(SONAME),-rpath,\$(libdir)" else echo $ac_n "checking whether we can build a UnixWare (Solaris) dll""... $ac_c" 1>&6 -echo "configure:4572: checking whether we can build a UnixWare (Solaris) dll" >&5 +echo "configure:4662: checking whether we can build a UnixWare (Solaris) dll" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_unixware'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0" cat > conftest.$ac_ext <<EOF -#line 4579 "configure" +#line 4669 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_unixware="yes" else @@ -4602,21 +4692,21 @@ echo "$ac_t""$ac_cv_c_dll_unixware" 1>&6 LDSHARED="\$(CC) -Wl,-G,-h,\$(libdir)/\$(SONAME)" else echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6 -echo "configure:4606: checking "whether we can build a NetBSD dll"" >&5 +echo "configure:4696: checking "whether we can build a NetBSD dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive" cat > conftest.$ac_ext <<EOF -#line 4613 "configure" +#line 4703 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_netbsd="yes" else @@ -4651,21 +4741,21 @@ if test "$LIBEXT" = "so"; then else DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode \$(X_LIBS) \$(XLIB)" echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6 -echo "configure:4655: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 +echo "configure:4745: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 if eval "test \"`echo '$''{'ac_cv_c_whole_archive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -Wl,--whole-archive -Wl,--no-whole-archive" cat > conftest.$ac_ext <<EOF -#line 4662 "configure" +#line 4752 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_whole_archive="yes" else @@ -4685,21 +4775,21 @@ echo "$ac_t""$ac_cv_c_whole_archive" 1>&6 DLL_LINK="-Wl,--whole-archive $DLL_LINK -Wl,--no-whole-archive" else echo $ac_n "checking whether the linker supports -z {all,default}extract (Linux)""... $ac_c" 1>&6 -echo "configure:4689: checking whether the linker supports -z {all,default}extract (Linux)" >&5 +echo "configure:4779: checking whether the linker supports -z {all,default}extract (Linux)" >&5 if eval "test \"`echo '$''{'ac_cv_c_allextract'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -Wl,-z,allextract -Wl,-z,defaultextract" cat > conftest.$ac_ext <<EOF -#line 4696 "configure" +#line 4786 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_allextract="yes" else @@ -4729,7 +4819,7 @@ fi wine_cv_libc_reentrant=no echo $ac_n "checking "for reentrant libc: __errno_location"""... $ac_c" 1>&6 -echo "configure:4733: checking "for reentrant libc: __errno_location"" >&5 +echo "configure:4823: checking "for reentrant libc: __errno_location"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r__errno_location'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4737,14 +4827,14 @@ else wine_cv_libc_r__errno_location=yes else cat > conftest.$ac_ext <<EOF -#line 4741 "configure" +#line 4831 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__errno_location(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r__errno_location=yes else @@ -4769,7 +4859,7 @@ EOF wine_cv_libc_reentrant=__errno_location fi echo $ac_n "checking "for reentrant libc: __error"""... $ac_c" 1>&6 -echo "configure:4773: checking "for reentrant libc: __error"" >&5 +echo "configure:4863: checking "for reentrant libc: __error"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r__error'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4777,14 +4867,14 @@ else wine_cv_libc_r__error=yes else cat > conftest.$ac_ext <<EOF -#line 4781 "configure" +#line 4871 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__error(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r__error=yes else @@ -4809,7 +4899,7 @@ EOF wine_cv_libc_reentrant=__error fi echo $ac_n "checking "for reentrant libc: ___errno"""... $ac_c" 1>&6 -echo "configure:4813: checking "for reentrant libc: ___errno"" >&5 +echo "configure:4903: checking "for reentrant libc: ___errno"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r___errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4817,14 +4907,14 @@ else wine_cv_libc_r___errno=yes else cat > conftest.$ac_ext <<EOF -#line 4821 "configure" +#line 4911 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *___errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r___errno=yes else @@ -4849,7 +4939,7 @@ EOF wine_cv_libc_reentrant=___errno fi echo $ac_n "checking "for reentrant libc: __thr_errno"""... $ac_c" 1>&6 -echo "configure:4853: checking "for reentrant libc: __thr_errno"" >&5 +echo "configure:4943: checking "for reentrant libc: __thr_errno"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r__thr_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4857,14 +4947,14 @@ else wine_cv_libc_r__thr_errno=yes else cat > conftest.$ac_ext <<EOF -#line 4861 "configure" +#line 4951 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__thr_errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r__thr_errno=yes else @@ -4900,7 +4990,7 @@ fi if test "$have_x" = "yes" -a "$wine_cv_libc_reentrant" != "no" then echo $ac_n "checking "for reentrant X libraries"""... $ac_c" 1>&6 -echo "configure:4904: checking "for reentrant X libraries"" >&5 +echo "configure:4994: checking "for reentrant X libraries"" >&5 if eval "test \"`echo '$''{'wine_cv_x_reentrant'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4946,14 +5036,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4950: checking whether byte ordering is bigendian" >&5 +echo "configure:5040: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 4957 "configure" +#line 5047 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4964,11 +5054,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 4972 "configure" +#line 5062 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4979,7 +5069,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4999,7 +5089,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 5003 "configure" +#line 5093 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -5012,7 +5102,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -5040,19 +5130,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5044: checking for working alloca.h" >&5 +echo "configure:5134: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5049 "configure" +#line 5139 "configure" #include "confdefs.h" #include <alloca.h> int main() { void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:5056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -5073,12 +5163,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5077: checking for alloca" >&5 +echo "configure:5167: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5082 "configure" +#line 5172 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -5106,7 +5196,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -5138,12 +5228,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5142: checking whether alloca needs Cray hooks" >&5 +echo "configure:5232: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5147 "configure" +#line 5237 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -5168,12 +5258,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5172: checking for $ac_func" >&5 +echo "configure:5262: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5177 "configure" +#line 5267 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5196,7 +5286,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5223,7 +5313,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5227: checking stack direction for C alloca" >&5 +echo "configure:5317: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5231,7 +5321,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 5235 "configure" +#line 5325 "configure" #include "confdefs.h" find_stack_direction () { @@ -5250,7 +5340,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -5302,12 +5392,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5306: checking for $ac_func" >&5 +echo "configure:5396: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5311 "configure" +#line 5401 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5330,7 +5420,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5407,17 +5497,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5411: checking for $ac_hdr" >&5 +echo "configure:5501: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5416 "configure" +#line 5506 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5444,12 +5534,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:5448: checking whether stat file-mode macros are broken" >&5 +echo "configure:5538: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5453 "configure" +#line 5543 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5502,12 +5592,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5506: checking for working const" >&5 +echo "configure:5596: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5511 "configure" +#line 5601 "configure" #include "confdefs.h" int main() { @@ -5556,7 +5646,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5577,21 +5667,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5581: checking for inline" >&5 +echo "configure:5671: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 5588 "configure" +#line 5678 "configure" #include "confdefs.h" int main() { } int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5617,12 +5707,12 @@ EOF esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5621: checking for ANSI C header files" >&5 +echo "configure:5711: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5626 "configure" +#line 5716 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5630,7 +5720,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5647,7 +5737,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 5651 "configure" +#line 5741 "configure" #include "confdefs.h" #include <string.h> EOF @@ -5665,7 +5755,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 5669 "configure" +#line 5759 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -5686,7 +5776,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 5690 "configure" +#line 5780 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5697,7 +5787,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5721,12 +5811,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5725: checking for size_t" >&5 +echo "configure:5815: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5730 "configure" +#line 5820 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5754,7 +5844,7 @@ EOF fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:5758: checking size of long long" >&5 +echo "configure:5848: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5762,7 +5852,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext <<EOF -#line 5766 "configure" +#line 5856 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -5773,7 +5863,7 @@ main() exit(0); } EOF -if { (eval echo configure:5777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -5796,12 +5886,12 @@ EOF if test "$ac_cv_header_linux_joystick_h" = "yes" then echo $ac_n "checking "whether linux/joystick.h uses the Linux 2.2+ API"""... $ac_c" 1>&6 -echo "configure:5800: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 +echo "configure:5890: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_joystick_22_api'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5805 "configure" +#line 5895 "configure" #include "confdefs.h" #include <sys/ioctl.h> @@ -5816,7 +5906,7 @@ int main() { /*empty*/ ; return 0; } EOF -if { (eval echo configure:5820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_joystick_22_api=yes else @@ -5843,12 +5933,12 @@ fi if test "$ac_cv_header_sys_vfs_h" = "yes" then echo $ac_n "checking "whether sys/vfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5847: checking "whether sys/vfs.h defines statfs"" >&5 +echo "configure:5937: checking "whether sys/vfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5852 "configure" +#line 5942 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5865,7 +5955,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_vfs_has_statfs=yes else @@ -5892,12 +5982,12 @@ fi if test "$ac_cv_header_sys_statfs_h" = "yes" then echo $ac_n "checking "whether sys/statfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5896: checking "whether sys/statfs.h defines statfs"" >&5 +echo "configure:5986: checking "whether sys/statfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5901 "configure" +#line 5991 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5912,7 +6002,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_statfs_has_statfs=yes else @@ -5939,12 +6029,12 @@ fi if test "$ac_cv_header_sys_mount_h" = "yes" then echo $ac_n "checking "whether sys/mount.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5943: checking "whether sys/mount.h defines statfs"" >&5 +echo "configure:6033: checking "whether sys/mount.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5948 "configure" +#line 6038 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5959,7 +6049,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_mount_has_statfs=yes else @@ -5985,7 +6075,7 @@ fi echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6 -echo "configure:5989: checking "for statfs.f_bfree"" >&5 +echo "configure:6079: checking "for statfs.f_bfree"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5994,7 +6084,7 @@ else wine_cv_statfs_bfree=no else cat > conftest.$ac_ext <<EOF -#line 5998 "configure" +#line 6088 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6021,7 +6111,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bfree=yes else @@ -6045,7 +6135,7 @@ EOF fi echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6 -echo "configure:6049: checking "for statfs.f_bavail"" >&5 +echo "configure:6139: checking "for statfs.f_bavail"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6054,7 +6144,7 @@ else wine_cv_statfs_bavail=no else cat > conftest.$ac_ext <<EOF -#line 6058 "configure" +#line 6148 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6081,7 +6171,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bavail=yes else @@ -6106,12 +6196,12 @@ fi echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6 -echo "configure:6110: checking "for msg_accrights in struct msghdr"" >&5 +echo "configure:6200: checking "for msg_accrights in struct msghdr"" >&5 if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6115 "configure" +#line 6205 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6119,7 +6209,7 @@ int main() { struct msghdr hdr; hdr.msg_accrights=0 ; return 0; } EOF -if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_msg_accrights="yes" else @@ -6142,12 +6232,12 @@ fi echo $ac_n "checking "for sun_len in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:6146: checking "for sun_len in struct sockaddr_un"" >&5 +echo "configure:6236: checking "for sun_len in struct sockaddr_un"" >&5 if eval "test \"`echo '$''{'ac_cv_c_sun_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6151 "configure" +#line 6241 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6156,7 +6246,7 @@ int main() { static struct sockaddr_un addr; addr.sun_len = 1 ; return 0; } EOF -if { (eval echo configure:6160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_sun_len="yes" else @@ -6179,12 +6269,12 @@ fi echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6 -echo "configure:6183: checking "whether we need to define __i386__"" >&5 +echo "configure:6273: checking "whether we need to define __i386__"" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_def_i386'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6188 "configure" +#line 6278 "configure" #include "confdefs.h" #if (defined(i386) || defined(__i386)) && !defined(__i386__) yes diff --git a/configure.in b/configure.in index 3c4be24616478f53cd2b11b0c503dac1c2ec43de..dffb4096e9c098115d3799fb37792039bd69799e 100644 --- a/configure.in +++ b/configure.in @@ -227,6 +227,20 @@ then ], AC_MSG_WARN([XFree86 VMODE extension not found!!]) ) + + dnl *** Check for XVideo extension supporting XvImages + AC_CHECK_HEADERS(X11/extensions/Xvlib.h, + [ dnl *** If X11/extensions/Xvlib.h exists... + AC_CHECK_LIB(Xv, XvShmCreateImage, + [ AC_DEFINE(HAVE_XVIDEO) + X_PRE_LIBS="$X_PRE_LIBS -lXv" + ],, + $X_LIBS -lXext -lX11 $X_EXTRA_LIBS + ) + ], + AC_MSG_WARN([XVideo extension not found !!]) + ) + ] ) dnl *** End of X11/Xlib.h check diff --git a/include/acconfig.h b/include/acconfig.h index ba4242b1fa1d6a7405f64d2621680a783035fbe7..15e2fc3bc3c76820b7f8df08406193d690246540 100644 --- a/include/acconfig.h +++ b/include/acconfig.h @@ -113,3 +113,6 @@ /* Define if the OpenGL headers define extension typedefs */ #undef HAVE_GLEXT_PROTOTYPES + +/* Define if the X libraries support XVideo */ +#undef HAVE_XVIDEO diff --git a/include/config.h.in b/include/config.h.in index 843ef8d7e9518942ce60f30f055fba4155b8bde5..67b54f43e0598de0c50bc2e0424dbb6e923d8b81 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -149,6 +149,9 @@ /* Define if the OpenGL headers define extension typedefs */ #undef HAVE_GLEXT_PROTOTYPES +/* Define if the X libraries support XVideo */ +#undef HAVE_XVIDEO + /* The number of bytes in a long long. */ #undef SIZEOF_LONG_LONG @@ -260,6 +263,9 @@ /* Define if you have the <X11/extensions/XShm.h> header file. */ #undef HAVE_X11_EXTENSIONS_XSHM_H +/* Define if you have the <X11/extensions/Xvlib.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XVLIB_H + /* Define if you have the <X11/extensions/shape.h> header file. */ #undef HAVE_X11_EXTENSIONS_SHAPE_H diff --git a/include/ts_xvideo.h b/include/ts_xvideo.h new file mode 100644 index 0000000000000000000000000000000000000000..a8ff73a452e4b48afbde6ac08b939fd875bad26f --- /dev/null +++ b/include/ts_xvideo.h @@ -0,0 +1,47 @@ +/* + * Thread safe wrappers around xvideo calls. + * Always include this file instead of <X11/xvideo.h>. + * This file was generated automatically by tools/make_X11wrappers + * + * Copyright 1998 Kristian Nielsen + */ + +#ifndef __WINE_TS_XVIDEO_H +#define __WINE_TS_XVIDEO_H + +#include "config.h" + +#ifdef HAVE_XVIDEO + +#include <X11/Xlib.h> +#include <X11/extensions/Xv.h> +#include <X11/extensions/XShm.h> +#include <X11/extensions/Xvlib.h> + +extern int TSXvQueryExtension(Display*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*); +extern int TSXvQueryAdaptors(Display*, Window, unsigned int*, XvAdaptorInfo**); +extern int TSXvQueryEncodings(Display*, XvPortID, unsigned int*, XvEncodingInfo**); +extern int TSXvPutVideo(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int); +extern int TSXvPutStill(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int); +extern int TSXvGetVideo(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int); +extern int TSXvGetStill(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int); +extern int TSXvStopVideo(Display*, XvPortID, Drawable); +extern int TSXvGrabPort(Display*, XvPortID, Time); +extern int TSXvUngrabPort(Display*, XvPortID, Time); +extern int TSXvSelectVideoNotify(Display*, Drawable, Bool); +extern int TSXvSelectPortNotify(Display*, XvPortID, Bool); +extern int TSXvSetPortAttribute(Display*, XvPortID, Atom, int); +extern int TSXvGetPortAttribute(Display*, XvPortID, Atom, int*); +extern int TSXvQueryBestSize(Display*, XvPortID, Bool, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int*, unsigned int*); +extern XvAttribute* TSXvQueryPortAttributes(Display*, XvPortID, int*); +extern void TSXvFreeAdaptorInfo(XvAdaptorInfo*); +extern void TSXvFreeEncodingInfo(XvEncodingInfo*); +extern XvImageFormatValues * TSXvListImageFormats(Display*, XvPortID, int*); +extern XvImage * TSXvCreateImage(Display*, XvPortID, int, char*, int, int); +extern int TSXvPutImage(Display*, XvPortID, Drawable, GC, XvImage*, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int); +extern int TSXvShmPutImage(Display*, XvPortID, Drawable, GC, XvImage*, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int, Bool); +extern XvImage * TSXvShmCreateImage(Display*, XvPortID, int, char*, int, int, XShmSegmentInfo*); + +#endif /* defined(HAVE_XVIDEO) */ + +#endif /* __WINE_TS_XVIDEO_H */ diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers index 1a919e91bf7e98b6913c121ea4e9dddd4cab4559..b0fcb9a3ac1ca060ebe370a5465d0267c3d4bf83 100755 --- a/tools/make_X11wrappers +++ b/tools/make_X11wrappers @@ -17,7 +17,7 @@ $X11_include_dir = "/usr/X11/include"; $outdir = "tsx11"; $wantfile = "$outdir/X11_calls"; -@dolist = ("Xlib", "Xresource", "Xutil", "xpm", "XShm", "xf86dga", "xf86dga2", "xf86vmode", "shape"); +@dolist = ("Xlib", "Xresource", "Xutil", "xpm", "XShm", "xf86dga", "xf86dga2", "xf86vmode", "shape", "xvideo"); # First read list of wanted function names. @@ -86,7 +86,13 @@ foreach $name (@dolist) { $post_file = "#endif /* defined(HAVE_LIBXSHAPE) */\n"; $inc_name = "shape"; } - + if($name eq "xvideo") { + $x11_incl = "#include <X11/Xlib.h>\n#include <X11/extensions/Xv.h>\n#include <X11/extensions/XShm.h>\n"; + $extensions_dir = "extensions/"; + $pre_file = "#ifdef HAVE_XVIDEO\n"; + $post_file = "#endif /* defined(HAVE_XVIDEO) */\n"; + $inc_name = "Xvlib"; + } print OUTH <<END; @@ -227,6 +233,30 @@ END output_fn_short("Bool", "XDGASetClientVersion", "Display*"); output_fn_short("void", "XDGAChangePixmapMode", "Display*" ,"int", "int*", "int*", "int"); output_fn_short("void", "XDGAKeyEventToXKeyEvent", "XDGAKeyEvent*" ,"XKeyEvent*"); + } elsif ($name eq "xvideo") { + output_fn_short("int", "XvQueryExtension", "Display*", "unsigned int*", "unsigned int*", "unsigned int*", "unsigned int*", "unsigned int*"); + output_fn_short("int", "XvQueryAdaptors", "Display*", "Window", "unsigned int*", "XvAdaptorInfo**"); + output_fn_short("int", "XvQueryEncodings", "Display*", "XvPortID", "unsigned int*", "XvEncodingInfo**"); + output_fn_short("int", "XvPutVideo", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int"); + output_fn_short("int", "XvPutStill", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int"); + output_fn_short("int", "XvGetVideo", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int"); + output_fn_short("int", "XvGetStill", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int"); + output_fn_short("int", "XvStopVideo", "Display*", "XvPortID", "Drawable"); + output_fn_short("int", "XvGrabPort", "Display*", "XvPortID", "Time"); + output_fn_short("int", "XvUngrabPort", "Display*", "XvPortID", "Time"); + output_fn_short("int", "XvSelectVideoNotify", "Display*", "Drawable", "Bool"); + output_fn_short("int", "XvSelectPortNotify", "Display*", "XvPortID", "Bool"); + output_fn_short("int", "XvSetPortAttribute", "Display*", "XvPortID", "Atom", "int"); + output_fn_short("int", "XvGetPortAttribute", "Display*", "XvPortID", "Atom", "int*"); + output_fn_short("int", "XvQueryBestSize", "Display*", "XvPortID", "Bool", "unsigned int", "unsigned int", "unsigned int", "unsigned int", "unsigned int*", "unsigned int*"); + output_fn_short("XvAttribute*", "XvQueryPortAttributes", "Display*", "XvPortID", "int*"); + output_fn_short("void", "XvFreeAdaptorInfo", "XvAdaptorInfo*"); + output_fn_short("void", "XvFreeEncodingInfo", "XvEncodingInfo*"); + output_fn_short("XvImageFormatValues *", "XvListImageFormats", "Display*", "XvPortID", "int*"); + output_fn_short("XvImage *", "XvCreateImage", "Display*", "XvPortID", "int", "char*", "int", "int"); + output_fn_short("int", "XvPutImage", "Display*", "XvPortID", "Drawable", "GC", "XvImage*", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int"); + output_fn_short("int", "XvShmPutImage", "Display*", "XvPortID", "Drawable", "GC", "XvImage*", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int", "Bool"); +output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int", "char*", "int", "int", "XShmSegmentInfo*"); } elsif($name eq "xf86vmode") { output_fn("XF86VidModeQueryVersion",Bool, "Display*,int*,int*", diff --git a/tsx11/Makefile.in b/tsx11/Makefile.in index 88f846a6bbd50384b7db37501cd9df16983b68e9..c3bf8a4c8dfc6edaeb5f7d3bbe5ab4003ffb772a 100644 --- a/tsx11/Makefile.in +++ b/tsx11/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ ts_xshm.c \ ts_xlib.c \ ts_xresource.c \ + ts_xvideo.c \ ts_xutil.c \ ts_shape.c \ ts_xpm.c diff --git a/tsx11/X11_calls b/tsx11/X11_calls index 95bba544e31cfa4097eddf76e7d507969ee8f91b..fdafe70e6cf06e8823132a5ee00f6c031c36717f 100644 --- a/tsx11/X11_calls +++ b/tsx11/X11_calls @@ -227,3 +227,26 @@ XDGASync XDGASetClientVersion XDGAChangePixmapMode XDGAKeyEventToXKeyEvent +XvQueryExtension +XvQueryAdaptors +XvQueryEncodings +XvPutVideo +XvPutStill +XvGetVideo +XvGetStill +XvStopVideo +XvGrabPort +XvUngrabPort +XvSelectVideoNotify +XvSelectPortNotify +XvSetPortAttribute +XvGetPortAttribute +XvQueryBestSize +XvQueryPortAttributes +XvFreeAdaptorInfo +XvFreeEncodingInfo +XvListImageFormats +XvCreateImage +XvPutImage +XvShmPutImage +XvShmCreateImage diff --git a/tsx11/ts_xvideo.c b/tsx11/ts_xvideo.c new file mode 100644 index 0000000000000000000000000000000000000000..0197cf742c24c0aa722ae6ea428a1d93af40450d --- /dev/null +++ b/tsx11/ts_xvideo.c @@ -0,0 +1,272 @@ +/* + * Thread safe wrappers around xvideo calls. + * This file was generated automatically by tools/make_X11wrappers + * DO NOT EDIT! + */ + +#include "config.h" + +#ifdef HAVE_XVIDEO + +#include <X11/Xlib.h> +#include <X11/extensions/Xv.h> +#include <X11/extensions/XShm.h> +#include <X11/extensions/Xvlib.h> + +#include "debugtools.h" +#include "ts_xvideo.h" +#include "x11drv.h" + +DEFAULT_DEBUG_CHANNEL(x11) + +int TSXvQueryExtension(Display* a0, unsigned int* a1, unsigned int* a2, unsigned int* a3, unsigned int* a4, unsigned int* a5) +{ + int r; + TRACE("Call XvQueryExtension\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvQueryExtension( a0, a1, a2, a3, a4, a5); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvQueryExtension\n"); + return r; +} + +int TSXvQueryAdaptors(Display* a0, Window a1, unsigned int* a2, XvAdaptorInfo** a3) +{ + int r; + TRACE("Call XvQueryAdaptors\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvQueryAdaptors( a0, a1, a2, a3); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvQueryAdaptors\n"); + return r; +} + +int TSXvQueryEncodings(Display* a0, XvPortID a1, unsigned int* a2, XvEncodingInfo** a3) +{ + int r; + TRACE("Call XvQueryEncodings\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvQueryEncodings( a0, a1, a2, a3); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvQueryEncodings\n"); + return r; +} + +int TSXvPutVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) +{ + int r; + TRACE("Call XvPutVideo\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvPutVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvPutVideo\n"); + return r; +} + +int TSXvPutStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) +{ + int r; + TRACE("Call XvPutStill\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvPutStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvPutStill\n"); + return r; +} + +int TSXvGetVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) +{ + int r; + TRACE("Call XvGetVideo\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvGetVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvGetVideo\n"); + return r; +} + +int TSXvGetStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) +{ + int r; + TRACE("Call XvGetStill\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvGetStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvGetStill\n"); + return r; +} + +int TSXvStopVideo(Display* a0, XvPortID a1, Drawable a2) +{ + int r; + TRACE("Call XvStopVideo\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvStopVideo( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvStopVideo\n"); + return r; +} + +int TSXvGrabPort(Display* a0, XvPortID a1, Time a2) +{ + int r; + TRACE("Call XvGrabPort\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvGrabPort( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvGrabPort\n"); + return r; +} + +int TSXvUngrabPort(Display* a0, XvPortID a1, Time a2) +{ + int r; + TRACE("Call XvUngrabPort\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvUngrabPort( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvUngrabPort\n"); + return r; +} + +int TSXvSelectVideoNotify(Display* a0, Drawable a1, Bool a2) +{ + int r; + TRACE("Call XvSelectVideoNotify\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvSelectVideoNotify( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvSelectVideoNotify\n"); + return r; +} + +int TSXvSelectPortNotify(Display* a0, XvPortID a1, Bool a2) +{ + int r; + TRACE("Call XvSelectPortNotify\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvSelectPortNotify( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvSelectPortNotify\n"); + return r; +} + +int TSXvSetPortAttribute(Display* a0, XvPortID a1, Atom a2, int a3) +{ + int r; + TRACE("Call XvSetPortAttribute\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvSetPortAttribute( a0, a1, a2, a3); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvSetPortAttribute\n"); + return r; +} + +int TSXvGetPortAttribute(Display* a0, XvPortID a1, Atom a2, int* a3) +{ + int r; + TRACE("Call XvGetPortAttribute\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvGetPortAttribute( a0, a1, a2, a3); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvGetPortAttribute\n"); + return r; +} + +int TSXvQueryBestSize(Display* a0, XvPortID a1, Bool a2, unsigned int a3, unsigned int a4, unsigned int a5, unsigned int a6, unsigned int* a7, unsigned int* a8) +{ + int r; + TRACE("Call XvQueryBestSize\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvQueryBestSize( a0, a1, a2, a3, a4, a5, a6, a7, a8); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvQueryBestSize\n"); + return r; +} + +XvAttribute* TSXvQueryPortAttributes(Display* a0, XvPortID a1, int* a2) +{ + XvAttribute* r; + TRACE("Call XvQueryPortAttributes\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvQueryPortAttributes( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvQueryPortAttributes\n"); + return r; +} + +void TSXvFreeAdaptorInfo(XvAdaptorInfo* a0) +{ + TRACE("Call XvFreeAdaptorInfo\n"); + EnterCriticalSection( &X11DRV_CritSection ); + XvFreeAdaptorInfo( a0); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvFreeAdaptorInfo\n"); +} + +void TSXvFreeEncodingInfo(XvEncodingInfo* a0) +{ + TRACE("Call XvFreeEncodingInfo\n"); + EnterCriticalSection( &X11DRV_CritSection ); + XvFreeEncodingInfo( a0); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvFreeEncodingInfo\n"); +} + +XvImageFormatValues * TSXvListImageFormats(Display* a0, XvPortID a1, int* a2) +{ + XvImageFormatValues * r; + TRACE("Call XvListImageFormats\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvListImageFormats( a0, a1, a2); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvListImageFormats\n"); + return r; +} + +XvImage * TSXvCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5) +{ + XvImage * r; + TRACE("Call XvCreateImage\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvCreateImage( a0, a1, a2, a3, a4, a5); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvCreateImage\n"); + return r; +} + +int TSXvPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12) +{ + int r; + TRACE("Call XvPutImage\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvPutImage\n"); + return r; +} + +int TSXvShmPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12, Bool a13) +{ + int r; + TRACE("Call XvShmPutImage\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvShmPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvShmPutImage\n"); + return r; +} + +XvImage * TSXvShmCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5, XShmSegmentInfo* a6) +{ + XvImage * r; + TRACE("Call XvShmCreateImage\n"); + EnterCriticalSection( &X11DRV_CritSection ); + r = XvShmCreateImage( a0, a1, a2, a3, a4, a5, a6); + LeaveCriticalSection( &X11DRV_CritSection ); + TRACE("Ret XvShmCreateImage\n"); + return r; +} + +#endif /* defined(HAVE_XVIDEO) */ +