Commit 739d2f74 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove dead xinerama and VidMod checks

parent af960b55
......@@ -3515,68 +3515,6 @@ AS_IF([test "${enable_xvmc}" != "no"], [
])
])
dnl
dnl Check for the Xinerama extension
dnl
AC_ARG_ENABLE(xinerama,
[ --enable-xinerama Xinerama support (default enabled)],, [
enable_xinerama="$enable_xvideo"
])
AS_IF([test "$enable_xinerama" != "no"], [
ac_cv_have_xinerama="no"
CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[
VLC_ADD_LIBS([xvideo],[-lXinerama_pic])
VLC_ADD_LIBS([x11],[-lXinerama_pic])
VLC_ADD_LIBS([glx],[-lXinerama_pic])
VLC_ADD_LIBS([xvmc],[-lXinerama_pic])
ac_cv_have_xinerama="yes"
],[
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
VLC_ADD_LIBS([xvideo],[-lXinerama])
VLC_ADD_LIBS([x11],[-lXinerama])
VLC_ADD_LIBS([glx],[-lXinerama])
VLC_ADD_LIBS([xvmc],[-lXinerama])
ac_cv_have_xinerama="yes"
])
])
])
if test "${ac_cv_have_xinerama}" = "yes"; then
AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed])
fi
dnl
dnl Check for XF86VidMode extension
dnl
ac_cv_have_xf86vidmode="no"
AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[
AC_CHECK_LIB(Xxf86vm_pic, XF86VidModeGetViewPort,[
VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic])
VLC_ADD_LIBS([x11],[-lXxf86vm_pic])
VLC_ADD_LIBS([glx],[-lXxf86vm_pic])
VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic])
ac_cv_have_xf86vidmode="yes"
],[
AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[
VLC_ADD_LIBS([xvideo],[-lXxf86vm])
VLC_ADD_LIBS([x11],[-lXxf86vm])
VLC_ADD_LIBS([glx],[-lXxf86vm])
VLC_ADD_LIBS([xvmc],[-lXxf86vm])
ac_cv_have_xf86vidmode="yes"
])
])
],[true],
[#ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>
#endif]
)
AS_IF([test "${ac_cv_have_xf86vidmode}" = "yes"],
[AC_DEFINE(HAVE_XF86VIDMODE, 1, [Define this if you have libXxf86vm installed])
])
CFLAGS="${CFLAGS_save}"
])
dnl End of Xlib tests
CPPFLAGS="${CPPFLAGS_save}"
......
......@@ -110,11 +110,6 @@ static void SwitchContext( vout_thread_t * );
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
#define SCREEN_TEXT N_("Screen for fullscreen mode.")
#define SCREEN_LONGTEXT N_( \
"Screen to use in fullscreen mode. For instance " \
"set it to 0 for first screen, 1 for the second.")
vlc_module_begin ()
set_shortname( "OpenGL(GLX)" )
set_category( CAT_VIDEO )
......@@ -129,9 +124,6 @@ vlc_module_begin ()
#ifdef HAVE_SYS_SHM_H
add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
#endif
#ifdef HAVE_XINERAMA
add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
#endif
vlc_module_end ()
/*****************************************************************************
......
......@@ -61,11 +61,6 @@ extern void Deactivate ( vlc_object_t * );
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
#define SCREEN_TEXT N_("Screen for fullscreen mode.")
#define SCREEN_LONGTEXT N_( \
"Screen to use in fullscreen mode. For instance " \
"set it to 0 for first screen, 1 for the second.")
vlc_module_begin ()
set_shortname( "X11" )
set_category( CAT_VIDEO )
......@@ -74,9 +69,6 @@ vlc_module_begin ()
add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
#ifdef HAVE_SYS_SHM_H
add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
#endif
#ifdef HAVE_XINERAMA
add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
#endif
set_description( N_("X11 video output") )
set_capability( "video output", 70 )
......
......@@ -81,14 +81,6 @@
# include <GL/glx.h>
#endif
#ifdef HAVE_XINERAMA
# include <X11/extensions/Xinerama.h>
#endif
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
# include <X11/extensions/xf86vmode.h>
#endif
#ifdef MODULE_NAME_IS_xvmc
# include <X11/extensions/vldXvMC.h>
# include "../../codec/xvmc/accel_xvmc.h"
......
......@@ -76,11 +76,6 @@ typedef struct x11_window_t
Atom wm_protocols;
Atom wm_delete_window;
#ifdef HAVE_XINERAMA
int i_screen;
#endif
} x11_window_t;
/*****************************************************************************
......
......@@ -72,11 +72,6 @@ extern void Deactivate ( vlc_object_t * );
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
#define SCREEN_TEXT N_("Screen for fullscreen mode.")
#define SCREEN_LONGTEXT N_( \
"Screen to use in fullscreen mode. For instance " \
"set it to 0 for first screen, 1 for the second.")
vlc_module_begin ()
set_shortname( "XVideo" )
set_category( CAT_VIDEO )
......@@ -88,9 +83,6 @@ vlc_module_begin ()
#ifdef HAVE_SYS_SHM_H
add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
#endif
#ifdef HAVE_XINERAMA
add_integer ( "xvideo-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
#endif
set_description( N_("XVideo extension video output") )
set_capability( "video output", 150 )
......
......@@ -122,11 +122,6 @@ extern void Deactivate ( vlc_object_t * );
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
#define SCREEN_TEXT N_("Screen to be used for fullscreen mode.")
#define SCREEN_LONGTEXT N_( \
"Choose the screen you want to use in fullscreen mode. For instance " \
"set it to 0 for first screen, 1 for the second.")
#define MODE_TEXT N_("Deinterlace mode")
#define MODE_LONGTEXT N_("You can choose the default deinterlace mode")
......@@ -141,9 +136,6 @@ vlc_module_begin ()
add_string( "xvmc-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
#ifdef HAVE_SYS_SHM_H
add_bool( "xvmc-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
#endif
#ifdef HAVE_XINERAMA
add_integer ( "xvmc-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
#endif
add_string( "xvmc-deinterlace-mode", "bob", NULL, MODE_TEXT, MODE_LONGTEXT, false )
add_string( "xvmc-crop-style", "eq", NULL, CROP_TEXT, CROP_LONGTEXT, false )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment