xserver-xorg-video-dummy: Changes to 'upstream-unstable'
COPYING | 12 +-----------
configure.ac | 44 ++++++++++++++++++++++----------------------
src/Makefile.am | 9 ++++++++-
src/dummy_dga.c | 6 ++----
src/dummy_driver.c | 24 +++++++++++++++++-------
5 files changed, 50 insertions(+), 45 deletions(-)
New commits:
commit bccf37f052748386902112b770b89d81bddfaeb8
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jan 1 07:15:36 2012 +0100
dummy 0.3.5
Signed-off-by: Cyril Brulebois <kibi@debian.org>
diff --git a/configure.ac b/configure.ac
index e3623f9..d92e22a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-dummy],
- [0.3.4],
+ [0.3.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-dummy])
AC_CONFIG_SRCDIR([Makefile.am])
commit dd9be3b21842aacdee5501cd2e0bfafb11b5ec08
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 14:50:36 2011 -0500
Add a configure option to disable dga
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/configure.ac b/configure.ac
index 1d73f6b..e3623f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
+AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: yes)]), [DGA=$enableval], [DGA=yes])
AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
[ moduledir="$withval" ],
[ moduledir="$libdir/xorg/modules" ])
@@ -57,7 +58,13 @@ AC_SUBST(moduledir)
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+
+if test "x$DGA" = xyes; then
+ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+ AC_DEFINE(XFreeXDGA, 1, [Support DGA extension])
+fi
+AC_SUBST([DGA])
+AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6705742..52b9921 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,10 @@ dummy_drv_ladir = @moduledir@/drivers
dummy_drv_la_SOURCES = \
dummy_cursor.c \
- dummy_dga.c \
dummy_driver.c \
dummy.h
+
+if DGA
+dummy_drv_la_SOURCES += \
+ dummy_dga.c
+endif
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index e6124e8..041ca96 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -592,7 +592,9 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetBlackWhitePixels(pScreen);
+#ifdef XFreeXDGA
DUMMYDGAInit(pScreen);
+#endif
if (dPtr->swCursor)
xf86DrvMsg(scrnIndex, X_CONFIG, "Using Software Cursor.\n");
commit dd598ca433d2386687f9543457e4c6ffdb16d7c4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 14:32:02 2011 -0500
Use malloc/free instead of deprecated X versions
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/dummy_dga.c b/src/dummy_dga.c
index 82912e5..9710aef 100644
--- a/src/dummy_dga.c
+++ b/src/dummy_dga.c
@@ -49,10 +49,10 @@ DUMMYDGAInit(ScreenPtr pScreen)
while(pMode) {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
commit d70dde48087a0d5c3930860ab97585d39de7b57e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 14:30:55 2011 -0500
Dummy drivers don't need PCI.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/dummy_dga.c b/src/dummy_dga.c
index 2c74600..82912e5 100644
--- a/src/dummy_dga.c
+++ b/src/dummy_dga.c
@@ -4,8 +4,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "dgaproc.h"
#include "dummy.h"
commit bdc59411136b16ca3447336f22e95010bf709a53
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 25 06:05:29 2011 -0400
Port away from xalloc/xfree
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 1ff9f08..e6124e8 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -202,7 +202,7 @@ DUMMYFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -357,7 +357,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, device->options);
/* Process the options */
- if (!(dPtr->Options = xalloc(sizeof(DUMMYOptions))))
+ if (!(dPtr->Options = malloc(sizeof(DUMMYOptions))))
return FALSE;
memcpy(dPtr->Options, DUMMYOptions, sizeof(DUMMYOptions));
@@ -535,7 +535,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
DUMMYScrn = pScrn;
- if (!(dPtr->FBBase = xalloc(pScrn->videoRam * 1024)))
+ if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
return FALSE;
/*
@@ -705,7 +705,7 @@ DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen)
if(pScrn->vtSema){
dummyRestore(pScrn, TRUE);
- xfree(dPtr->FBBase);
+ free(dPtr->FBBase);
}
if (dPtr->CursorInfo)
commit 7f57ed6be7c561b83da44a6ecb0562e8f562e48e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 25 06:04:39 2011 -0400
Fix DGA includes
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 1651f34..1ff9f08 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -47,7 +47,7 @@
#include "servermd.h"
#ifdef XFreeXDGA
#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#endif
/* Mandatory functions */
commit fb0888f90d5d1c10d69ec2add0a66e88c94f5d5c
Author: Antoine Martin <antoine@devloop.org.uk>
Date: Wed May 25 06:03:10 2011 -0400
Increase the maximum framebuffer size to 32767x32767
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Antoine Martin <antoine@devloop.org.uk>
Tested-by: Antoine Martin <antoine@devloop.org.uk>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 804e41e..1651f34 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -85,6 +85,9 @@ static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
#define DUMMY_MINOR_VERSION PACKAGE_VERSION_MINOR
#define DUMMY_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
+#define DUMMY_MAX_WIDTH 32767
+#define DUMMY_MAX_HEIGHT 32767
+
/*
* This is intentionally screen-independent. It indicates the binding
* choice made in the first PreInit.
@@ -402,8 +405,9 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
int apertureSize = (pScrn->videoRam * 1024);
i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
pScrn->display->modes, clockRanges,
- NULL, 256, 2048,(8 * pScrn->bitsPerPixel),
- 128, 2048, pScrn->display->virtualX,
+ NULL, 256, DUMMY_MAX_WIDTH,
+ (8 * pScrn->bitsPerPixel),
+ 128, DUMMY_MAX_HEIGHT, pScrn->display->virtualX,
pScrn->display->virtualY, apertureSize,
LOOKUP_BEST_REFRESH);
commit f8dc281042b328c2fad4df38f8fb3f967a025c6f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index 216ae05..1d73f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-dummy],
[0.3.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-dummy])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
@@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
[ moduledir="$withval" ],
[ moduledir="$libdir/xorg/modules" ])
AC_SUBST(moduledir)
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
# Checks for libraries.
commit ca77f09bd68587e7579f139660c8cef81662fdd0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index acb85be..216ae05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,8 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_
DRIVER_NAME=dummy
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
])
+AC_OUTPUT
commit 945a1619300291ffe08c82f19bea6bb2e1da8f86
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e217787..acb85be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-dummy],
[xf86-video-dummy])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 8fbbafb7ed5988a63d16d3d9fad17dd336a32b82
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 4be7c16..e217787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-dummy],
- 0.3.4,
+ [0.3.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-dummy)
+ [xf86-video-dummy])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 93898c6d620cb005bca60ed20b89faf9a3b8434e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index cee9239..4be7c16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,8 +63,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_
# Checks for libraries.
-# Checks for header files.
-AC_HEADER_STDC
DRIVER_NAME=dummy
AC_SUBST([DRIVER_NAME])
commit c26603e9c0ab3cb04bcac5a370c9b5de9fe0d1d6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:30 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 19461cd..cee9239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 839b7420661db5e1a9e6cffe97308a34f3196e58
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:18 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d793a52..19461cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-dummy],
0.3.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 51642de730f264fdfaf1c78f68a767a9347e1520
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 12:05:40 2010 +1000
dummy 0.3.4
diff --git a/configure.ac b/configure.ac
index 62666c6..d793a52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
- 0.3.3,
+ 0.3.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 77ae177fd77e90a6eaeebde9df88911256264329
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Jun 4 16:09:34 2010 -0700
Use new server API to find the root window.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index e32c1c7..804e41e 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -779,7 +779,11 @@ DUMMYCreateWindow(WindowPtr pWin)
return(ret);
if(dPtr->prop == FALSE) {
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8
pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum];
+#else
+ pWinRoot = DUMMYScrn->pScreen->root;
+#endif
if (! ValidAtom(VFB_PROP))
VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1);
commit 2503a68673c6012a0bf2abba58aa5060654965f9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 15:39:03 2010 -0400
COPYING: replace stub file with actual Copyright notice
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..3c1ef48 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,2 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2002, SuSE Linux AG, Author: Egbert Eich
-Please submit updated COPYING files to the Xorg bugzilla:
-
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit c4134a6cb6bf3d9364fd2374e79647859dbd57c3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 20:08:52 2010 -0500
config: move compiler flags from configure.ac to Makefile.am
CFLAGS is an automake defined variable that should not be set
by the module. It should not be AC_SUBST either, it already is.
Use AM_CFLAGS in Makefile.am. This will allow the user to override
the flags as they will be in the right order.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f2329a0..62666c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,9 +62,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-CFLAGS="$CFLAGS $XORG_CFLAGS "
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8cf4f1f..6705742 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,9 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+
+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
+
dummy_drv_la_LTLIBRARIES = dummy_drv.la
dummy_drv_la_LDFLAGS = -module -avoid-version
dummy_drv_ladir = @moduledir@/drivers
commit 3370539eea599ff51a556507ec16a1570b8ed076
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 19:07:22 2010 -0500
config: remove unrequired '-I$(top_srcdir)/src'
The current dir is already included by default in the makefile
top_builddir = ..
DEFAULT_INCLUDES = -I. -I$(top_builddir)
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 35abfbf..f2329a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+CFLAGS="$CFLAGS $XORG_CFLAGS "
AC_SUBST([CFLAGS])
# Checks for libraries.
commit ea7cc253b0f4ea97a197ec36b3ac06279b0b95f6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 18:42:52 2010 -0500
config: remove unused INCLUDES='-I$(top_srcdir)/src'
This statement is redundant and not used in the makefile
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 23ea18d..35abfbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,9 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES='-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
-AC_SUBST([INCLUDES])
# Checks for libraries.
commit bff6fc2f25648df0bbc0ea0723636260df987d34
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 17:45:42 2010 -0500
config: remove unused variable XORG_INCS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d85184a..23ea18d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+INCLUDES='-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit 17f6ec36df36a8999a95fd86e17013b1c44a7a2e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 20:59:46 2009 -0500
configure.ac: sdkdir usage duplicates the sdk include dir
The sdkdir variable provides a duplicate copy of the include/xorg
directory. The statement is removed as this was it's only used.
In the Makefile, there is now only one instance of the -I sdkdir
The sdkdir is provided in XORG_CFLAGS.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 426acfb..d85184a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,10 +61,9 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit 86a7baa4156dc9569b7dde51b3042b7fd8093821
Author: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu Dec 10 14:53:50 2009 -0500
configure.ac: remove wrong include path. #24675
Don't use $(prefix)/include as include path. It can break things
when cross-compiling with DESTDIR and prefix=/usr
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c9857f7..426acfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
Reply to: