From b382950de43cb23a5908aa1263b634a46997ac29 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 31 Jan 2006 18:39:32 +0000 Subject: [PATCH] Changed references to XFree86 to Xext to match change in directory structure. Reference Bugzilla #116. --- configure.in | 36 +++++++++++++------------- src/video/Xext/Xinerama/Makefile.am | 4 +-- src/video/Xext/Xv/Makefile.am | 4 +-- src/video/Xext/Xxf86dga/Makefile.am | 4 +-- src/video/Xext/Xxf86dga/XF86DGA.c | 2 +- src/video/Xext/Xxf86vm/Makefile.am | 4 +-- src/video/Xext/extensions/Xvlib.h | 2 +- src/video/Xext/extensions/xf86dga.h | 2 +- src/video/Xext/extensions/xf86dgastr.h | 2 +- src/video/Xext/extensions/xf86vmstr.h | 2 +- src/video/dga/SDL_dgaevents.c | 2 +- src/video/dga/SDL_dgavideo.c | 2 +- src/video/x11/SDL_x11dyn.h | 6 +---- src/video/x11/SDL_x11modes.c | 2 +- src/video/x11/SDL_x11video.h | 6 ++--- src/video/x11/SDL_x11yuv.c | 2 +- 16 files changed, 39 insertions(+), 43 deletions(-) diff --git a/configure.in b/configure.in index 06bf21b2a..da00b9d79 100644 --- a/configure.in +++ b/configure.in @@ -670,8 +670,8 @@ CheckX11() AC_MSG_RESULT($video_x11_vm) if test x$video_x11_vm = xyes; then CFLAGS="$CFLAGS -DXFREE86_VM" - VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm" - VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm" + VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la" AC_MSG_CHECKING(for XFree86 VidMode gamma support) video_x11_vmgamma=no AC_TRY_COMPILE([ @@ -710,8 +710,8 @@ CheckX11() if test x$enable_video_x11_dgamouse = xyes; then CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE" fi - VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga" - VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga" + VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la" fi fi AC_ARG_ENABLE(video-x11-xv, @@ -734,8 +734,8 @@ CheckX11() AC_MSG_RESULT($video_x11_xv) if test x$video_x11_xv = xyes; then CFLAGS="$CFLAGS -DXFREE86_XV" - VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv" - VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv" + VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la" fi fi AC_ARG_ENABLE(video-x11-xinerama, @@ -755,8 +755,8 @@ CheckX11() AC_MSG_RESULT($video_x11_xinerama) if test x$video_x11_xinerama = xyes; then CFLAGS="$CFLAGS -DHAVE_XINERAMA" - VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama" - VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama" + VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la" fi fi AC_ARG_ENABLE(video-x11-xme, @@ -768,8 +768,8 @@ CheckX11() AC_MSG_RESULT($video_x11_xme) if test x$video_x11_xme = xyes; then CFLAGS="$CFLAGS -DHAVE_XIGXME" - VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/XME" - VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/XME/libXME.la" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME" + VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la" fi fi fi @@ -3057,7 +3057,7 @@ CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL" CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/main/$ARCH" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video" -CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions" +CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/Xext/extensions" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom" @@ -3154,13 +3154,13 @@ src/video/windx5/Makefile src/video/gapi/Makefile src/video/x11/Makefile src/video/xbios/Makefile -src/video/XFree86/Makefile -src/video/XFree86/extensions/Makefile -src/video/XFree86/Xinerama/Makefile -src/video/XFree86/Xv/Makefile -src/video/XFree86/Xxf86dga/Makefile -src/video/XFree86/Xxf86vm/Makefile -src/video/XFree86/XME/Makefile +src/video/Xext/Makefile +src/video/Xext/extensions/Makefile +src/video/Xext/Xinerama/Makefile +src/video/Xext/Xv/Makefile +src/video/Xext/Xxf86dga/Makefile +src/video/Xext/Xxf86vm/Makefile +src/video/Xext/XME/Makefile src/events/Makefile src/joystick/Makefile src/joystick/amigaos/Makefile diff --git a/src/video/Xext/Xinerama/Makefile.am b/src/video/Xext/Xinerama/Makefile.am index 2856f3dc8..ee58d3d29 100644 --- a/src/video/Xext/Xinerama/Makefile.am +++ b/src/video/Xext/Xinerama/Makefile.am @@ -1,5 +1,5 @@ ## Makefile.am for the XFree86 Xinerama library -noinst_LTLIBRARIES = libXFree86_Xinerama.la -libXFree86_Xinerama_la_SOURCES = Xinerama.c +noinst_LTLIBRARIES = libXext_Xinerama.la +libXext_Xinerama_la_SOURCES = Xinerama.c diff --git a/src/video/Xext/Xv/Makefile.am b/src/video/Xext/Xv/Makefile.am index f1d8898a9..9db58dceb 100644 --- a/src/video/Xext/Xv/Makefile.am +++ b/src/video/Xext/Xv/Makefile.am @@ -1,5 +1,5 @@ ## Makefile.am for the XFree86 Xv library -noinst_LTLIBRARIES = libXFree86_Xv.la -libXFree86_Xv_la_SOURCES = Xv.c Xvlibint.h +noinst_LTLIBRARIES = libXext_Xv.la +libXext_Xv_la_SOURCES = Xv.c Xvlibint.h diff --git a/src/video/Xext/Xxf86dga/Makefile.am b/src/video/Xext/Xxf86dga/Makefile.am index ee6219881..5bc0095e1 100644 --- a/src/video/Xext/Xxf86dga/Makefile.am +++ b/src/video/Xext/Xxf86dga/Makefile.am @@ -1,5 +1,5 @@ ## Makefile.am for the XFree86 Xxf86dga library -noinst_LTLIBRARIES = libXFree86_Xxf86dga.la -libXFree86_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c +noinst_LTLIBRARIES = libXext_Xxf86dga.la +libXext_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c index 727971aa7..926ddf6b9 100644 --- a/src/video/Xext/Xxf86dga/XF86DGA.c +++ b/src/video/Xext/Xxf86dga/XF86DGA.c @@ -341,7 +341,7 @@ Bool SDL_NAME(XF86DGAViewPortChanged)( /* Helper functions */ #include -#include +#include #include #include #include diff --git a/src/video/Xext/Xxf86vm/Makefile.am b/src/video/Xext/Xxf86vm/Makefile.am index e7f8c8bef..2a2833e5f 100644 --- a/src/video/Xext/Xxf86vm/Makefile.am +++ b/src/video/Xext/Xxf86vm/Makefile.am @@ -1,5 +1,5 @@ ## Makefile.am for the XFree86 Xxf86vm library -noinst_LTLIBRARIES = libXFree86_Xxf86vm.la -libXFree86_Xxf86vm_la_SOURCES = XF86VMode.c +noinst_LTLIBRARIES = libXext_Xxf86vm.la +libXext_Xxf86vm_la_SOURCES = XF86VMode.c diff --git a/src/video/Xext/extensions/Xvlib.h b/src/video/Xext/extensions/Xvlib.h index 2013e123a..dcbd8d718 100644 --- a/src/video/Xext/extensions/Xvlib.h +++ b/src/video/Xext/extensions/Xvlib.h @@ -54,7 +54,7 @@ SOFTWARE. */ #include -#include +#include #include "SDL_name.h" typedef struct { diff --git a/src/video/Xext/extensions/xf86dga.h b/src/video/Xext/extensions/xf86dga.h index 3c96703f1..b169c9436 100644 --- a/src/video/Xext/extensions/xf86dga.h +++ b/src/video/Xext/extensions/xf86dga.h @@ -7,7 +7,7 @@ #define _XF86DGA_H_ #include -#include +#include #include "SDL_name.h" #define X_XDGAQueryVersion 0 diff --git a/src/video/Xext/extensions/xf86dgastr.h b/src/video/Xext/extensions/xf86dgastr.h index 02abc2b2f..487daf08a 100644 --- a/src/video/Xext/extensions/xf86dgastr.h +++ b/src/video/Xext/extensions/xf86dgastr.h @@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc. #ifndef _XF86DGASTR_H_ #define _XF86DGASTR_H_ -#include +#include #define XF86DGANAME "XFree86-DGA" diff --git a/src/video/Xext/extensions/xf86vmstr.h b/src/video/Xext/extensions/xf86vmstr.h index 012a7942e..481395c64 100644 --- a/src/video/Xext/extensions/xf86vmstr.h +++ b/src/video/Xext/extensions/xf86vmstr.h @@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY #ifndef _XF86VIDMODESTR_H_ #define _XF86VIDMODESTR_H_ -#include +#include #define XF86VIDMODENAME "XFree86-VidModeExtension" diff --git a/src/video/dga/SDL_dgaevents.c b/src/video/dga/SDL_dgaevents.c index 52be7b86c..c48de8be5 100644 --- a/src/video/dga/SDL_dgaevents.c +++ b/src/video/dga/SDL_dgaevents.c @@ -29,7 +29,7 @@ static char rcsid = #include #include -#include +#include #include "SDL_sysvideo.h" #include "SDL_events_c.h" diff --git a/src/video/dga/SDL_dgavideo.c b/src/video/dga/SDL_dgavideo.c index 82c57c1a9..1427c105c 100644 --- a/src/video/dga/SDL_dgavideo.c +++ b/src/video/dga/SDL_dgavideo.c @@ -31,7 +31,7 @@ static char rcsid = #include #include #include -#include +#include #ifdef HAVE_ALLOCA_H #include diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h index 602dd7530..0879a2120 100644 --- a/src/video/x11/SDL_x11dyn.h +++ b/src/video/x11/SDL_x11dyn.h @@ -29,11 +29,7 @@ #include #include -#if defined(__osf__) -#include -#else -#include -#endif +#include #ifndef NO_SHARED_MEMORY #include diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c index e90ae4580..0ced21b33 100644 --- a/src/video/x11/SDL_x11modes.c +++ b/src/video/x11/SDL_x11modes.c @@ -40,7 +40,7 @@ static char rcsid = #include "SDL_x11image_c.h" #ifdef HAVE_XINERAMA -#include +#include #endif #define MAX(a, b) (a > b ? a : b) diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h index b4c520c53..bf282748c 100644 --- a/src/video/x11/SDL_x11video.h +++ b/src/video/x11/SDL_x11video.h @@ -33,13 +33,13 @@ static char rcsid = #include #ifdef XFREE86_DGAMOUSE -#include +#include #endif #ifdef XFREE86_VM -#include +#include #endif #ifdef HAVE_XIGXME -#include +#include #endif #include diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c index ddf6563f6..9601d1df1 100644 --- a/src/video/x11/SDL_x11yuv.c +++ b/src/video/x11/SDL_x11yuv.c @@ -37,7 +37,7 @@ static char rcsid = #include #include #endif -#include +#include #include "SDL_error.h" #include "SDL_video.h"