[Git][xorg-team/driver/xserver-xorg-video-neomagic][upstream-unstable] 9 commits: configure: Drop AM_MAINTAINER_MODE

[Andreas Boll <aboll@debian.org>]

Title: GitLab

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 <alan.coopersmith@oracle.com>
  

• 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 <alan.coopersmith@oracle.com>
  

• 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 <peter.hutterer@who-t.net>
  Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
  

• 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 <emil.l.velikov@gmail.com>
  Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  

• 81b8ea1c
  by Mihail Konev at 2017-01-26T04:00:22Z

  autogen: add default patch prefix
  
  Signed-off-by: Mihail Konev <k.mvc@ya.ru>
  

• f30dde6f
  by Alan Coopersmith at 2018-11-25T22:33:22Z

  Update configure.ac bug URL for gitlab migration
  
  Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  

• 0b1df1d5
  by Kevin Brace at 2018-12-22T21:48:24Z

  Eliminate unused variable compilation warning
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

• 188c1b8d
  by Kevin Brace at 2018-12-22T21:53:03Z

  Suppress unused function compilation warning
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

• 754031be
  by Kevin Brace at 2018-12-25T00:48:32Z

  Version bumped to 1.3.0
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

3 changed files:

• autogen.sh
• configure.ac
• src/neo_driver.c

Changes:

autogen.sh

---

1	1	#! /bin/sh
2	2
3		-srcdir=`dirname $0`
	3	+srcdir=`dirname "$0"`
4	4	test -z "$srcdir" && srcdir=.
5	5
6	6	ORIGDIR=`pwd`
7		-cd $srcdir
	7	+cd "$srcdir"
8	8
9	9	autoreconf -v --install || exit 1
10		-cd $ORIGDIR || exit $?
	10	+cd "$ORIGDIR" || exit $?
11	11
12		-$srcdir/configure --enable-maintainer-mode "$@"
	12	+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
	13	+ git config --local format.subjectPrefix "PATCH xf86-video-neomagic"
	14	+
	15	+if test -z "$NOCONFIGURE"; then
	16	+ exec "$srcdir"/configure "$@"
	17	+fi

configure.ac

---

...	...	@@ -23,8 +23,8 @@
23	23	# Initialize Autoconf
24	24	AC_PREREQ([2.60])
25	25	AC_INIT([xf86-video-neomagic],
26		- [1.2.9],
27		- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
	26	+ [1.3.0],
	27	+ [https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic/issues],
28	28	[xf86-video-neomagic])
29	29	AC_CONFIG_SRCDIR([Makefile.am])
30	30	AC_CONFIG_HEADERS([config.h])
...	...	@@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
32	32
33	33	# Initialize Automake
34	34	AM_INIT_AUTOMAKE([foreign dist-bzip2])
35		-AM_MAINTAINER_MODE
36	35
37	36	# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
38	37	m4_ifndef([XORG_MACROS_VERSION],

src/neo_driver.c

---

...	...	@@ -118,7 +118,9 @@ static ModeStatus NEOValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
118	118	Bool verbose, int flags);
119	119
120	120	/* Internally used functions */
	121	+#ifdef HAVE_ISA
121	122	static int neoFindIsaDevice(GDevPtr dev);
	123	+#endif
122	124	static Bool neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
123	125	static void neoSave(ScrnInfoPtr pScrn);
124	126	static void neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg,
...	...	@@ -1954,7 +1956,6 @@ static Bool
1954	1956	neoMapMem(ScrnInfoPtr pScrn)
1955	1957	{
1956	1958	NEOPtr nPtr = NEOPTR(pScrn);
1957		- vgaHWPtr hwp = VGAHWPTR(pScrn);
1958	1959
1959	1960	if (!nPtr->noMMIO) {
1960	1961	if (nPtr->pEnt->location.type == BUS_PCI){

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.