Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

1 files changed, 0 insertions, 90 deletions

diff --git a/distrib/sdl-1.2.12/src/video/x11/SDL_x11dga.c b/distrib/sdl-1.2.12/src/video/x11/SDL_x11dga.c
deleted file mode 100644
index d68e7d9..0000000
--- a/distrib/sdl-1.2.12/src/video/x11/SDL_x11dga.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is currently only used to enable DGA mouse.
-   There is a completely separate DGA driver that is fullscreen-only.
-*/
-
-#include "SDL_video.h"
-#include "../SDL_cursor_c.h"
-#include "SDL_x11dga_c.h"
-
-/* Global for the error handler */
-int dga_event, dga_error = -1;
-
-void X11_EnableDGAMouse(_THIS)
-{
-#if SDL_VIDEO_DRIVER_X11_DGAMOUSE
-    static int use_dgamouse = -1;
-
-    /* Check configuration to see if we should use DGA mouse */
-    if ( use_dgamouse < 0 ) {
-        int dga_major, dga_minor;
-        int dga_flags;
-        const char *env_use_dgamouse;
-
-        use_dgamouse = 1;
-        env_use_dgamouse = SDL_getenv("SDL_VIDEO_X11_DGAMOUSE");
-        if ( env_use_dgamouse ) {
-            use_dgamouse = SDL_atoi(env_use_dgamouse);
-        }
-        /* Check for buggy X servers */
-        if ( use_dgamouse && BUGGY_XFREE86(==, 4000) ) {
-            use_dgamouse = 0;
-        }
-        if ( !use_dgamouse || !local_X11 ||
-             !SDL_NAME(XF86DGAQueryExtension)(SDL_Display, &dga_event, &dga_error) ||
-             !SDL_NAME(XF86DGAQueryVersion)(SDL_Display, &dga_major, &dga_minor) ||
-             !SDL_NAME(XF86DGAQueryDirectVideo)(SDL_Display, SDL_Screen, &dga_flags) ||
-             !(dga_flags & XF86DGADirectPresent) ) {
-            use_dgamouse = 0;
-        }
-    }
-
-    if ( use_dgamouse && !(using_dga & DGA_MOUSE) ) {
-	if ( SDL_NAME(XF86DGADirectVideo)(SDL_Display, SDL_Screen, XF86DGADirectMouse) ) {
-            using_dga |= DGA_MOUSE;
-        }
-    }
-#endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */
-}
-
-/* Argh.  Glide resets DGA mouse mode when it makes the context current! */
-void X11_CheckDGAMouse(_THIS)
-{
-#if SDL_VIDEO_DRIVER_X11_DGAMOUSE
-    if ( using_dga & DGA_MOUSE ) {
-	SDL_NAME(XF86DGADirectVideo)(SDL_Display,SDL_Screen,XF86DGADirectMouse);
-    }
-#endif
-}
-
-void X11_DisableDGAMouse(_THIS)
-{
-#if SDL_VIDEO_DRIVER_X11_DGAMOUSE
-    if ( using_dga & DGA_MOUSE ) {
-	SDL_NAME(XF86DGADirectVideo)(SDL_Display, SDL_Screen, 0);
-        using_dga &= ~DGA_MOUSE;
-    }
-#endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */
-}