Changed references to XFree86 to Xext to match change in directory structure.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 31 Jan 2006 18:39:32 +0000
changeset 13060c105755b110
parent 1305 babc963b6f8d
child 1307 1c775d9abd2c
Changed references to XFree86 to Xext to match change in directory structure.

Reference Bugzilla #116.
configure.in
src/video/Xext/Xinerama/Makefile.am
src/video/Xext/Xv/Makefile.am
src/video/Xext/Xxf86dga/Makefile.am
src/video/Xext/Xxf86dga/XF86DGA.c
src/video/Xext/Xxf86vm/Makefile.am
src/video/Xext/extensions/Xvlib.h
src/video/Xext/extensions/xf86dga.h
src/video/Xext/extensions/xf86dgastr.h
src/video/Xext/extensions/xf86vmstr.h
src/video/dga/SDL_dgaevents.c
src/video/dga/SDL_dgavideo.c
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11modes.c
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11yuv.c
     1.1 --- a/configure.in	Tue Jan 31 18:08:33 2006 +0000
     1.2 +++ b/configure.in	Tue Jan 31 18:39:32 2006 +0000
     1.3 @@ -670,8 +670,8 @@
     1.4                  AC_MSG_RESULT($video_x11_vm)
     1.5                  if test x$video_x11_vm = xyes; then
     1.6                      CFLAGS="$CFLAGS -DXFREE86_VM"
     1.7 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm"
     1.8 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la"
     1.9 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
    1.10 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
    1.11                      AC_MSG_CHECKING(for XFree86 VidMode gamma support)
    1.12                      video_x11_vmgamma=no
    1.13                      AC_TRY_COMPILE([
    1.14 @@ -710,8 +710,8 @@
    1.15                      if test x$enable_video_x11_dgamouse = xyes; then
    1.16                          CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
    1.17                      fi
    1.18 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga"
    1.19 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la"
    1.20 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
    1.21 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
    1.22                  fi
    1.23              fi
    1.24              AC_ARG_ENABLE(video-x11-xv,
    1.25 @@ -734,8 +734,8 @@
    1.26                  AC_MSG_RESULT($video_x11_xv)
    1.27                  if test x$video_x11_xv = xyes; then
    1.28                      CFLAGS="$CFLAGS -DXFREE86_XV"
    1.29 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv"
    1.30 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la"
    1.31 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
    1.32 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
    1.33                  fi
    1.34              fi
    1.35              AC_ARG_ENABLE(video-x11-xinerama,
    1.36 @@ -755,8 +755,8 @@
    1.37                  AC_MSG_RESULT($video_x11_xinerama)
    1.38                  if test x$video_x11_xinerama = xyes; then
    1.39                      CFLAGS="$CFLAGS -DHAVE_XINERAMA"
    1.40 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama"
    1.41 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la"
    1.42 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
    1.43 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
    1.44                  fi
    1.45              fi
    1.46              AC_ARG_ENABLE(video-x11-xme,
    1.47 @@ -768,8 +768,8 @@
    1.48                  AC_MSG_RESULT($video_x11_xme)
    1.49                  if test x$video_x11_xme = xyes; then
    1.50                      CFLAGS="$CFLAGS -DHAVE_XIGXME"
    1.51 -                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/XME"
    1.52 -                    VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/XME/libXME.la"
    1.53 +                    VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
    1.54 +                    VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
    1.55                  fi
    1.56              fi
    1.57          fi
    1.58 @@ -3057,7 +3057,7 @@
    1.59  CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/main/$ARCH"
    1.60  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
    1.61  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video"
    1.62 -CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions"
    1.63 +CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/Xext/extensions"
    1.64  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events"
    1.65  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick"
    1.66  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom"
    1.67 @@ -3154,13 +3154,13 @@
    1.68  src/video/gapi/Makefile
    1.69  src/video/x11/Makefile
    1.70  src/video/xbios/Makefile
    1.71 -src/video/XFree86/Makefile
    1.72 -src/video/XFree86/extensions/Makefile
    1.73 -src/video/XFree86/Xinerama/Makefile
    1.74 -src/video/XFree86/Xv/Makefile
    1.75 -src/video/XFree86/Xxf86dga/Makefile
    1.76 -src/video/XFree86/Xxf86vm/Makefile
    1.77 -src/video/XFree86/XME/Makefile
    1.78 +src/video/Xext/Makefile
    1.79 +src/video/Xext/extensions/Makefile
    1.80 +src/video/Xext/Xinerama/Makefile
    1.81 +src/video/Xext/Xv/Makefile
    1.82 +src/video/Xext/Xxf86dga/Makefile
    1.83 +src/video/Xext/Xxf86vm/Makefile
    1.84 +src/video/Xext/XME/Makefile
    1.85  src/events/Makefile
    1.86  src/joystick/Makefile
    1.87  src/joystick/amigaos/Makefile
     2.1 --- a/src/video/Xext/Xinerama/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
     2.2 +++ b/src/video/Xext/Xinerama/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  
     2.5  ## Makefile.am for the XFree86 Xinerama library
     2.6  
     2.7 -noinst_LTLIBRARIES = libXFree86_Xinerama.la
     2.8 -libXFree86_Xinerama_la_SOURCES = Xinerama.c
     2.9 +noinst_LTLIBRARIES = libXext_Xinerama.la
    2.10 +libXext_Xinerama_la_SOURCES = Xinerama.c
     3.1 --- a/src/video/Xext/Xv/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
     3.2 +++ b/src/video/Xext/Xv/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  
     3.5  ## Makefile.am for the XFree86 Xv library
     3.6  
     3.7 -noinst_LTLIBRARIES = libXFree86_Xv.la
     3.8 -libXFree86_Xv_la_SOURCES = Xv.c Xvlibint.h
     3.9 +noinst_LTLIBRARIES = libXext_Xv.la
    3.10 +libXext_Xv_la_SOURCES = Xv.c Xvlibint.h
     4.1 --- a/src/video/Xext/Xxf86dga/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
     4.2 +++ b/src/video/Xext/Xxf86dga/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
     4.3 @@ -1,5 +1,5 @@
     4.4  
     4.5  ## Makefile.am for the XFree86 Xxf86dga library
     4.6  
     4.7 -noinst_LTLIBRARIES = libXFree86_Xxf86dga.la
     4.8 -libXFree86_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c
     4.9 +noinst_LTLIBRARIES = libXext_Xxf86dga.la
    4.10 +libXext_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c
     5.1 --- a/src/video/Xext/Xxf86dga/XF86DGA.c	Tue Jan 31 18:08:33 2006 +0000
     5.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Tue Jan 31 18:39:32 2006 +0000
     5.3 @@ -341,7 +341,7 @@
     5.4  /* Helper functions */
     5.5  
     5.6  #include <X11/Xmd.h>
     5.7 -#include <XFree86/extensions/xf86dga.h>
     5.8 +#include <Xext/extensions/xf86dga.h>
     5.9  #include <stdlib.h>
    5.10  #include <stdio.h>
    5.11  #include <fcntl.h>
     6.1 --- a/src/video/Xext/Xxf86vm/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
     6.2 +++ b/src/video/Xext/Xxf86vm/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
     6.3 @@ -1,5 +1,5 @@
     6.4  
     6.5  ## Makefile.am for the XFree86 Xxf86vm library
     6.6  
     6.7 -noinst_LTLIBRARIES = libXFree86_Xxf86vm.la
     6.8 -libXFree86_Xxf86vm_la_SOURCES = XF86VMode.c
     6.9 +noinst_LTLIBRARIES = libXext_Xxf86vm.la
    6.10 +libXext_Xxf86vm_la_SOURCES = XF86VMode.c
     7.1 --- a/src/video/Xext/extensions/Xvlib.h	Tue Jan 31 18:08:33 2006 +0000
     7.2 +++ b/src/video/Xext/extensions/Xvlib.h	Tue Jan 31 18:39:32 2006 +0000
     7.3 @@ -54,7 +54,7 @@
     7.4  */
     7.5  
     7.6  #include <X11/Xfuncproto.h>
     7.7 -#include <XFree86/extensions/Xv.h>
     7.8 +#include <Xext/extensions/Xv.h>
     7.9  #include "SDL_name.h"
    7.10  
    7.11  typedef struct {
     8.1 --- a/src/video/Xext/extensions/xf86dga.h	Tue Jan 31 18:08:33 2006 +0000
     8.2 +++ b/src/video/Xext/extensions/xf86dga.h	Tue Jan 31 18:39:32 2006 +0000
     8.3 @@ -7,7 +7,7 @@
     8.4  #define _XF86DGA_H_
     8.5  
     8.6  #include <X11/Xfuncproto.h>
     8.7 -#include <XFree86/extensions/xf86dga1.h>
     8.8 +#include <Xext/extensions/xf86dga1.h>
     8.9  #include "SDL_name.h"
    8.10  
    8.11  #define X_XDGAQueryVersion		0
     9.1 --- a/src/video/Xext/extensions/xf86dgastr.h	Tue Jan 31 18:08:33 2006 +0000
     9.2 +++ b/src/video/Xext/extensions/xf86dgastr.h	Tue Jan 31 18:39:32 2006 +0000
     9.3 @@ -9,7 +9,7 @@
     9.4  #ifndef _XF86DGASTR_H_
     9.5  #define _XF86DGASTR_H_
     9.6  
     9.7 -#include <XFree86/extensions/xf86dga1str.h>
     9.8 +#include <Xext/extensions/xf86dga1str.h>
     9.9  
    9.10  #define XF86DGANAME "XFree86-DGA"
    9.11  
    10.1 --- a/src/video/Xext/extensions/xf86vmstr.h	Tue Jan 31 18:08:33 2006 +0000
    10.2 +++ b/src/video/Xext/extensions/xf86vmstr.h	Tue Jan 31 18:39:32 2006 +0000
    10.3 @@ -35,7 +35,7 @@
    10.4  #ifndef _XF86VIDMODESTR_H_
    10.5  #define _XF86VIDMODESTR_H_
    10.6  
    10.7 -#include <XFree86/extensions/xf86vmode.h>
    10.8 +#include <Xext/extensions/xf86vmode.h>
    10.9  
   10.10  #define XF86VIDMODENAME "XFree86-VidModeExtension"
   10.11  
    11.1 --- a/src/video/dga/SDL_dgaevents.c	Tue Jan 31 18:08:33 2006 +0000
    11.2 +++ b/src/video/dga/SDL_dgaevents.c	Tue Jan 31 18:39:32 2006 +0000
    11.3 @@ -29,7 +29,7 @@
    11.4  
    11.5  #include <stdio.h>
    11.6  #include <X11/Xlib.h>
    11.7 -#include <XFree86/extensions/xf86dga.h>
    11.8 +#include <Xext/extensions/xf86dga.h>
    11.9  
   11.10  #include "SDL_sysvideo.h"
   11.11  #include "SDL_events_c.h"
    12.1 --- a/src/video/dga/SDL_dgavideo.c	Tue Jan 31 18:08:33 2006 +0000
    12.2 +++ b/src/video/dga/SDL_dgavideo.c	Tue Jan 31 18:39:32 2006 +0000
    12.3 @@ -31,7 +31,7 @@
    12.4  #include <stdlib.h>
    12.5  #include <string.h>
    12.6  #include <X11/Xlib.h>
    12.7 -#include <XFree86/extensions/xf86dga.h>
    12.8 +#include <Xext/extensions/xf86dga.h>
    12.9  
   12.10  #ifdef HAVE_ALLOCA_H
   12.11  #include <alloca.h>
    13.1 --- a/src/video/x11/SDL_x11dyn.h	Tue Jan 31 18:08:33 2006 +0000
    13.2 +++ b/src/video/x11/SDL_x11dyn.h	Tue Jan 31 18:39:32 2006 +0000
    13.3 @@ -29,11 +29,7 @@
    13.4  #include <X11/Xproto.h>
    13.5  #include <X11/Xlibint.h>
    13.6  
    13.7 -#if defined(__osf__)
    13.8 -#include <XFree86/extensions/extutil.h>
    13.9 -#else
   13.10 -#include <X11/extensions/extutil.h>
   13.11 -#endif
   13.12 +#include <Xext/extensions/extutil.h>
   13.13  
   13.14  #ifndef NO_SHARED_MEMORY
   13.15  #include <sys/ipc.h>
    14.1 --- a/src/video/x11/SDL_x11modes.c	Tue Jan 31 18:08:33 2006 +0000
    14.2 +++ b/src/video/x11/SDL_x11modes.c	Tue Jan 31 18:39:32 2006 +0000
    14.3 @@ -40,7 +40,7 @@
    14.4  #include "SDL_x11image_c.h"
    14.5  
    14.6  #ifdef HAVE_XINERAMA
    14.7 -#include <XFree86/extensions/Xinerama.h>
    14.8 +#include <Xext/extensions/Xinerama.h>
    14.9  #endif 
   14.10  
   14.11  #define MAX(a, b)        (a > b ? a : b)
    15.1 --- a/src/video/x11/SDL_x11video.h	Tue Jan 31 18:08:33 2006 +0000
    15.2 +++ b/src/video/x11/SDL_x11video.h	Tue Jan 31 18:39:32 2006 +0000
    15.3 @@ -33,13 +33,13 @@
    15.4  #include <X11/Xatom.h>
    15.5  
    15.6  #ifdef XFREE86_DGAMOUSE
    15.7 -#include <XFree86/extensions/xf86dga.h>
    15.8 +#include <Xext/extensions/xf86dga.h>
    15.9  #endif
   15.10  #ifdef XFREE86_VM
   15.11 -#include <XFree86/extensions/xf86vmode.h>
   15.12 +#include <Xext/extensions/xf86vmode.h>
   15.13  #endif
   15.14  #ifdef HAVE_XIGXME
   15.15 -#include <XFree86/extensions/xme.h>
   15.16 +#include <Xext/extensions/xme.h>
   15.17  #endif
   15.18  
   15.19  #include <string.h>
    16.1 --- a/src/video/x11/SDL_x11yuv.c	Tue Jan 31 18:08:33 2006 +0000
    16.2 +++ b/src/video/x11/SDL_x11yuv.c	Tue Jan 31 18:39:32 2006 +0000
    16.3 @@ -37,7 +37,7 @@
    16.4  #include <sys/shm.h>
    16.5  #include <X11/extensions/XShm.h>
    16.6  #endif
    16.7 -#include <XFree86/extensions/Xvlib.h>
    16.8 +#include <Xext/extensions/Xvlib.h>
    16.9  
   16.10  #include "SDL_error.h"
   16.11  #include "SDL_video.h"