Andreas Boll pushed to branch upstream-unstable at X Strike Force / driver / xserver-xorg-video-neomagic
Commits: e3951f71 by Alan Coopersmith at 2017-01-26T01:16:37Z configure: Drop AM_MAINTAINER_MODE Signed-off-by: Alan Coopersmith <[email protected]> - - - - - 26a5c0f3 by Alan Coopersmith at 2017-01-26T01:16:37Z autogen.sh: Honor NOCONFIGURE=1 See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <[email protected]> - - - - - dab4b6ca by Peter Hutterer at 2017-01-26T01:23:46Z autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Emil Velikov <[email protected]> - - - - - 8f9e23c2 by Emil Velikov at 2017-01-26T01:26:28Z autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Peter Hutterer <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> - - - - - 81b8ea1c by Mihail Konev at 2017-01-26T04:00:22Z autogen: add default patch prefix Signed-off-by: Mihail Konev <[email protected]> - - - - - f30dde6f by Alan Coopersmith at 2018-11-25T22:33:22Z Update configure.ac bug URL for gitlab migration Signed-off-by: Alan Coopersmith <[email protected]> - - - - - 0b1df1d5 by Kevin Brace at 2018-12-22T21:48:24Z Eliminate unused variable compilation warning Signed-off-by: Kevin Brace <[email protected]> - - - - - 188c1b8d by Kevin Brace at 2018-12-22T21:53:03Z Suppress unused function compilation warning Signed-off-by: Kevin Brace <[email protected]> - - - - - 754031be by Kevin Brace at 2018-12-25T00:48:32Z Version bumped to 1.3.0 Signed-off-by: Kevin Brace <[email protected]> - - - - - 3 changed files: - autogen.sh - configure.ac - src/neo_driver.c Changes: ===================================== autogen.sh ===================================== @@ -1,12 +1,17 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xf86-video-neomagic" + +if test -z "$NOCONFIGURE"; then + exec "$srcdir"/configure "$@" +fi ===================================== configure.ac ===================================== @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-neomagic], - [1.2.9], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic], + [1.3.0], + [https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic/issues], [xf86-video-neomagic]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -32,7 +32,6 @@ 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 m4_ifndef([XORG_MACROS_VERSION], ===================================== src/neo_driver.c ===================================== @@ -118,7 +118,9 @@ static ModeStatus NEOValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags); /* Internally used functions */ +#ifdef HAVE_ISA static int neoFindIsaDevice(GDevPtr dev); +#endif static Bool neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); static void neoSave(ScrnInfoPtr pScrn); static void neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, @@ -1954,7 +1956,6 @@ static Bool neoMapMem(ScrnInfoPtr pScrn) { NEOPtr nPtr = NEOPTR(pScrn); - vgaHWPtr hwp = VGAHWPTR(pScrn); if (!nPtr->noMMIO) { if (nPtr->pEnt->location.type == BUS_PCI){ View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-neomagic/compare/f0a61bc00011b0497edc79cf6fa11ae88a227df9...754031be27385154d39b65f8d703279f841b2c31 -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-neomagic/compare/f0a61bc00011b0497edc79cf6fa11ae88a227df9...754031be27385154d39b65f8d703279f841b2c31 You're receiving this email because of your account on salsa.debian.org.
