xserver-xorg-video-vesa: Changes to 'debian-unstable'
COPYING | 1
ChangeLog | 164 +++++++++++++++++++
configure.ac | 44 ++---
debian/changelog | 34 +++
debian/control | 19 +-
debian/copyright | 1
debian/patches/001_ubuntu_bail_when_kms_active.patch | 122 --------------
debian/patches/series | 2
debian/xserver-xorg-video-vesa-udeb.install | 1
man/Makefile.am | 59 ++----
man/vesa.man | 1
src/Makefile.am | 3
src/vesa.c | 85 ++++++---
src/vesa.h | 2
14 files changed, 316 insertions(+), 222 deletions(-)
New commits:
commit bdd24b79e323dd906653cc89e5b237bf8e086a5c
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jun 15 14:58:26 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 6a2ec9f..ef1cc56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:2.3.0-7) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:57:46 +0200
+
xserver-xorg-video-vesa (1:2.3.0-6) experimental; urgency=low
* Add udeb needed for the graphical install on non-Linux ports since
commit 38a72c8be00a683a11f92a9d1364a4eecef0defd
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:46:55 2011 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index f88de58..6a2ec9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.3.0-6) experimental; urgency=low
* Add udeb needed for the graphical install on non-Linux ports since
fbdev is Linux-only (Closes: #596595).
@@ -12,7 +12,7 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for newer macros.
- -- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
+ -- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 01:46:48 +0200
xserver-xorg-video-vesa (1:2.3.0-5+exp2) experimental; urgency=low
commit aedf47effe934303ddf5efbca77b235b509912c2
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:46:36 2011 +0200
As a consequence, libdrm is no longer used, even if libdrm-dev is present at build-time (Closes: #596594).
diff --git a/debian/changelog b/debian/changelog
index a9059bd..f88de58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
* This makes the need for the following patch go away, so remove:
- 001_ubuntu_bail_when_kms_active.patch
* Remove libdrm-dev and x11proto-xf86dri-dev build-dep accordingly.
+ * As a consequence, libdrm is no longer used, even if libdrm-dev is
+ present at build-time (Closes: #596594).
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for newer macros.
commit d9e2dca8acc4fd8c0219b7ff175f6188022257cd
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:36:23 2011 +0200
Bump xutils-dev build-dep for newer macros.
diff --git a/debian/changelog b/debian/changelog
index 6ade56d..a9059bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
- 001_ubuntu_bail_when_kms_active.patch
* Remove libdrm-dev and x11proto-xf86dri-dev build-dep accordingly.
* Update debian/copyright from upstream COPYING.
+ * Bump xutils-dev build-dep for newer macros.
-- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
diff --git a/debian/control b/debian/control
index 116cb4d..88c3236 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
x11proto-fonts-dev,
x11proto-randr-dev,
x11proto-render-dev,
- xutils-dev (>= 1:7.5),
+ xutils-dev (>= 1:7.5+4),
quilt,
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
commit 3362797f581d8257ab0fa45d3f4184fdd9d5f5d7
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:35:30 2011 +0200
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index c23a94b..6ade56d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
* This makes the need for the following patch go away, so remove:
- 001_ubuntu_bail_when_kms_active.patch
* Remove libdrm-dev and x11proto-xf86dri-dev build-dep accordingly.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
diff --git a/debian/copyright b/debian/copyright
index 83ed511..d5a3e65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ This package was downloaded from
http://xorg.freedesktop.org/releases/individual/driver/
Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+Copyright 2008 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
commit 57ed607d70db7b0d3f8986dc91e6d2466b870dcb
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:28:55 2011 +0200
Remove libdrm-dev and x11proto-xf86dri-dev build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index 75d7890..c23a94b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
- Refuse to load if there's a kernel driver bound to the device
* This makes the need for the following patch go away, so remove:
- 001_ubuntu_bail_when_kms_active.patch
+ * Remove libdrm-dev and x11proto-xf86dri-dev build-dep accordingly.
-- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
diff --git a/debian/control b/debian/control
index b5aa23d..116cb4d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,6 @@ Build-Depends:
x11proto-render-dev,
xutils-dev (>= 1:7.5),
quilt,
- libdrm-dev (>= 2.4.3) [!hurd-i386],
- x11proto-xf86dri-dev,
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git
commit 564d20fe79efb2699827063631d33c422dba8357
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:26:45 2011 +0200
This makes the need for the following patch go away.
Remove accordingly: 001_ubuntu_bail_when_kms_active.patch
diff --git a/debian/changelog b/debian/changelog
index f53561f..75d7890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
fbdev is Linux-only (Closes: #596595).
* Merge from upstream master up to 0b02c68581, including:
- Refuse to load if there's a kernel driver bound to the device
+ * This makes the need for the following patch go away, so remove:
+ - 001_ubuntu_bail_when_kms_active.patch
-- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
diff --git a/debian/patches/001_ubuntu_bail_when_kms_active.patch b/debian/patches/001_ubuntu_bail_when_kms_active.patch
deleted file mode 100644
index ae69f9d..0000000
--- a/debian/patches/001_ubuntu_bail_when_kms_active.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From c0416148852843e0dfa14c9219541543cbd6a41d Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
-Date: Wed, 24 Mar 2010 19:11:29 +1100
-Subject: [PATCH] Refuse to bind to a device which has kernel modesetting active.
- .
- Trying to program a VESA mode while kernel modesetting is active can
- result in an improperly driven screen.
-Bug: http://bugs.freedesktop.org/show_bug.cgi?id=26878
-Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/xserver-xorg-video-vesa/+bug/531736
----
- configure.ac | 7 +++++++
- src/Makefile.am | 2 +-
- src/vesa.c | 35 +++++++++++++++++++++++++++++++++++
- 3 files changed, 43 insertions(+), 1 deletions(-)
-
-Index: xserver-xorg-video-vesa/configure.ac
-===================================================================
---- xserver-xorg-video-vesa.orig/configure.ac
-+++ xserver-xorg-video-vesa/configure.ac
-@@ -93,7 +93,14 @@
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
--CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-+ PKG_CHECK_MODULES(LIBDRM, [libdrm > 2.4.3 xf86driproto], HAVE_KMS="yes", HAVE_KMS="no")
-+ if test "x$HAVE_KMS" = xyes; then
-+ AC_DEFINE(HAVE_KMS, 1, [Have kernel modesetting])
-+ fi
-+fi
-+
-+CFLAGS="$CFLAGS $XORG_CFLAGS $LIBDRM_CFLAGS "' -I$(top_srcdir)/src'
- INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])
-@@ -103,6 +110,7 @@
- # Checks for header files.
- AC_HEADER_STDC
-
-+
- DRIVER_NAME=vesa
- AC_SUBST([DRIVER_NAME])
-
-Index: xserver-xorg-video-vesa/src/vesa.c
-===================================================================
---- xserver-xorg-video-vesa.orig/src/vesa.c
-+++ xserver-xorg-video-vesa/src/vesa.c
-@@ -65,6 +65,10 @@
- #include <X11/extensions/dpms.h>
- #endif
-
-+#ifdef HAVE_KMS
-+#include <xf86drmMode.h>
-+#include <dri.h>
-+#endif
-
- /* Mandatory functions */
- static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid);
-@@ -106,6 +110,9 @@
- static void RestoreFonts(ScrnInfoPtr pScrn);
- static Bool
- VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function);
-+#ifdef HAVE_KMS
-+static Bool VESAKernelModesettingEnabled (struct pci_device *device);
-+#endif
-
- static void *
- VESAWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
-@@ -317,6 +324,24 @@
- (double)(ddcmode->HTotal * ddcmode->VTotal));
- }
-
-+#ifdef HAVE_KMS
-+static Bool VESAKernelModesettingEnabled (struct pci_device *device)
-+{
-+ char *busIdString;
-+ int ret;
-+
-+ if (!xf86LoaderCheckSymbol("DRICreatePCIBusID"))
-+ return FALSE;
-+
-+ busIdString = DRICreatePCIBusID(device);
-+
-+ ret = drmCheckModesettingSupported(busIdString);
-+ xfree(busIdString);
-+
-+ return (ret == 0);
-+}
-+#endif //HAVE_KMS
-+
- static ModeStatus
- VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
- {
-@@ -428,6 +453,16 @@
- {
- ScrnInfoPtr pScrn;
-
-+#ifdef HAVE_KMS
-+ /* Trying to bring up a VESA mode while kernel modesetting is enabled
-+ results in badness */
-+ if (VESAKernelModesettingEnabled (dev)) {
-+ xf86Msg (X_ERROR,
-+ "VESA: Kernel modesetting driver in use, refusing to load\n");
-+ return FALSE;
-+ }
-+#endif
-+
- pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
- NULL, NULL, NULL, NULL, NULL);
- if (pScrn != NULL) {
-Index: xserver-xorg-video-vesa/src/Makefile.am
-===================================================================
---- xserver-xorg-video-vesa.orig/src/Makefile.am
-+++ xserver-xorg-video-vesa/src/Makefile.am
-@@ -27,6 +27,7 @@
- vesa_drv_la_LTLIBRARIES = vesa_drv.la
- vesa_drv_la_LDFLAGS = -module -avoid-version
- vesa_drv_ladir = @moduledir@/drivers
-+vesa_drv_la_LIBADD = @LIBDRM_LIBS@
-
- vesa_drv_la_SOURCES = \
- vesa.c \
diff --git a/debian/patches/series b/debian/patches/series
index 915ea3f..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-001_ubuntu_bail_when_kms_active.patch
+# placeholder
commit fc825eeed73c1b93ca2716f6418bec1d793c0b37
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:25:39 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index b602817..24d75fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,167 @@
+commit 0b02c68581f48c3239bc150df137623053794a3e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Feb 14 11:44:02 2011 -0500
+
+ Be forgiving of character-cell size mismatches in mode sizes
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 8e32d9d23c64ed700d3e9c5e6709a4b3c46b204a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Feb 14 10:28:51 2011 -0500
+
+ Fix memory leak in mode validation
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 8 13:45:32 2010 -0500
+
+ Refuse to load if there's a kernel driver bound to the device
+
+ Ported from the equivalent check in nv.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit fba7f460838624f55ade074e1c7690f4aa7aed4d
+Author: Trevor Woerner <twoerner@gmail.com>
+Date: Fri Oct 22 15:23:46 2010 -0400
+
+ Convert x+m/calloc/free to m/calloc/free.
+
+ Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8532158308ef6445ac44276e5c989d343f851431
+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 32e50178f9e12112ab09af442770d43c5fa2ec9a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 61328ed613f9bb822227d5c80d773bdb8eba2742
+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 79e954f1c06ab45ac1a59bbb54bd4a98b15e11e7
+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 12c859a302e6c42b319f660af03c9718adffe699
+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 bda55aa468b43731e5bd1b5ebc1d9a2d927f9b79
+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 8e53d57f165365b0a084f410d2f08a3073d1bece
+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 bcdce845e1b2d48d66e1655bc86e13f3297b1916
+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 ba8aaea71ea7c0f3dcb2bfb3bda6534d3e1c104e
+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 fa1fcd483cc60b5f4e82e3f1fe1a84459cf0eaee
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 13 13:04:25 2010 -0400
+
+ COPYING: update file with Copyright notices from source code.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d82f2e6e52a7cac2f15a20ab91f50f06eaea7e6a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Feb 15 13:39:02 2010 -0500
+
+ config: Move compiler flags from configure.ac to Makefile.am
+
+ Remove unused XORG_INCS variable.
+ Remove unused INCLUDES='-I$(top_srcdir)/src'
+ This statement is redundant and not used in the makefile
+
+ Remove unrequired '-I$(top_srcdir)/src'
+ The current dir is already included by default in the makefile
+ top_builddir = ..
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)
+
+ Move compiler flags from configure.ac to Makefile.am
+ CFLAGS is an automake defined variable that should not be set
+ by the module. It should not be AC_SUBST either, it already is.
+ Use AM_CFLAGS in Makefile.am. This will allow the user to override
+ the flags as they will be in the right order.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 069c1f82149031328bb48479732b0a21be5248dd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 13:46:10 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit ba6527d2695574f6f7808ada39f6caed7a688f39
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 4 14:19:13 2010 -0500
diff --git a/debian/changelog b/debian/changelog
index 8a3db0a..f53561f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
* Add udeb needed for the graphical install on non-Linux ports since
fbdev is Linux-only (Closes: #596595).
+ * Merge from upstream master up to 0b02c68581, including:
+ - Refuse to load if there's a kernel driver bound to the device
-- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
commit b801526998c934edd3be91b6466c9200be50bd35
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 01:23:19 2011 +0200
Use a brand new revision, major changes are upcoming.
diff --git a/debian/changelog b/debian/changelog
index 4884076..8a3db0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vesa (1:2.3.0-5+exp3) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.3.0-6) UNRELEASED; urgency=low
* Add udeb needed for the graphical install on non-Linux ports since
fbdev is Linux-only (Closes: #596595).
commit fba10bc87b124682042144d11731e83739f9ab33
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 4 00:59:42 2011 +0200
Add udeb needed for the graphical install on non-Linux ports (Closes: #596595).
Indeed, fbdev is Linux-only. Clearing NEW through an upload in
experimental, built against 1.10rc3, to be cherry-picked in
debian-unstable once the X stack has migrated to wheezy.
diff --git a/debian/changelog b/debian/changelog
index 9ee6601..4884076 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vesa (1:2.3.0-5+exp3) UNRELEASED; urgency=low
+
+ * Add udeb needed for the graphical install on non-Linux ports since
+ fbdev is Linux-only (Closes: #596595).
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 00:58:39 +0200
+
xserver-xorg-video-vesa (1:2.3.0-5+exp2) experimental; urgency=low
* Rebuild against Xserver 1.10 rc3.
diff --git a/debian/control b/debian/control
index 91a3369..b5aa23d 100644
--- a/debian/control
+++ b/debian/control
@@ -40,3 +40,16 @@ Description: X.Org X server -- VESA display driver
<URL:http://www.X.org>
.
This package is built from the X.org xf86-video-vesa driver module.
+
+Package: xserver-xorg-video-vesa-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: hurd-any kfreebsd-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+Description: X.Org X server -- vesa display driver
+ This is a udeb, or a microdeb, for the debian-installer.
diff --git a/debian/xserver-xorg-video-vesa-udeb.install b/debian/xserver-xorg-video-vesa-udeb.install
new file mode 100644
index 0000000..daf7bfe
--- /dev/null
+++ b/debian/xserver-xorg-video-vesa-udeb.install
@@ -0,0 +1 @@
+usr/lib/xorg/modules/drivers/*.so
commit 349ac5ec38701b5765ff5078eaeff6bf19a0633f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 25 15:56:53 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index a233fa7..9ee6601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-vesa (1:2.3.0-5+exp2) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.3.0-5+exp2) experimental; urgency=low
* Rebuild against Xserver 1.10 rc3.
- -- Cyril Brulebois <kibi@debian.org> Fri, 25 Feb 2011 15:56:48 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 25 Feb 2011 15:56:53 +0100
xserver-xorg-video-vesa (1:2.3.0-5+exp1) experimental; urgency=low
commit 73cccc800e7458a94f5e74e380996a471d11b5c8
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 25 15:56:48 2011 +0100
Rebuild against Xserver 1.10 rc3.
diff --git a/debian/changelog b/debian/changelog
index 3e8e1f9..a233fa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:2.3.0-5+exp2) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc3.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 25 Feb 2011 15:56:48 +0100
+
xserver-xorg-video-vesa (1:2.3.0-5+exp1) experimental; urgency=low
* Rebuild against Xserver 1.10 rc2.
diff --git a/debian/control b/debian/control
index f0b3e1e..91a3369 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.902),
+ xserver-xorg-dev (>= 2:1.9.99.903),
x11proto-xext-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 305447625025d7d65d018aae062138402f34599f
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 21 01:30:09 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 163de17..3e8e1f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-vesa (1:2.3.0-5+exp1) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.3.0-5+exp1) experimental; urgency=low
* Rebuild against Xserver 1.10 rc2.
- -- Cyril Brulebois <kibi@debian.org> Mon, 21 Feb 2011 01:29:10 +0100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 21 Feb 2011 01:29:58 +0100
xserver-xorg-video-vesa (1:2.3.0-5) unstable; urgency=low
commit cc99e572a7e8a320ed5b22551e084316faef33f1
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 21 01:29:36 2011 +0100
Rebuild against Xserver 1.10 rc2.
diff --git a/debian/changelog b/debian/changelog
index 7c707fb..163de17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:2.3.0-5+exp1) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 21 Feb 2011 01:29:10 +0100
+
xserver-xorg-video-vesa (1:2.3.0-5) unstable; urgency=low
* Fix typos in long description.
diff --git a/debian/control b/debian/control
index 93c47d1..f0b3e1e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.9.99.902),
x11proto-xext-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 0b02c68581f48c3239bc150df137623053794a3e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 14 11:44:02 2011 -0500
Be forgiving of character-cell size mismatches in mode sizes
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index ef01881..61d3550 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -317,6 +317,30 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
(double)(ddcmode->HTotal * ddcmode->VTotal));
}
+/*
+ * Despite that VBE gives you pixel granularity for mode sizes, some BIOSes
+ * think they can only give sizes in multiples of character cells; and
+ * indeed, the reference CVT and GTF formulae only give results where
+ * (h % 8) == 0. Whatever, let's just try to cope. What we're looking for
+ * here is cases where the display says 1366x768 and the BIOS says 1360x768.
+ */
+static Bool
+vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr vbe)
+{
+ if (!(edid->type & M_T_DRIVER))
+ return FALSE;
+
+ /* never seen a height granularity... */
+ if (edid->VDisplay != vbe->VDisplay)
+ return FALSE;
+
+ if (edid->HDisplay >= vbe->HDisplay &&
+ (edid->HDisplay & ~7) == (vbe->HDisplay & ~7))
+ return TRUE;
+
+ return FALSE;
+}
+
static ModeStatus
VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
{
@@ -358,9 +382,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
*/
if (pScrn->monitor->DDC) {
for (mode = pScrn->monitor->Modes; mode; mode = mode->next) {
- if (mode->type & M_T_DRIVER &&
- mode->HDisplay == p->HDisplay &&
- mode->VDisplay == p->VDisplay) {
+ if (vesaModesCloseEnough(mode, p)) {
if (xf86CheckModeForMonitor(mode, mon) == MODE_OK) {
found = 1;
break;
commit 8e32d9d23c64ed700d3e9c5e6709a4b3c46b204a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 14 10:28:51 2011 -0500
Fix memory leak in mode validation
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index 2523d76..ef01881 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -391,6 +391,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) {
mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0);
ret = xf86CheckModeForMonitor(mode, mon);
+ free(mode->name);
free(mode);
if (ret == MODE_OK)
break;
commit b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 8 13:45:32 2010 -0500
Refuse to load if there's a kernel driver bound to the device
Ported from the equivalent check in nv.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index 168fde1..2523d76 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
NULL, NULL, NULL, NULL, NULL);
if (pScrn != NULL) {
- VESAPtr pVesa = VESAGetRec(pScrn);
+ VESAPtr pVesa;
+ if (pci_device_has_kernel_driver(dev)) {
+ ErrorF("vesa: Ignoring device with a bound kernel driver\n");
+ return FALSE;
+ }
+
+ pVesa = VESAGetRec(pScrn);
VESAInitScrn(pScrn);
pVesa->pciInfo = dev;
}
commit fba7f460838624f55ade074e1c7690f4aa7aed4d
Author: Trevor Woerner <twoerner@gmail.com>
Date: Fri Oct 22 15:23:46 2010 -0400
Convert x+m/calloc/free to m/calloc/free.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/src/vesa.c b/src/vesa.c
index 034a019..168fde1 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -281,7 +281,7 @@ static VESAPtr
VESAGetRec(ScrnInfoPtr pScrn)
{
if (!pScrn->driverPrivate)
- pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1);
+ pScrn->driverPrivate = calloc(sizeof(VESARec), 1);
return ((VESAPtr)pScrn->driverPrivate);
}
@@ -296,7 +296,7 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
data = (VbeModeInfoData *)vbemode->Private;
- data->block = xcalloc(sizeof(VbeCRTCInfoBlock), 1);
+ data->block = calloc(sizeof(VbeCRTCInfoBlock), 1);
data->block->HorizontalTotal = ddcmode->HTotal;
data->block->HorizontalSyncStart = ddcmode->HSyncStart;
data->block->HorizontalSyncEnd = ddcmode->HSyncEnd;
@@ -391,7 +391,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) {
mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0);
ret = xf86CheckModeForMonitor(mode, mon);
- xfree(mode);
+ free(mode);
if (ret == MODE_OK)
break;
}
@@ -480,7 +480,7 @@ VESAProbe(DriverPtr drv, int flags)
}
}
}
- xfree(usedChips);
+ free(usedChips);
}
}
#endif
@@ -503,11 +503,11 @@ VESAProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
}
#endif
- xfree(devSections);
+ free(devSections);
return (foundScreen);
}
@@ -554,9 +554,9 @@ VESAFreeRec(ScrnInfoPtr pScrn)
VbeModeInfoData *data = (VbeModeInfoData*)mode->Private;
if (data->block)
- xfree(data->block);
+ free(data->block);
- xfree(data);
+ free(data);
mode->Private = NULL;
}
@@ -564,12 +564,12 @@ VESAFreeRec(ScrnInfoPtr pScrn)
} while (mode && mode != pScrn->modes);
}
#endif
- xfree(pVesa->monitor);
- xfree(pVesa->vbeInfo);
- xfree(pVesa->pal);
- xfree(pVesa->savedPal);
- xfree(pVesa->fonts);
- xfree(pScrn->driverPrivate);
+ free(pVesa->monitor);
+ free(pVesa->vbeInfo);
+ free(pVesa->pal);
+ free(pVesa->savedPal);
+ free(pVesa->fonts);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -712,7 +712,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
else {
void *panelid = VBEReadPanelID(pVesa->pVbe);
VBEInterpretPanelID(pScrn->scrnIndex, panelid);
- xfree(panelid);
+ free(panelid);
}
#endif
@@ -805,7 +805,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
/* options */
xf86CollectOptions(pScrn, NULL);
- if (!(pVesa->Options = xalloc(sizeof(VESAOptions)))) {
+ if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) {
vbeFree(pVesa->pVbe);
return FALSE;
}
@@ -940,7 +940,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
pScrn->bitsPerPixel = 8;
if (pVesa->shadowFB) {
- pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY *
+ pVesa->shadow = calloc(1, pScrn->displayWidth * pScrn->virtualY *
((pScrn->bitsPerPixel + 7) / 8));
if (!pVesa->shadow) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1119,10 +1119,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen)
}
if (pVesa->shadowFB && pVesa->shadow) {
shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
- xfree(pVesa->shadow);
+ free(pVesa->shadow);
}
if (pVesa->pDGAMode) {
- xfree(pVesa->pDGAMode);
+ free(pVesa->pDGAMode);
pVesa->pDGAMode = NULL;
pVesa->nDGAMode = 0;
}
@@ -1180,7 +1180,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
* Free it as it will not be any longer useful
*/
xf86ErrorF(", mode set without customized refresh.\n");
- xfree(data->block);
+ free(data->block);
data->block = NULL;
data->mode &= ~(1 << 11);
}
@@ -1315,7 +1315,7 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
int base;
if (pVesa->pal == NULL)
- pVesa->pal = xcalloc(1, sizeof(CARD32) * 256);
+ pVesa->pal = calloc(1, sizeof(CARD32) * 256);
for (i = 0, base = idx = indices[i]; i < numColors; i++, idx++) {
int j = indices[i];
@@ -1414,7 +1414,7 @@ SaveFonts(ScrnInfoPtr pScrn)
if (attr10 & 0x01)
return;
- pVesa->fonts = xalloc(16384);
+ pVesa->fonts = malloc(16384);
/* save the registers that are needed here */
miscOut = ReadMiscOut();
@@ -1622,7 +1622,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
&& function == MODE_SAVE) {
/* don't rely on the memory not being touched */
if (pVesa->pstate == NULL)
- pVesa->pstate = xalloc(pVesa->stateSize);
+ pVesa->pstate = malloc(pVesa->stateSize);
memcpy(pVesa->pstate, pVesa->state, pVesa->stateSize);
}
}
@@ -1737,7 +1737,7 @@ VESADGAAddModes(ScrnInfoPtr pScrn)
DGAModePtr pDGAMode;
do {
- pDGAMode = xrealloc(pVesa->pDGAMode,
+ pDGAMode = realloc(pVesa->pDGAMode,
(pVesa->nDGAMode + 1) * sizeof(DGAModeRec));
if (!pDGAMode)
Reply to: