Remove Xlib X11 video output

configure.ac

@@ -368,7 +368,7 @@ case "${host_os}" in
     ;;
   *nto*)
     SYS=nto
-    VLC_ADD_LIBS([x11 xvideo],[-lsocket])
+    VLC_ADD_LIBS([xvideo],[-lsocket])
     ;;
   solaris*)
     SYS=solaris
@@ -3438,13 +3438,7 @@ AC_ARG_ENABLE(x11,
 CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
 
 AS_IF([test "${enable_x11}" != "no"], [
-  AC_CHECK_HEADERS(X11/Xlib.h, [
-    VLC_ADD_PLUGIN([x11])
-    VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-    VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
-
-    AC_CHECK_LIB(Xext, XShmAttach, [VLC_ADD_LIBS([x11],[-lXext])])
-  ])
+  AC_CHECK_HEADERS(X11/Xlib.h)
 
 dnl Check for DPMS
   AC_CHECK_HEADERS(X11/extensions/dpms.h, [
@@ -4936,13 +4930,13 @@ AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 dnl Tests for Osso and Xsp
 AC_CHECK_LIB(osso, osso_display_blanking_pause, [
   PKG_CHECK_MODULES(GLIB2, glib-2.0, [
-    VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
-    VLC_ADD_LIBS([x11 xvideo xvmc glx omapfb],[-losso])
+    VLC_ADD_CPPFLAGS([xvideo xvmc glx omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+    VLC_ADD_LIBS([xvideo xvmc glx omapfb],[-losso])
  ])
 ])
 AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
-  VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx],[-DHAVE_XSP])
-  VLC_ADD_LIBS([x11 xvideo xvmc glx],[-lXsp])
+  VLC_ADD_CPPFLAGS([xvideo xvmc glx],[-DHAVE_XSP])
+  VLC_ADD_LIBS([xvideo xvmc glx],[-lXsp])
 ])
 
 dnl

modules/video_output/x11/Modules.am

-SOURCES_x11 = \
-	x11.c \
-	xcommon.c \
-	xcommon.h \
-	$(NULL)
-
 SOURCES_xvideo = \
 	xvideo.c \
 	xcommon.c \

modules/video_output/x11/x11.c

-/*****************************************************************************
- * x11.c : X11 plugin for vlc
- *****************************************************************************
- * Copyright (C) 1998-2001 the VideoLAN team
- * $Id$
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *          Samuel Hocevar <sam@zoy.org>
- *          David Kennedy <dkennedy@tinytoad.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-extern int  Activate   ( vlc_object_t * );
-extern void Deactivate ( vlc_object_t * );
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-#define DISPLAY_TEXT N_("X11 display")
-#define DISPLAY_LONGTEXT N_( \
-    "X11 hardware display to use. By default VLC will " \
-    "use the value of the DISPLAY environment variable.")
-
-#define SHM_TEXT N_("Use shared memory")
-#define SHM_LONGTEXT N_( \
-    "Use shared memory to communicate between VLC and the X server.")
-
-vlc_module_begin ()
-    set_shortname( "X11" )
-    set_category( CAT_VIDEO )
-    set_subcategory( SUBCAT_VIDEO_VOUT )
-    add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
-#ifdef HAVE_SYS_SHM_H
-    add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
-#endif
-    set_description( N_("X11 video output") )
-    set_capability( "video output", 70 )
-    set_callbacks( Activate, Deactivate )
-vlc_module_end ()
-

modules/video_output/x11/xcommon.h

@@ -206,7 +206,6 @@ struct vout_sys_t
     /* Internal settings and properties */
     Display *           p_display;                        /* display pointer */
 
-    Visual *            p_visual;                          /* visual pointer */
     int                 i_screen;                           /* screen number */
 
     /* Our window */
@@ -224,12 +223,6 @@ struct vout_sys_t
     int                 i_xvport;
     bool          b_paint_colourkey;
     int                 i_colourkey;
-#else
-    Colormap            colormap;               /* colormap used (8bpp only) */
-
-    unsigned int        i_screen_depth;
-    unsigned int        i_bytes_per_pixel;
-    unsigned int        i_bytes_per_line;
 #endif
 
     /* Screen saver properties */