--- xserver-xorg-video-vesa-2.3.0.orig/ChangeLog +++ xserver-xorg-video-vesa-2.3.0/ChangeLog @@ -1,3 +1,11 @@ +commit ba6527d2695574f6f7808ada39f6caed7a688f39 +Author: Adam Jackson +Date: Mon Jan 4 14:19:13 2010 -0500 + + vesa 2.3.0 + + Signed-off-by: Adam Jackson + commit 1d0e73302d4c4eda56f32e129920ccd263f524ce Author: Adam Jackson Date: Mon Jan 4 14:16:42 2010 -0500 --- xserver-xorg-video-vesa-2.3.0.orig/autogen.sh +++ xserver-xorg-video-vesa-2.3.0/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-vesa-2.3.0.orig/debian/xserver-xorg-video-vesa.links +++ xserver-xorg-video-vesa-2.3.0/debian/xserver-xorg-video-vesa.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-vesa/script --- xserver-xorg-video-vesa-2.3.0.orig/debian/compat +++ xserver-xorg-video-vesa-2.3.0/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-vesa-2.3.0.orig/debian/control +++ xserver-xorg-video-vesa-2.3.0/debian/control @@ -0,0 +1,42 @@ +Source: xserver-xorg-video-vesa +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, + xserver-xorg-dev (>= 2:1.9.4), + x11proto-xext-dev, + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + 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 + +Package: xserver-xorg-video-vesa +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- VESA display driver + This driver for the X.Org X server (see xserver-xorg for a further description) + uses the standard VESA interface provided on all video cards, but runs + unaccelerated. This driver is not recommended for use unless you have a + problem with the normal driver for your card, because it will perform very + badly. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-vesa driver module. --- xserver-xorg-video-vesa-2.3.0.orig/debian/rules +++ xserver-xorg-video-vesa-2.3.0/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ --- xserver-xorg-video-vesa-2.3.0.orig/debian/copyright +++ xserver-xorg-video-vesa-2.3.0/debian/copyright @@ -0,0 +1,27 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of Conectiva Linux shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +Conectiva Linux. --- xserver-xorg-video-vesa-2.3.0.orig/debian/changelog +++ xserver-xorg-video-vesa-2.3.0/debian/changelog @@ -0,0 +1,249 @@ +xserver-xorg-video-vesa (1:2.3.0-5) unstable; urgency=low + + * Fix typos in long description. + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + * Remove xsfbs accordingly. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:59:35 +0100 + +xserver-xorg-video-vesa (1:2.3.0-4) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Wed, 13 Oct 2010 00:54:34 +0200 + +xserver-xorg-video-vesa (1:2.3.0-3) unstable; urgency=low + + * Add patch by Christopher James Halse Rogers from Ubuntu to bail in Probe + if kernel mode setting is enabled. + + -- Julien Cristau Sat, 15 May 2010 13:14:24 +0200 + +xserver-xorg-video-vesa (1:2.3.0-2) unstable; urgency=low + + [ Julien Cristau ] + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + + -- Cyril Brulebois Mon, 03 May 2010 22:05:06 +0200 + +xserver-xorg-video-vesa (1:2.3.0-1) unstable; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + Add missing shadowRemove() in VESACloseScreen() (closes: #565401) + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Bump build-dep on xutils-dev for new util-macros. + + -- Brice Goglin Wed, 20 Jan 2010 23:35:50 +0100 + +xserver-xorg-video-vesa (1:2.2.1-2) unstable; urgency=low + + [ Timo Aaltonen ] + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 00:57:23 +0100 + +xserver-xorg-video-vesa (1:2.2.1-1) unstable; urgency=low + + * New upstream release. + * Add README.source, bump Standards-Version to 3.8.2. + * Add myself to Uploaders. + + -- Brice Goglin Sat, 01 Aug 2009 09:56:47 +0200 + +xserver-xorg-video-vesa (1:2.2.0-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 13:20:03 +0100 + +xserver-xorg-video-vesa (1:2.1.0-1) experimental; urgency=low + + * New upstream release. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + * Build against xserver 1.6 rc1. + + -- Julien Cristau Mon, 26 Jan 2009 00:29:34 +0100 + +xserver-xorg-video-vesa (1:2.0.0-2) experimental; urgency=low + + * Add myself to Uploaders, and remove Branden with his permission. + * Build against xserver 1.5 rc5. + + -- Julien Cristau Mon, 14 Jul 2008 14:51:43 +0200 + +xserver-xorg-video-vesa (1:2.0.0-1) unstable; urgency=low + + * New upstream release. + * Add upstream URL to debian/copyright. + * Remove XS- prefix to Vcs-* fields. + * Bump Standards-Version to 3.7.3, no change needed. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings. + + -- Brice Goglin Tue, 01 Jul 2008 21:12:25 +0200 + +xserver-xorg-video-vesa (1:1.3.0-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:50 -0400 + +xserver-xorg-video-vesa (1:1.3.0-3) experimental; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-vesa. + + [ Brice Goglin ] + * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-vesa + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + [ David Nusinow ] + * Build against and build-dep on xserver 1.4 + * Bump standards version to 3.7.2.2. No changes necessary. + + -- David Nusinow Sun, 09 Sep 2007 21:49:38 -0400 + +xserver-xorg-video-vesa (1:1.3.0-2) experimental; urgency=low + + * Pull upstream patch to allow use of new pci access lib (we currently don't + enable this in the debian package) + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 21 Feb 2007 22:54:45 -0500 + +xserver-xorg-video-vesa (1:1.3.0-1) unstable; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ David Nusinow ] + * New upstream version. Fixes shadowfb. + + -- David Nusinow Sun, 10 Dec 2006 19:49:32 -0500 + +xserver-xorg-video-vesa (1:1.2.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:58:13 -0400 + +xserver-xorg-video-vesa (1:1.2.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:49 +0000 + +xserver-xorg-video-vesa (1:1.2.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. (closes: #382040) + * Bump debhelper compat to 5 + + -- David Nusinow Wed, 16 Aug 2006 18:48:31 +0000 + +xserver-xorg-video-vesa (1:1.0.1.3-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:26:25 -0500 + +xserver-xorg-video-vesa (1:1.0.1.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:42:38 -0500 + +xserver-xorg-driver-vesa (1:1.0.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 20:09:01 +1100 + +xserver-xorg-driver-vesa (1:1.0.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:14:37 +1100 + +xserver-xorg-driver-vesa (1:1.0.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:09:51 +1100 + +xserver-xorg-driver-vesa (1:1.0.1-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:59:34 +1100 + +xserver-xorg-driver-vesa (1:1.0.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:38:45 +1100 + +xserver-xorg-driver-vesa (1:1.0.0.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:12:35 +1000 + +xserver-xorg-driver-vesa (1:1.0.0-1) breezy; urgency=low + + * First xserver-xorg-driver-vesa release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-vesa-2.3.0.orig/debian/README.source +++ xserver-xorg-video-vesa-2.3.0/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-video-vesa-2.3.0.orig/debian/watch +++ xserver-xorg-video-vesa-2.3.0/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-vesa +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-vesa-(.*)\.tar\.gz --- xserver-xorg-video-vesa-2.3.0.orig/debian/xserver-xorg-video-vesa.install +++ xserver-xorg-video-vesa-2.3.0/debian/xserver-xorg-video-vesa.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-vesa-2.3.0.orig/debian/patches/series +++ xserver-xorg-video-vesa-2.3.0/debian/patches/series @@ -0,0 +1 @@ +001_ubuntu_bail_when_kms_active.patch --- xserver-xorg-video-vesa-2.3.0.orig/debian/patches/001_ubuntu_bail_when_kms_active.patch +++ xserver-xorg-video-vesa-2.3.0/debian/patches/001_ubuntu_bail_when_kms_active.patch @@ -0,0 +1,122 @@ +From c0416148852843e0dfa14c9219541543cbd6a41d Mon Sep 17 00:00:00 2001 +From: Christopher James Halse Rogers +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 + #endif + ++#ifdef HAVE_KMS ++#include ++#include ++#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 \