xserver: Branch 'glucose-2' - 3 commits
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Sep 13 04:36:12 PDT 2007
configure.ac | 18 ++++++++++-------
hw/xgl/glxext/Makefile.am | 2 -
hw/xgl/glxext/module/Makefile.am | 18 +++++------------
hw/xgl/glxext/module/glcoremodule.c | 38 ------------------------------------
hw/xgl/xglglx.c | 17 +++++++++++++++-
5 files changed, 34 insertions(+), 59 deletions(-)
New commits:
diff-tree d503862a02af8e48fb0690e82029b79dbc943fad (from 0bfc2787059f0c687efe6621967825608088cfb9)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Thu Sep 13 12:31:16 2007 +0100
Bring more build fixes from xgl-0-0-1.
diff --git a/configure.ac b/configure.ac
index ad1bde8..6b3acc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1261,7 +1261,7 @@ if test "x$XGL" = xyes; then
AC_SUBST([XGL_LIBS])
AC_SUBST([XGL_SYS_LIBS])
AC_DEFINE(XGL_MODULAR, 1, [Use loadable XGL modules])
- SERVER_DEFINES="$SERVER_DEFINES -DXGLServer"
+ AC_DEFINE(XGLServer, 1, [Building XGL server])
xglmoduledir="$moduledir/xgl"
AC_SUBST([xglmoduledir])
diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am
index 4fa84a6..830b2d1 100644
--- a/hw/xgl/glxext/Makefile.am
+++ b/hw/xgl/glxext/Makefile.am
@@ -16,7 +16,7 @@ AM_CFLAGS = \
libxglglxext_libraries = libxglglxext.la
libxglglxext_la_SOURCES = \
xglglxext.h \
- xglglxext.c \
+ xglglxext.c \
xglglxlog.c
noinst_LTLIBRARIES = $(libxglglxext_libraries)
diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am
index 4633f7f..66ea80a 100644
--- a/hw/xgl/glxext/module/Makefile.am
+++ b/hw/xgl/glxext/module/Makefile.am
@@ -5,18 +5,12 @@ AM_CFLAGS = \
$(XGLMODULES_CFLAGS) \
-I$(top_srcdir)/hw/xgl
-libglx_la_LDFLAGS = -avoid-version
-libglx_la_SOURCES = glxmodule.c
-libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la
-libglx_modules = libglx.la
-
-libglcore_la_LDFLAGS = -avoid-version
-libglcore_la_SOURCES = glcoremodule.c
-libglcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
-libglcore_modules = libglcore.la
+libglxext_la_LDFLAGS = -avoid-version
+libglxext_la_SOURCES = glxmodule.c
+libglxext_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \
+ $(top_builddir)/GL/mesa/libGLcore.la
+libglxext_modules = libglxext.la
moduledir = @XGL_MODULE_PATH@
-module_LTLIBRARIES = \
- $(libglcore_modules) \
- $(libglx_modules)
+module_LTLIBRARIES = $(libglxext_modules)
diff --git a/hw/xgl/glxext/module/glcoremodule.c b/hw/xgl/glxext/module/glcoremodule.c
deleted file mode 100644
index 37aa9c6..0000000
--- a/hw/xgl/glxext/module/glcoremodule.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2005 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <davidr at novell.com>
- */
-
-#include "xglmodule.h"
-
-char *
-moduleVersion (void)
-{
- return VERSION;
-}
-
-Bool
-moduleInit (const char *module)
-{
- return TRUE;
-}
diff-tree 0bfc2787059f0c687efe6621967825608088cfb9 (from 0f45673ce13bbe9e1c1401c750c0c2fbff9e08b9)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Thu Sep 13 11:33:08 2007 +0100
Add stubs to satisfy linking references.
diff --git a/hw/xgl/xglglx.c b/hw/xgl/xglglx.c
index 5c1eee6..09bbc35 100644
--- a/hw/xgl/xglglx.c
+++ b/hw/xgl/xglglx.c
@@ -101,10 +101,15 @@ GlxSetRenderTables (struct _glapi_table
(*__xglGLXFunc.setRenderTables) (table);
}
+/*
+** Stub to satisfy miinitext.c references.
+*/
+__GLXprovider __glXMesaProvider;
+
void
GlxPushProvider (__GLXprovider *provider)
{
- if (glXHandle)
+ if (glXHandle && provider != &__glXMesaProvider)
(*__xglGLXFunc.pushProvider) (provider);
}
@@ -201,4 +206,14 @@ xglUnloadGLXModules (void)
}
+void
+__glXenterServer(GLboolean rendering)
+{
+}
+
+void
+__glXleaveServer(GLboolean rendering)
+{
+}
+
#endif
diff-tree 0f45673ce13bbe9e1c1401c750c0c2fbff9e08b9 (from 1d7403a1c269a92bb1eb347c497f0682bf8a7287)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Thu Sep 13 10:08:03 2007 +0100
Bring build fixes from xgl-0-0-1.
diff --git a/configure.ac b/configure.ac
index fbdb3cd..ad1bde8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1248,18 +1248,20 @@ dnl Xgl DDX
AC_MSG_CHECKING([whether to build Xgl DDX])
if test "x$XGL" != xno; then
- PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XGL=yes], [XGL=no])
- AC_SUBST(XGLMODULES_CFLAGS)
+ PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XGL=yes], [XGL=no])
+ AC_SUBST(XGLMODULES_CFLAGS)
+ AC_SUBST(XGLMODULES_LIBS)
fi
AC_MSG_RESULT([$XGL])
AM_CONDITIONAL(XGL, [test "x$XGL" = xyes])
if test "x$XGL" = xyes; then
- XGL_LIBS="$FB_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB"
+ XGL_LIBS="$FB_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB"
XGL_SYS_LIBS="$XGLMODULES_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
AC_SUBST([XGL_LIBS])
AC_SUBST([XGL_SYS_LIBS])
AC_DEFINE(XGL_MODULAR, 1, [Use loadable XGL modules])
+ SERVER_DEFINES="$SERVER_DEFINES -DXGLServer"
xglmoduledir="$moduledir/xgl"
AC_SUBST([xglmoduledir])
@@ -1270,8 +1272,9 @@ dnl Xegl DDX
AC_MSG_CHECKING([whether to build Xegl DDX])
if test "x$XEGL" != xno; then
- PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XEGL=yes], [XEGL=no])
- AC_SUBST(XEGLMODULES_CFLAGS)
+ PKG_CHECK_MODULES([XEGLMODULES], [glitz-egl >= 0.4.3], [XEGL=yes], [XEGL=no])
+ AC_SUBST(XEGLMODULES_CFLAGS)
+ AC_SUBST(XEGLMODULES_LIBS)
fi
AC_MSG_RESULT([$XEGL])
AM_CONDITIONAL(XEGL, [test "x$XEGL" = xyes])
@@ -1287,8 +1290,9 @@ dnl Xglx DDX
AC_MSG_CHECKING([whether to build Xglx DDX])
if test "x$XGLX" != xno; then
- PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= 0.4.3 xrender], [XGLX=yes], [XGLX=no])
- AC_SUBST(XGLXMODULES_CFLAGS)
+ PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= 0.4.3 xrender], [XGLX=yes], [XGLX=no])
+ AC_SUBST(XGLXMODULES_CFLAGS)
+ AC_SUBST(XGLXMODULES_LIBS)
fi
AC_MSG_RESULT([$XGLX])
AM_CONDITIONAL(XGLX, [test "x$XGLX" = xyes])
More information about the xorg-commit
mailing list