ChangeLog | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +-- debian/changelog | 17 ++++++++++++++++ debian/control | 3 +- src/vesa.c | 49 +++++++++++++++++++++++++++------------------- src/vesa.h | 2 - 6 files changed, 109 insertions(+), 24 deletions(-)
New commits: commit 0ad639b4992a95741939a44cc3f643f4a4a48fd0 Author: Cyril Brulebois <k...@debian.org> Date: Mon Apr 2 01:53:03 2012 +0000 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index a1b22b0..2fc5392 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-vesa (1:2.3.1-1) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.1-1) unstable; urgency=low * New upstream release. * Upload to unstable, so lower xserver-xorg-dev build-dep. - -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:48:06 +0000 + -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:52:58 +0000 xserver-xorg-video-vesa (1:2.3.0-7+exp1) experimental; urgency=low commit fae50ef93365c7f312b3b62dec38ebb6adb56082 Author: Cyril Brulebois <k...@debian.org> Date: Mon Apr 2 01:52:54 2012 +0000 Upload to unstable, so lower xserver-xorg-dev build-dep. diff --git a/debian/changelog b/debian/changelog index b2ed35c..a1b22b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-vesa (1:2.3.1-1) UNRELEASED; urgency=low * New upstream release. + * Upload to unstable, so lower xserver-xorg-dev build-dep. -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:48:06 +0000 diff --git a/debian/control b/debian/control index ad7c43e..99a71a7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.11.99.901), + xserver-xorg-dev (>= 2:1.11), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, commit 1874e6eb72b45ff21647b85676f352af5f685f11 Author: Cyril Brulebois <k...@debian.org> Date: Mon Apr 2 01:48:19 2012 +0000 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 9ed91ef..f7bd897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +commit 8cd553551767c0f970912fb73cae3aa733434106 +Author: Adam Jackson <a...@redhat.com> +Date: Thu Mar 22 17:32:22 2012 -0400 + + vesa 2.3.1 + + Signed-off-by: Adam Jackson <a...@redhat.com> + commit 4ba7306fd0c9533750d389829e2cbf0522e149b3 Author: Jeremy Huddleston <jerem...@apple.com> Date: Wed Oct 19 01:49:38 2011 -0700 diff --git a/debian/changelog b/debian/changelog index 14180d9..b2ed35c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-vesa (1:2.3.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <k...@debian.org> Mon, 02 Apr 2012 01:48:06 +0000 + xserver-xorg-video-vesa (1:2.3.0-7+exp1) experimental; urgency=low * Merge from upstream master up to 4ba7306fd0 to make it possible commit 8cd553551767c0f970912fb73cae3aa733434106 Author: Adam Jackson <a...@redhat.com> Date: Thu Mar 22 17:32:22 2012 -0400 vesa 2.3.1 Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/configure.ac b/configure.ac index 5d39bbc..4288bdd 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-vesa], - [2.3.0], + [2.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-vesa]) AC_CONFIG_SRCDIR([Makefile.am]) commit 9411c663717c42bc2b9ab29e186293e8bf756246 Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 07:04:27 2012 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 3c469f3..14180d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-vesa (1:2.3.0-7+exp1) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.0-7+exp1) experimental; urgency=low * Merge from upstream master up to 4ba7306fd0 to make it possible to build against 1.12 RC1 (video ABI 12). @@ -6,7 +6,7 @@ xserver-xorg-video-vesa (1:2.3.0-7+exp1) UNRELEASED; urgency=low * Add an explicit build-dep on libpciaccess-dev (pulled implicitly through xserver-xorg-dev), with the right version. - -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:56:57 +0100 + -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 07:04:23 +0100 xserver-xorg-video-vesa (1:2.3.0-7) unstable; urgency=low commit 3447c4caffd96e2c80b12ab13a78ef013cd6954a Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 07:01:53 2012 +0100 Add an explicit build-dep on libpciaccess-dev. It was pulled implicitly through xserver-xorg-dev. diff --git a/debian/changelog b/debian/changelog index 800e458..3c469f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ xserver-xorg-video-vesa (1:2.3.0-7+exp1) UNRELEASED; urgency=low * Merge from upstream master up to 4ba7306fd0 to make it possible to build against 1.12 RC1 (video ABI 12). * Build against Xserver 1.12 RC1. + * Add an explicit build-dep on libpciaccess-dev (pulled implicitly + through xserver-xorg-dev), with the right version. -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:56:57 +0100 diff --git a/debian/control b/debian/control index cf89861..ad7c43e 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: x11proto-render-dev, xutils-dev (>= 1:7.5+4), quilt, + libpciaccess-dev (>= 0.12.901), 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 d2dd447843100d5fe4e12a4fa13b9e4200195b4d Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:59:13 2012 +0100 Build against Xserver 1.12 RC1. diff --git a/debian/changelog b/debian/changelog index a7522d1..800e458 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-vesa (1:2.3.0-7+exp1) UNRELEASED; urgency=low * Merge from upstream master up to 4ba7306fd0 to make it possible to build against 1.12 RC1 (video ABI 12). + * Build against Xserver 1.12 RC1. -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:56:57 +0100 diff --git a/debian/control b/debian/control index 88c3236..cf89861 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.903), + xserver-xorg-dev (>= 2:1.11.99.901), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, commit b38c0e3de4e0127723bb9b6ce25fb12031528612 Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:58:40 2012 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 24d75fd..9ed91ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,53 @@ +commit 4ba7306fd0c9533750d389829e2cbf0522e149b3 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Wed Oct 19 01:49:38 2011 -0700 + + configure.ac: Require a newer version of libpciaccess + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit efe1792818be463dd0367178f0233bc502b7a584 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Wed Oct 19 01:38:49 2011 -0700 + + Code style cleanup to make the map and unmap blocks more consistent + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 1f84310ddf49778f776a39810aa98211c812e8ab +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Wed Oct 19 01:33:07 2011 -0700 + + Build fix for ABI Version 12 + + ABI Version 12 removes support for multiple PCI domains. If you need to + use this driver on a system with more than one PCI domain, you should + either port this driver to using libpciaccess directly or stick with an + older server. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 1a60e9068284e1ef22d8c470a85410a54ee668e8 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Wed Oct 19 01:15:13 2011 -0700 + + Use unsigned long rather than deprecated IOADDRESS + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 463886df688d3521afc47ec88f9aaf67e924ec7f +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Wed Oct 19 01:15:03 2011 -0700 + + Build fix for ABI Version 12 + + ABI Version 12 removes support for multiple PCI domains. If you need to + use this driver on a system with more than one PCI domain, you should + either port this driver to using libpciaccess directly or stick with an + older server. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + commit 0b02c68581f48c3239bc150df137623053794a3e Author: Adam Jackson <a...@redhat.com> Date: Mon Feb 14 11:44:02 2011 -0500 diff --git a/debian/changelog b/debian/changelog index ef1cc56..a7522d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-vesa (1:2.3.0-7+exp1) UNRELEASED; urgency=low + + * Merge from upstream master up to 4ba7306fd0 to make it possible + to build against 1.12 RC1 (video ABI 12). + + -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:56:57 +0100 + xserver-xorg-video-vesa (1:2.3.0-7) unstable; urgency=low * Upload to unstable. commit 4ba7306fd0c9533750d389829e2cbf0522e149b3 Author: Jeremy Huddleston <jerem...@apple.com> Date: Wed Oct 19 01:49:38 2011 -0700 configure.ac: Require a newer version of libpciaccess Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/configure.ac b/configure.ac index 2e4f542..5d39bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, CFLAGS="$save_CFLAGS" if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901]) fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) commit efe1792818be463dd0367178f0233bc502b7a584 Author: Jeremy Huddleston <jerem...@apple.com> Date: Wed Oct 19 01:38:49 2011 -0700 Code style cleanup to make the map and unmap blocks more consistent Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/src/vesa.c b/src/vesa.c index 5a0120c..23d9e14 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -1260,27 +1260,28 @@ VESAMapVidMem(ScrnInfoPtr pScrn) pScrn->fbOffset = pVesa->mapOff; #ifdef XSERVER_LIBPCIACCESS - if ((pVesa->mapPhys != 0xa0000) && (pVesa->pciInfo != NULL)) { - (void) pci_device_map_range(pVesa->pciInfo, pScrn->memPhysBase, - pVesa->mapSize, - (PCI_DEV_MAP_FLAG_WRITABLE - | PCI_DEV_MAP_FLAG_WRITE_COMBINE), - & pVesa->base); - } - else - (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase, - pVesa->mapSize, - PCI_DEV_MAP_FLAG_WRITABLE, - & pVesa->base); - - if (pVesa->base) { - if (pVesa->mapPhys != 0xa0000) - (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000, + if (pVesa->pciInfo != NULL) { + if (pVesa->mapPhys != 0xa0000) { + (void) pci_device_map_range(pVesa->pciInfo, pScrn->memPhysBase, + pVesa->mapSize, + (PCI_DEV_MAP_FLAG_WRITABLE + | PCI_DEV_MAP_FLAG_WRITE_COMBINE), + & pVesa->base); + + if (pVesa->base) + (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000, + PCI_DEV_MAP_FLAG_WRITABLE, + & pVesa->VGAbase); + } + else { + (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase, + pVesa->mapSize, PCI_DEV_MAP_FLAG_WRITABLE, - & pVesa->VGAbase); - else - pVesa->VGAbase = pVesa->base; + & pVesa->base); + if (pVesa->base) + pVesa->VGAbase = pVesa->base; + } } #else if (pVesa->mapPhys != 0xa0000 && pVesa->pEnt->location.type == BUS_PCI) commit 1f84310ddf49778f776a39810aa98211c812e8ab Author: Jeremy Huddleston <jerem...@apple.com> Date: Wed Oct 19 01:33:07 2011 -0700 Build fix for ABI Version 12 ABI Version 12 removes support for multiple PCI domains. If you need to use this driver on a system with more than one PCI domain, you should either port this driver to using libpciaccess directly or stick with an older server. Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/src/vesa.c b/src/vesa.c index 1136ac3..5a0120c 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn) & pVesa->base); } else - pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo, - pScrn->memPhysBase, pVesa->mapSize); + (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase, + pVesa->mapSize, + PCI_DEV_MAP_FLAG_WRITABLE, + & pVesa->base); if (pVesa->base) { if (pVesa->mapPhys != 0xa0000) - pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0, - pVesa->pciInfo, - 0xa0000, 0x10000); + (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000, + PCI_DEV_MAP_FLAG_WRITABLE, + & pVesa->VGAbase); else pVesa->VGAbase = pVesa->base; @@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn) if (pVesa->mapPhys != 0xa0000) { (void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base, pVesa->mapSize); - xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000); + (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase, + 0x10000); } else { - xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); + (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base, + pVesa->mapSize); } #else xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); commit 1a60e9068284e1ef22d8c470a85410a54ee668e8 Author: Jeremy Huddleston <jerem...@apple.com> Date: Wed Oct 19 01:15:13 2011 -0700 Use unsigned long rather than deprecated IOADDRESS Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/src/vesa.h b/src/vesa.h index 89245b9..bcc9e37 100644 --- a/src/vesa.h +++ b/src/vesa.h @@ -114,7 +114,7 @@ typedef struct _VESARec xf86EnableDisableFBAccessProc *EnableDisableFBAccess; Bool accessEnabled; OptionInfoPtr Options; - IOADDRESS ioBase; + unsigned long ioBase; Bool ModeSetClearScreen; void *shadow; ShadowUpdateProc update; commit 463886df688d3521afc47ec88f9aaf67e924ec7f Author: Jeremy Huddleston <jerem...@apple.com> Date: Wed Oct 19 01:15:03 2011 -0700 Build fix for ABI Version 12 ABI Version 12 removes support for multiple PCI domains. If you need to use this driver on a system with more than one PCI domain, you should either port this driver to using libpciaccess directly or stick with an older server. Signed-off-by: Jeremy Huddleston <jerem...@apple.com> diff --git a/src/vesa.c b/src/vesa.c index 61d3550..1136ac3 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -1299,7 +1299,11 @@ VESAMapVidMem(ScrnInfoPtr pScrn) } #endif +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pVesa->ioBase = pScrn->domainIOBase; +#else + pVesa->ioBase = 0; +#endif xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, "virtual address = %p,\n" -- 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/e1seww0-0007ge...@vasks.debian.org