xserver-xorg-video-tseng: Changes to 'debian-unstable'
ChangeLog | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 41 ++++++-------
debian/changelog | 7 ++
man/Makefile.am | 22 +------
man/tseng.man | 1
src/tseng_cursor.c | 2
src/tseng_dga.c | 6 +-
src/tseng_driver.c | 12 ++--
src/tseng_mode.c | 38 +++++++++++-
9 files changed, 231 insertions(+), 56 deletions(-)
New commits:
commit 38ff92c6b0fab58db834626a775ca5a4d3a64c7a
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 1 19:59:21 2012 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 2803ac8..310fc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-tseng (1:1.2.4-3) UNRELEASED; urgency=low
+xserver-xorg-video-tseng (1:1.2.4-3) unstable; urgency=low
* Merge from upstream master branch up to 8f41e5d8bb to fix the
FTBFS with X server 1.12.
- -- Cyril Brulebois <kibi@debian.org> Tue, 01 May 2012 19:57:12 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 01 May 2012 19:59:16 +0200
xserver-xorg-video-tseng (1:1.2.4-2) unstable; urgency=low
commit 8ea2449f9b662e4285be1e4bccc8b5d18f88fe58
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 1 19:57:57 2012 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 14b4f32..1d5994b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,161 @@
+commit 8f41e5d8bb40d6bb184b4806b701a3e11caf43c3
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Nov 1 20:37:14 2011 -0700
+
+ Build fix for -Werror=int-to-pointer-cast
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 9d9895962f4078404dae06a2db5d3fe3a23e0133
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 01:11:49 2011 -0700
+
+ Fix a compiler warning
+
+ tseng_cursor.c:163:1: warning: no previous prototype for 'TsengLoadCursorImage' [-Wmissing-prototypes]
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 39dd08e1b84c9aecf4eb296db51f25f4b2ff925c
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 01:09:30 2011 -0700
+
+ Build fix for ABI Version 12
+
+ ABI Version 12 removes support for multiple PCI domains. If you need to
+ use this driver on a system with more than one PCI domain, you should
+ either port this driver to using libpciaccess directly or stick with an
+ older server.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 542e65deaf834c3d58c44064206445e4d18f6daa
+Author: BALATON Zoltan <balaton@eik.bme.hu>
+Date: Sat Jun 11 12:50:16 2011 +0200
+
+ Fix regression from pciaccess conversion (bug#32682)
+
+ Due to a typo in TsengGetFbAddress it is unable to get framebuffer base
+ address and thus fails to load with an error message saying "No valid
+ Framebuffer address in PCI config space" although previously it does
+ print the correct framebuffer address.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit a123285200c6747bfc2631f684a9d1c06c868fb4
+Author: Trevor Woerner <twoerner@gmail.com>
+Date: Fri Oct 22 20:48:13 2010 -0400
+
+ Convert x+m/calloc/free to m/calloc/free.
+
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 477fe18698b95b546669a3d2089045ed4c7141d8
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:52 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6959ac1434c3594221f340f4d7f3d1489f585f8e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 398afc967e3774012576c63315b1de9b9d7e6892
+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>
+
+commit 141beb8c016038d668433391fa44fde077cfb8b8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:37:42 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e655cbc99c454dde624520762d447fa1227cff2a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 27b18cd6f06b50f3072e28ef56bb48f97de23e57
+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>
+
+commit 524aea5bc711b65c00f6b31a7617f3d6e940b34d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3b615fed4f601bb0bb9da81420dc9725abbee62d
+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>
+
+commit 14bcede477a7039855ed8490792b47b8685d3e8d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 19:41:31 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>
+
+commit 1f2e2a3985eed072e003e6f4800e6f1e143b6b75
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 18:45:19 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>
+
+commit c32e20a3e2740a316c5088cfd682f6f18edc0db6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 16:15:30 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
commit f80842085c790c3acf611d3944939f9515e4bee2
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:16:09 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index 89db353..2803ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-tseng (1:1.2.4-3) UNRELEASED; urgency=low
+
+ * Merge from upstream master branch up to 8f41e5d8bb to fix the
+ FTBFS with X server 1.12.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 01 May 2012 19:57:12 +0200
+
xserver-xorg-video-tseng (1:1.2.4-2) unstable; urgency=low
* Switch to dh:
commit 8f41e5d8bb40d6bb184b4806b701a3e11caf43c3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Nov 1 20:37:14 2011 -0700
Build fix for -Werror=int-to-pointer-cast
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tseng_dga.c b/src/tseng_dga.c
index cb57dfe..528ba4c 100644
--- a/src/tseng_dga.c
+++ b/src/tseng_dga.c
@@ -135,7 +135,7 @@ Tseng_OpenFramebuffer(
TsengPtr pTseng = TsengPTR(pScrn);
*name = NULL; /* no special device */
- *mem = (unsigned char*)pTseng->FbAddress;
+ *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress;
*size = pTseng->FbMapSize;
*offset = 0; /* Always */
*flags = 0; /* Root permissions OS-dependent */
commit 9d9895962f4078404dae06a2db5d3fe3a23e0133
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 01:11:49 2011 -0700
Fix a compiler warning
tseng_cursor.c:163:1: warning: no previous prototype for 'TsengLoadCursorImage' [-Wmissing-prototypes]
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c
index d4fb847..2412b31 100644
--- a/src/tseng_cursor.c
+++ b/src/tseng_cursor.c
@@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
}
}
-void
+static void
TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
commit 39dd08e1b84c9aecf4eb296db51f25f4b2ff925c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 01:09:30 2011 -0700
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tseng_mode.c b/src/tseng_mode.c
index 7649efd..a3ff87d 100644
--- a/src/tseng_mode.c
+++ b/src/tseng_mode.c
@@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value)
if (hwp->MMIOBase)
MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value);
else
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
outb(hwp->PIOOffset + VGA_BANK, value);
+#else
+ pci_io_write8(hwp->io, VGA_BANK, value);
+#endif
}
CARD8
@@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp)
if (hwp->MMIOBase)
return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK);
else
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
return inb(hwp->PIOOffset + VGA_BANK);
+#else
+ return pci_io_read8(hwp->io, VGA_BANK);
+#endif
}
#define VGA_SEGMENT 0x3CD
@@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value)
if (hwp->MMIOBase)
MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value);
else
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
outb(hwp->PIOOffset + VGA_SEGMENT, value);
+#else
+ pci_io_write8(hwp->io, VGA_SEGMENT, value);
+#endif
}
CARD8
@@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp)
if (hwp->MMIOBase)
return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT);
else
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
return inb(hwp->PIOOffset + VGA_SEGMENT);
+#else
+ return pci_io_read8(hwp->io, VGA_SEGMENT);
+#endif
}
/*
@@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value)
if (hwp->MMIOBase)
MMIO_OUT8(hwp->MMIOBase,
hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value);
- else
- outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value);
+ else
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ outb(hwp->PIOOffset + VGA_MODE_CONTROL, value);
+#else
+ pci_io_write8(hwp->io, VGA_MODE_CONTROL, value);
+#endif
}
/*
@@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable)
MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp);
} else {
- tmp = inb(hwp->PIOOffset + VGA_HERCULES);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ tmp = inb(hwp->PIOOffset + VGA_HERCULES);
+#else
+ tmp = pci_io_read8(hwp->io, VGA_HERCULES);
+#endif
if (Enable)
tmp |= 0x02;
else
tmp &= ~0x02;
- outb(hwp->PIOOffset + VGA_HERCULES, tmp);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ outb(hwp->PIOOffset + VGA_HERCULES, tmp);
+#else
+ pci_io_write8(hwp->io, VGA_HERCULES, tmp);
+#endif
}
}
commit 542e65deaf834c3d58c44064206445e4d18f6daa
Author: BALATON Zoltan <balaton@eik.bme.hu>
Date: Sat Jun 11 12:50:16 2011 +0200
Fix regression from pciaccess conversion (bug#32682)
Due to a typo in TsengGetFbAddress it is unable to get framebuffer base
address and thus fails to load with an error message saying "No valid
Framebuffer address in PCI config space" although previously it does
print the correct framebuffer address.
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 6992671..d36b62c 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
PDEBUG(" TsengGetFbAddress\n");
/* base0 is the framebuffer and base1 is the PCI IO space. */
- if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
+ if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"No valid Framebuffer address in PCI config space;\n");
return FALSE;
commit a123285200c6747bfc2631f684a9d1c06c868fb4
Author: Trevor Woerner <twoerner@gmail.com>
Date: Fri Oct 22 20:48:13 2010 -0400
Convert x+m/calloc/free to m/calloc/free.
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/src/tseng_dga.c b/src/tseng_dga.c
index 70ebe23..cb57dfe 100644
--- a/src/tseng_dga.c
+++ b/src/tseng_dga.c
@@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen)
if (!pTseng->DGAnumModes) {
pMode = firstMode = pScrn->modes;
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;
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 445c17e..6992671 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn)
pTseng = TsengPTR(pScrn);
if (pTseng->SavedReg.RAMDAC)
- xfree(pTseng->SavedReg.RAMDAC);
+ free(pTseng->SavedReg.RAMDAC);
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
}
- xfree(devSections);
+ free(devSections);
return foundScreen;
}
@@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pTseng->Options = xalloc(sizeof(TsengOptions))))
+ if (!(pTseng->Options = malloc(sizeof(TsengOptions))))
return FALSE;
memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options);
diff --git a/src/tseng_mode.c b/src/tseng_mode.c
index f075226..7649efd 100644
--- a/src/tseng_mode.c
+++ b/src/tseng_mode.c
@@ -1502,7 +1502,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode)
/* clean up */
if (new->RAMDAC)
- xfree(new->RAMDAC);
+ free(new->RAMDAC);
return TRUE;
}
commit 477fe18698b95b546669a3d2089045ed4c7141d8
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:52 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/tseng.man b/man/tseng.man
index 403782f..984c8e7 100644
--- a/man/tseng.man
+++ b/man/tseng.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH TSENG __drivermansuffix__ __vendorversion__
commit 6959ac1434c3594221f340f4d7f3d1489f585f8e
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 969845a..8458c06 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-tseng],
[1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-tseng])
-
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 X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
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,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# 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(DPMSExtension, xextproto)
-# 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.
@@ -77,7 +78,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
AC_SUBST([moduledir])
DRIVER_NAME=tseng
commit 398afc967e3774012576c63315b1de9b9d7e6892
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 4e324c3..969845a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,8 +83,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=tseng
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit 141beb8c016038d668433391fa44fde077cfb8b8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:42 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 91dbe46..4e324c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
commit e655cbc99c454dde624520762d447fa1227cff2a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:23 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 2fe63ca..91dbe46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-tseng],
[xf86-video-tseng])
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 27b18cd6f06b50f3072e28ef56bb48f97de23e57
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 800227f..2fe63ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-tseng],
- 1.2.4,
+ [1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-tseng)
+ [xf86-video-tseng])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 524aea5bc711b65c00f6b31a7617f3d6e940b34d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:58 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 62ee25a..800227f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,6 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=tseng
commit 3b615fed4f601bb0bb9da81420dc9725abbee62d
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 3c556d0..62ee25a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,8 +77,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-# Checks for header files.
-AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
commit 14bcede477a7039855ed8490792b47b8685d3e8d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 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 1031d50..3c556d0 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 1f2e2a3985eed072e003e6f4800e6f1e143b6b75
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 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 cd6a064..1031d50 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-tseng],
1.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit c32e20a3e2740a316c5088cfd682f6f18edc0db6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:30 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index 62cc318..cd6a064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
Reply to: