xserver: Branch 'master' - 3 commits
Dan Nicholson
dbn at kemper.freedesktop.org
Mon Jan 19 06:15:37 PST 2009
configure.ac | 10 +---------
glx/Makefile.am | 1 +
hw/dmx/.gitignore | 2 ++
hw/dmx/Makefile.am | 5 ++---
hw/dmx/config/.gitignore | 6 ++++++
hw/dmx/config/Makefile.am | 2 --
hw/dmx/glxProxy/Makefile.am | 3 ---
hw/dmx/input/Makefile.am | 2 --
hw/xfree86/dri/Makefile.am | 4 +---
hw/xfree86/dri2/Makefile.am | 2 +-
hw/xquartz/GL/Makefile.am | 2 --
11 files changed, 14 insertions(+), 25 deletions(-)
New commits:
commit 5630ff809676ab6b4833757060e48e201e8768a5
Author: Dan Nicholson <dbn.lists at gmail.com>
Date: Mon Dec 22 13:53:43 2008 -0800
Ignore generated dmx manpages
Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
diff --git a/hw/dmx/.gitignore b/hw/dmx/.gitignore
new file mode 100644
index 0000000..9763d86
--- /dev/null
+++ b/hw/dmx/.gitignore
@@ -0,0 +1,2 @@
+Xdmx.1
+Xdmx.1x
diff --git a/hw/dmx/config/.gitignore b/hw/dmx/config/.gitignore
new file mode 100644
index 0000000..bb129df
--- /dev/null
+++ b/hw/dmx/config/.gitignore
@@ -0,0 +1,6 @@
+dmxtodmx.1
+dmxtodmx.1x
+vdltodmx.1
+vdltodmx.1x
+xdmxconfig.1
+xdmxconfig.1x
commit 64f924fbf513b5f91b3f2bcf5767f6fe927d3f7a
Author: Dan Nicholson <dbn.lists at gmail.com>
Date: Mon Dec 22 13:43:30 2008 -0800
Kill off --with-mesa-source completely
There were a few spots left in the source that were using the
--with-mesa-source defined headers or the now removed $(top_srcdir)/GL
directory. These aren't needed anymore as all the necessary source for
GLX is in $(top_srcdir)/glx.
Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
diff --git a/configure.ac b/configure.ac
index c2831ed..dec9319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,9 +517,6 @@ AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symb
[SYMBOL_VISIBILITY=auto])
dnl GLX build options
-AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
- [ MESA_SOURCE="$withval" ],
- [ MESA_SOURCE="" ])
AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
[ DRI_DRIVER_PATH="$withval" ],
[ DRI_DRIVER_PATH="${libdir}/dri" ])
@@ -844,7 +841,6 @@ else
GLX=no
fi
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
-AC_SUBST([MESA_SOURCE])
if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index f995498..8516048 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -36,9 +36,6 @@ AM_CFLAGS = \
$(DIX_CFLAGS) \
-I$(top_srcdir)/hw/dmx \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/GL/include \
- -I$(top_builddir)/GL/include \
- -I at MESA_SOURCE@/include \
-DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ \
-I$(top_srcdir)/hw/xfree86/os-support
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
index 9bc8fab..a7b491c 100644
--- a/hw/xfree86/dri/Makefile.am
+++ b/hw/xfree86/dri/Makefile.am
@@ -8,8 +8,6 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/ramdac \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/glx \
- -I$(top_srcdir)/GL/include \
- -I$(top_builddir)/GL/include \
-DHAVE_XORG_CONFIG_H \
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
@LIBDRM_CFLAGS@ \
diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am
index 8f4478f..9b61305 100644
--- a/hw/xquartz/GL/Makefile.am
+++ b/hw/xquartz/GL/Makefile.am
@@ -3,8 +3,6 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/glx \
- -I$(top_srcdir)/GL/include \
- -I$(top_srcdir)/GL/mesa/glapi \
-I$(top_srcdir)/hw/xquartz \
-I$(top_srcdir)/hw/xquartz/xpr \
-I$(top_srcdir)/miext/damage
commit e1c8ee215797fa8c6a3a5421bb6f99b58064248b
Author: Dan Nicholson <dbn.lists at gmail.com>
Date: Sun Dec 14 14:18:58 2008 -0800
Don't reuse PKG_CHECK_MODULES identifiers
Using GL for the PKG_CHECK_MODULES identifier multiple times means only
the first call will actually be used. Later calls will be skipped due to
GL_CFLAGS and GL_LIBS already being set. This changes DRI to using a
different identifier and DMX to just reusing GL_CFLAGS.
Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
diff --git a/configure.ac b/configure.ac
index 2cf1643..c2831ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -863,9 +863,8 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
if test "x$DRI" = xyes; then
AC_DEFINE(XF86DRI, 1, [Build DRI extension])
PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
- PKG_CHECK_MODULES([GL], [glproto >= 1.4.1 dri >= 7.1.0])
+ PKG_CHECK_MODULES([DRI], [glproto >= 1.4.1 dri >= 7.1.0])
AC_SUBST(DRIPROTO_CFLAGS)
- AC_SUBST(GL_CFLAGS)
fi
PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.99.3],
@@ -1646,9 +1645,6 @@ dnl USB sources in DMX require <linux/input.h>
dnl Linux sources in DMX require <linux/keyboard.h>
AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
DMX_BUILD_LNX="no")
- if test "x$GLX" = xyes; then
- PKG_CHECK_MODULES([GL], [glproto])
- fi
PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
AC_SUBST(XDMXCONFIG_DEP_LIBS)
diff --git a/glx/Makefile.am b/glx/Makefile.am
index bec35bf..2537db8 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -7,6 +7,7 @@ noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
AM_CFLAGS = \
@DIX_CFLAGS@ \
@GL_CFLAGS@ \
+ @DRI_CFLAGS@ \
@XLIB_CFLAGS@ \
@LIBDRM_CFLAGS@ \
@DRIPROTO_CFLAGS@ \
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 8457aea..9d2778a 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -11,9 +11,8 @@ if GLX
SUBDIRS += glxProxy
GLX_LIBS = glxProxy/libglxproxy.a
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
-GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod \
- -I at MESA_SOURCE@/include
-GLX_DEFS = @GL_CFLAGS@
+GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
+GLX_DEFS = @GL_CFLAGS@
endif
if BUILDDOCS
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index c31e049..9fa7113 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -22,14 +22,12 @@ libdmxconfig_a_SOURCES = $(LIBSRCS)
if GLX
GLX_DEFS = @GL_CFLAGS@
-GLX_INCS = -I at MESA_SOURCE@/include
endif
AM_YFLAGS = -d
AM_CFLAGS = \
$(DIX_CFLAGS) \
-I$(top_srcdir)/hw/dmx \
- $(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \
-DDMX_LOG_STANDALONE \
$(GLX_DEFS) \
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index 8ea5003..47dbd96 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -58,12 +58,10 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \
if GLX
GLX_DEFS = @GL_CFLAGS@
-GLX_INCS = -I at MESA_SOURCE@/include
endif
AM_CFLAGS = $(DIX_CFLAGS) \
-I$(top_srcdir)/hw/dmx \
- $(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
index 3ec30be..9bc8fab 100644
--- a/hw/xfree86/dri/Makefile.am
+++ b/hw/xfree86/dri/Makefile.am
@@ -13,7 +13,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-DHAVE_XORG_CONFIG_H \
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
@LIBDRM_CFLAGS@ \
- @GL_CFLAGS@
+ @DRI_CFLAGS@
libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
libdri_ladir = $(moduledir)/extensions
libdri_la_SOURCES = \
diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am
index e5bd16b..c9fdde2 100644
--- a/hw/xfree86/dri2/Makefile.am
+++ b/hw/xfree86/dri2/Makefile.am
@@ -1,7 +1,7 @@
libdri2_la_LTLIBRARIES = libdri2.la
libdri2_la_CFLAGS = \
-DHAVE_XORG_CONFIG_H \
- @GL_CFLAGS@ \
+ @DRI_CFLAGS@ \
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRI2PROTO_CFLAGS@ @LIBDRM_CFLAGS@ \
-I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/os-support/bus
More information about the xorg-commit
mailing list