xserver-xorg-video-vesa: Changes to 'upstream-unstable'
autogen.sh | 4 +++-
configure.ac | 12 ++++++------
src/vesa.c | 17 ++++++-----------
3 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit 3e5d56d94720db7a9b97809f15e2432014d94553
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 9 21:14:03 2013 +0200
Bump to 2.3.3
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index b6c0a0e..6ac2333 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vesa],
- [2.3.2],
+ [2.3.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vesa])
AC_CONFIG_SRCDIR([Makefile.am])
commit ad0864d4fae1db24d32e95abff8a37d7eebea7ef
Author: Egbert Eich <eich@freedesktop.org>
Date: Wed May 25 13:35:21 2011 +0200
Make bool option parsing clearer and more consistent
When there's no need to know whether the user has set the value
of a configurable option (for logging for instance) the return
of xf86ReturnOptValBool() can be assigned directly.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/vesa.c b/src/vesa.c
index b73d104..9e3a112 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -838,16 +838,15 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pVesa->Options);
/* Use shadow by default */
- if (xf86ReturnOptValBool(pVesa->Options, OPTION_SHADOW_FB, TRUE))
- pVesa->shadowFB = TRUE;
+ pVesa->shadowFB = xf86ReturnOptValBool(pVesa->Options, OPTION_SHADOW_FB,
+ TRUE);
if (xf86ReturnOptValBool(pVesa->Options, OPTION_DFLT_REFRESH, FALSE))
pVesa->defaultRefresh = TRUE;
- pVesa->ModeSetClearScreen = FALSE;
- if (xf86ReturnOptValBool(pVesa->Options, OPTION_MODESET_CLEAR_SCREEN,
- FALSE))
- pVesa->ModeSetClearScreen = TRUE;
+ pVesa->ModeSetClearScreen =
+ xf86ReturnOptValBool(pVesa->Options,
+ OPTION_MODESET_CLEAR_SCREEN, FALSE);
if (!pVesa->defaultRefresh && !pVesa->strict_validation)
VBESetModeParameters(pScrn, pVesa->pVbe);
commit 29a149544e2120a582043738d5b09dd80e896345
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
commit d6042a43b6cedc7bbd7c1cb1b2f7b9df9fce1102
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 16 13:18:23 2013 -0500
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 08e0571..b6c0a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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],
commit 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 25 08:55:03 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index 11cd26c..b73d104 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -49,9 +49,6 @@
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
/* Colormap handling */
#include "micmap.h"
#include "xf86cmap.h"
@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
VESADGAInit(pScrn, pScreen);
xf86SetBlackWhitePixels(pScreen);
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* software cursor */
commit 7aafaf56fbca97f36c775462c1ceea3e03700c42
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sat Aug 18 20:53:34 2012 +0600
Fix check function in VESASaveRestore
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/vesa.c b/src/vesa.c
index 8ac77da..11cd26c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
{
VESAPtr pVesa;
- if (MODE_QUERY < 0 || function > MODE_RESTORE)
+ if (function < MODE_QUERY || function > MODE_RESTORE)
return (FALSE);
pVesa = VESAGetRec(pScrn);
commit 4cb7fa8191ca41491330e4adc8c8188648ed7e11
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sat Aug 18 20:53:33 2012 +0600
Remove unneeded AM_CONDITIONAL
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 6317acd..08e0571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,9 +60,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
- HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
- HAVE_XEXTPROTO_71="no")
-AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+ HAVE_XEXTPROTO_71="yes", HAVE_XEXTPROTO_71="no")
+
+if test "x$HAVE_XEXTPROTO_71" = xyes; then
+ AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available])
+fi
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
@@ -90,7 +92,6 @@ CFLAGS="$save_CFLAGS"
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
fi
-AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Checks for libraries.
Reply to: