.gitignore | 70 +++++++++++++- COPYING | 31 ++++-- ChangeLog | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 17 ++- README | 41 ++++---- README.sgml | 71 -------------- configure.ac | 49 ++++------ debian/changelog | 8 + debian/control | 4 man/.gitignore | 2 man/Makefile.am | 59 ++++-------- src/.gitignore | 6 - src/newport_cursor.c | 2 src/newport_driver.c | 11 -- 14 files changed, 422 insertions(+), 193 deletions(-)
New commits: commit 25fdb7f016fd18c8747d740876dde5ea8cf3e4da Author: Michele Cane <michele.c...@gmail.com> Date: Sun Jul 21 20:56:02 2013 +0200 Build against Xserver 1.14. diff --git a/debian/changelog b/debian/changelog index 1e99ee8..7b08447 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-newport (1:0.2.4-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14. -- Michele Cane <michele.c...@gmail.com> Sun, 21 Jul 2013 20:50:38 +0200 diff --git a/debian/control b/debian/control index 738c09d..1c89f78 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: quilt, xutils-dev, pkg-config, - xserver-xorg-dev (>= 2:1.9.4), + xserver-xorg-dev (>= 2:1.14), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, commit 83a3d71f694b8a827bc70c0d3428cd433c4adba3 Author: Michele Cane <michele.c...@gmail.com> Date: Sun Jul 21 20:54:07 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 9503b4b..1e99ee8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-newport (1:0.2.4-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane <michele.c...@gmail.com> Sun, 21 Jul 2013 20:50:38 +0200 diff --git a/debian/control b/debian/control index d322d53..738c09d 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-newport Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-newport.git commit bd16d03887f060967bd7a9d847ae53320d601f85 Author: Michele Cane <michele.c...@gmail.com> Date: Sun Jul 21 20:51:58 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index b1ef836..2262350 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,247 @@ +commit 0d20e0453fcbe348e517e65fa45126ea4b4477cc +Author: Julien Cristau <jcris...@debian.org> +Date: Sat May 12 13:29:07 2012 +0200 + + xf86-video-newport 0.2.4 + +commit 3e01816ce8a8d42144cb6726435ee72cf698ce92 +Author: Matt Turner <matts...@gmail.com> +Date: Mon Sep 26 22:54:13 2011 -0400 + + Remove if(E != NULL) checks around free(E) + + Signed-off-by: Matt Turner <matts...@gmail.com> + +commit 95b2e6f88fca70216d0bffd813981316ec74b2de +Author: Paulo Zanoni <pzan...@mandriva.com> +Date: Mon Dec 13 15:55:18 2010 -0200 + + Replace X{c,r,}alloc and Xfree for stdlib functions + + Signed-off-by: Paulo Zanoni <pzan...@mandriva.com> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + Signed-off-by: Julien Cristau <jcris...@debian.org> + +commit 21c5ff7a38fb0a678f90478659e5e486213fb6a0 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jul 21 16:49:04 2010 -0400 + + config: add comments for main statements + +commit 1e66f6b1960fbc1261da1118083c5283f06fc1c5 +Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> + +commit f669d93ea1a6e2de304ff0a73e5d8ace0c9094ba +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jul 21 14:37:41 2010 -0400 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit be8da92fde7a6d5606ff052ae18ce7027fc14160 +Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> + +commit cd3146c2e05b6e2005ff696e6b2daf448246d11d +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jul 21 09:27:42 2010 -0400 + + config: complete AC_INIT m4 quoting + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 7fa3f4afea77c3eb7768ee18b7ddf352024bdf4a +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Jul 20 21:44:57 2010 -0400 + + config: remove unrequired AC_SUBST([XORG_CFLAGS]) + + This macro is called by PKG_CHECK_MODULES + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit fbbe579d900759cdf3cca486e5af9ed537c1fae2 +Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> + +commit 6a5c1636c9b2e73e02af94e14cc7a7d41a442ce9 +Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> + +commit 47fe48827a8cafad37a05c39e9b450738aa2ed61 +Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> + +commit 4bbbfb202fd1d31340e9eaff929a3a14d9a4c884 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Jul 20 16:15:29 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 c46b3ca0418dedfa7a8a526f014dc2e43c4f785d +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Jun 13 19:26:30 2010 -0400 + + README: keep the text version of README, discard the sgml version + + The linuxdoc doc tool is deprecated. + README files are exclusively text files. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit dd7a59d040c7a6b6b721f241537c3426d9865c7f +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Jun 13 19:21:38 2010 -0400 + + README: fix linuxdoc content + + defs.ent are located under X11 directory + ident tag is not a Linuxdoc tag + replace docbook email tag with linuxdoc email tag + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit feb48d8c797370d827a4be5472e209c13ffeb4f1 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sat Jun 12 20:49:44 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 48f48e585bf542be48d7d34dc66d430d6843268f +Author: Julien Cristau <jcris...@debian.org> +Date: Sat Jan 23 14:46:46 2010 +0100 + + newport: stop using obsolete loader functions + + The loader symbol list functions have been removed from the server in + 1.7. + + Reported-and-tested-by: Bernhard R. Link <brl...@debian.org> + Signed-off-by: Julien Cristau <jcris...@debian.org> + +commit 12f5f9a07259b986fdf9f76004da9512f7890382 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Jan 15 15:54:02 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + +commit c7912af51eb02292ae7efde7ce8165b22935bf57 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Dec 15 22:01:02 2009 -0500 + + configure.ac: remove unused sdkdir=$(pkg-config...) statement + + The sdkdir variable isn't use, so remove the statement. + + Acked-by: Dan Nicholson <dbn.li...@gmail.com> + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit fb0e0d04d1e229ebd1c60ce5359518fb14460f2e +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Nov 23 09:25:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 79d2c1d3303d297bce9f21d46c5f3def2675b422 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit 63d439b2aee729746c30437f70b277787b22bd8e +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 50bd1735e0e472874672370406ab789c75c435d5 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Oct 26 12:54:21 2009 -0400 + + Several driver modules do not have a ChangeLog target in Makefile.am #23814 + + The git generated ChangeLog replaces the hand written one. + Update configure.ac to xorg-macros level 1.3. + Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros + Update Makefile.am to add ChangeLog target if missing + Remove ChangeLog from EXTRA_DIST or *CLEAN variables + This is a pre-req for the INSTALL_CMD + +commit 33495617d19fc2184df2666730c47407dfad0cdb +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Oct 22 13:02:23 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 82fcf213449be382a1b99a371a0e40398d87f41b +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Oct 22 12:34:17 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit d389e0a1de0b8861d6869866fc133bc970014c36 Author: Dave Airlie <airl...@redhat.com> Date: Mon Sep 7 15:03:57 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 6ab255a..9503b4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-newport (1:0.2.4-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Michele Cane <michele.c...@gmail.com> Sun, 21 Jul 2013 20:50:38 +0200 + xserver-xorg-video-newport (1:0.2.3-2) unstable; urgency=low * Switch to dh: commit 0d20e0453fcbe348e517e65fa45126ea4b4477cc Author: Julien Cristau <jcris...@debian.org> Date: Sat May 12 13:29:07 2012 +0200 xf86-video-newport 0.2.4 diff --git a/configure.ac b/configure.ac index 1fd8896..fff23b8 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-newport], - [0.2.3], + [0.2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-newport]) AC_CONFIG_SRCDIR([Makefile.am]) commit 3e01816ce8a8d42144cb6726435ee72cf698ce92 Author: Matt Turner <matts...@gmail.com> Date: Mon Sep 26 22:54:13 2011 -0400 Remove if(E != NULL) checks around free(E) Signed-off-by: Matt Turner <matts...@gmail.com> diff --git a/src/newport_driver.c b/src/newport_driver.c index 5fb6f18..93f765c 100644 --- a/src/newport_driver.c +++ b/src/newport_driver.c @@ -187,8 +187,6 @@ NewportGetRec(ScrnInfoPtr pScrn) static Bool NewportFreeRec(ScrnInfoPtr pScrn) { - if (pScrn->driverPrivate == NULL) - return TRUE; free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; return TRUE; @@ -654,8 +652,7 @@ NewportCloseScreen(int scrnIndex, ScreenPtr pScreen) #endif NewportRestore(pScrn, TRUE); - if (pNewport->ShadowPtr) - free(pNewport->ShadowPtr); + free(pNewport->ShadowPtr); /* unmap the Newport's registers from memory */ NewportUnmapRegs(pScrn); commit 95b2e6f88fca70216d0bffd813981316ec74b2de Author: Paulo Zanoni <pzan...@mandriva.com> Date: Mon Dec 13 15:55:18 2010 -0200 Replace X{c,r,}alloc and Xfree for stdlib functions Signed-off-by: Paulo Zanoni <pzan...@mandriva.com> Reviewed-by: Jeremy Huddleston <jerem...@apple.com> Signed-off-by: Julien Cristau <jcris...@debian.org> diff --git a/src/newport_cursor.c b/src/newport_cursor.c index 3264de4..37b7492 100644 --- a/src/newport_cursor.c +++ b/src/newport_cursor.c @@ -125,7 +125,7 @@ static unsigned char* NewportRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr CARD32 *mem, *SrcS, *SrcM, *DstS; unsigned int i; - if (!(mem = xcalloc(1, size))) + if (!(mem = calloc(1, size))) return NULL; SrcS = (CARD32*)pCurs->bits->source; diff --git a/src/newport_driver.c b/src/newport_driver.c index 6bd7c9f..5fb6f18 100644 --- a/src/newport_driver.c +++ b/src/newport_driver.c @@ -189,7 +189,7 @@ NewportFreeRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate == NULL) return TRUE; - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; return TRUE; } @@ -255,7 +255,7 @@ NewportProbe(DriverPtr drv, int flags) } } } - xfree(devSections); + free(devSections); return foundScreen; } @@ -354,7 +354,7 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags) /* Fill in pScrn->options) */ xf86CollectOptions(pScrn, NULL); - if (!(pNewport->Options = xalloc(sizeof(NewportOptions)))) + if (!(pNewport->Options = malloc(sizeof(NewportOptions)))) return FALSE; memcpy(pNewport->Options, NewportOptions, sizeof(NewportOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pNewport->Options); @@ -655,7 +655,7 @@ NewportCloseScreen(int scrnIndex, ScreenPtr pScreen) NewportRestore(pScrn, TRUE); if (pNewport->ShadowPtr) - xfree(pNewport->ShadowPtr); + free(pNewport->ShadowPtr); /* unmap the Newport's registers from memory */ NewportUnmapRegs(pScrn); commit 21c5ff7a38fb0a678f90478659e5e486213fb6a0 Author: Gaetan Nadon <mems...@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 b5cb076..1fd8896 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-newport], [0.2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-newport]) - 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,29 +40,29 @@ 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) -# 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. - AC_SUBST([moduledir]) DRIVER_NAME=newport commit 1e66f6b1960fbc1261da1118083c5283f06fc1c5 Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index b191898..b5cb076 100644 --- a/configure.ac +++ b/configure.ac @@ -68,8 +68,9 @@ AC_SUBST([moduledir]) DRIVER_NAME=newport AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([ - Makefile - src/Makefile - man/Makefile +AC_CONFIG_FILES([ + Makefile + src/Makefile + man/Makefile ]) +AC_OUTPUT commit f669d93ea1a6e2de304ff0a73e5d8ace0c9094ba Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Jul 21 14:37:41 2010 -0400 config: replace deprecated AC_HELP_STRING with AS_HELP_STRING Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index b12cff7..b191898 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 be8da92fde7a6d5606ff052ae18ce7027fc14160 Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 8ff2460..b12cff7 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_INIT([xf86-video-newport], [xf86-video-newport]) 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 cd3146c2e05b6e2005ff696e6b2daf448246d11d Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Jul 21 09:27:42 2010 -0400 config: complete AC_INIT m4 quoting Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 65c8ea2..8ff2460 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-newport], - 0.2.3, + [0.2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-video-newport) + [xf86-video-newport]) AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) commit 7fa3f4afea77c3eb7768ee18b7ddf352024bdf4a Author: Gaetan Nadon <mems...@videotron.ca> Date: Tue Jul 20 21:44:57 2010 -0400 config: remove unrequired AC_SUBST([XORG_CFLAGS]) This macro is called by PKG_CHECK_MODULES Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index e206fc2..65c8ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M # Checks for libraries. -AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) DRIVER_NAME=newport commit fbbe579d900759cdf3cca486e5af9ed537c1fae2 Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 7a668d6..e206fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -62,8 +62,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M # Checks for libraries. -# Checks for header files. -AC_HEADER_STDC AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) commit 6a5c1636c9b2e73e02af94e14cc7a7d41a442ce9 Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index f2dffbf..7a668d6 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 47fe48827a8cafad37a05c39e9b450738aa2ed61 Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index fff45ab..f2dffbf 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-newport], 0.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], commit 4bbbfb202fd1d31340e9eaff929a3a14d9a4c884 Author: Gaetan Nadon <mems...@videotron.ca> Date: Tue Jul 20 16:15:29 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 61833ec..fff45ab 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) < $< > $@ commit c46b3ca0418dedfa7a8a526f014dc2e43c4f785d Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Jun 13 19:26:30 2010 -0400 README: keep the text version of README, discard the sgml version The linuxdoc doc tool is deprecated. README files are exclusively text files. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/Makefile.am b/Makefile.am index 99b6082..33384c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,12 +21,7 @@ SUBDIRS = src man MAINTAINERCLEANFILES = ChangeLog INSTALL -if BUILD_LINUXDOC -README: README.sgml - $(MAKE_TEXT) README.sgml && mv README.txt README -endif - -EXTRA_DIST = XF86Config.indy README.sgml +EXTRA_DIST = XF86Config.indy .PHONY: ChangeLog INSTALL diff --git a/README.sgml b/README.sgml deleted file mode 100644 index 750b3a1..0000000 --- a/README.sgml +++ /dev/null @@ -1,69 +0,0 @@ -<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [ -<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs; -]> - -<article> -<title>Information for newport Users -<author>Guido Günther -<date>24 February 2003 -<toc> - -<sect>Supported Hardware -<p> -This is an unaccelerated driver for the SGI newport cards (a.k.a. XL) as found -in the SGI Indy and Indigo2. Both the 8bit and 24bit versions are tested and -working. - -<sect>Features -<p> -<itemize> - <item>Support for 8 and 24 bit pixel depths - <item>Hardware cursor support to reduce flicker -</itemize> - -<sect>Notes -<p> -<itemize> - <item>X -configure does not generate a xorg.conf file. - <item>There's only a 1280x1024 mode. -</itemize> - - -<sect>Configuration -<p> -The driver auto-detects all device information necessary to -initialize the card on the Indy. The only lines you need in the "Device" -section of your xorg.conf file are: -<verb> - Section "Device" - Identifier "SGI newport" - Driver "newport" - EndSection -</verb> -Indigo2 users have to use the BusID option as documented below. - -However, if you have problems with auto-detection, you can specify: -<itemize> - <item>bitplanes - number of physical bitplanes (8 or 24) - <item>HWCursor - enable or disable hardware cursor - <item>BusID - set this to "1" on the Indigo2 XL -</itemize> - -<sect>Authors -<p> -<itemize> - <item>Guido Guenther <url url="mailto:a...@sigxcpu.org"> -</itemize> - - -<sect>Acknowledgements -<p> -<itemize> - <item>Gleb O. Raiko <url url="mailto:ra...@niisi.msk.ru"> for getting the beast to build - <item>Ralf Baechle <url url="mailto:r...@oss.sgi.com"> for his patience... - <item>Ulf Carlsson <url url="mailto:u...@calypso.engr.sgi.com"> for comments and elf loader code - <item>Nina A. Podolskaya <url url="mailto:n...@niisi.msk.ru"> for elf loader code - <item>all the guys who wrote the newport_con linux kernel code -</itemize> - -</article> diff --git a/configure.ac b/configure.ac index 9a0484c..61833ec 100644 --- a/configure.ac +++ b/configure.ac @@ -72,8 +72,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=newport AC_SUBST([DRIVER_NAME]) -XORG_CHECK_LINUXDOC - AC_OUTPUT([ Makefile src/Makefile commit dd7a59d040c7a6b6b721f241537c3426d9865c7f Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Jun 13 19:21:38 2010 -0400 README: fix linuxdoc content defs.ent are located under X11 directory ident tag is not a Linuxdoc tag replace docbook email tag with linuxdoc email tag Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/README b/README index 1295a9d..659b801 100644 --- a/README +++ b/README @@ -16,31 +16,31 @@ ______________________________________________________________________ - [1m1. Supported Hardware[0m + 1. Supported Hardware This is an unaccelerated driver for the SGI newport cards (a.k.a. XL) as found in the SGI Indy and Indigo2. Both the 8bit and 24bit versions are tested and working. - [1m2. Features[0m + 2. Features - +o Support for 8 and 24 bit pixel depths + o Support for 8 and 24 bit pixel depths - +o Hardware cursor support to reduce flicker + o Hardware cursor support to reduce flicker - [1m3. Notes[0m + 3. Notes - +o X -configure does not generate a xorg.conf file. + o X -configure does not generate a xorg.conf file. - +o There's only a 1280x1024 mode. + o There's only a 1280x1024 mode. - [1m4. Configuration[0m + 4. Configuration The driver auto-detects all device information necessary to initialize the card on the Indy. The only lines you need in the "Device" section @@ -56,34 +56,35 @@ However, if you have problems with auto-detection, you can specify: - +o bitplanes - number of physical bitplanes (8 or 24) + o bitplanes - number of physical bitplanes (8 or 24) - +o HWCursor - enable or disable hardware cursor + o HWCursor - enable or disable hardware cursor - +o BusID - set this to "1" on the Indigo2 XL + o BusID - set this to "1" on the Indigo2 XL - [1m5. Authors[0m + 5. Authors - +o Guido Guenther <a...@sigxcpu.org> + o Guido Guenther <mailto:a...@sigxcpu.org> - [1m6. Acknowledgements[0m + 6. Acknowledgements - +o Gleb O. Raiko <ra...@niisi.msk.ru> for getting the beast to build + o Gleb O. Raiko <mailto:ra...@niisi.msk.ru> for getting the beast to -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1v39xh-0003ir...@vasks.debian.org