--- xserver-xorg-video-geode-2.11.8.orig/debian/copyright +++ xserver-xorg-video-geode-2.11.8/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Martin-Eric Racine on +Thu, 14 Jun 2007 21:07:32 +0300 + +It was downloaded from + +Copyright (C) 2005-2008 Advanced Micro Devices, Inc. + +License: + + 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 + THE AUTHORS OR COPYRIGHT HOLDERS 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. + + Neither the name of the Advanced Micro Devices, Inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. --- xserver-xorg-video-geode-2.11.8.orig/debian/geode.ids +++ xserver-xorg-video-geode-2.11.8/debian/geode.ids @@ -0,0 +1,2 @@ +100B0030 +10222081 --- xserver-xorg-video-geode-2.11.8.orig/debian/xserver-xorg-video-geode.install +++ xserver-xorg-video-geode-2.11.8/debian/xserver-xorg-video-geode.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/xorg/modules/drivers/*_drv.so +debian/geode.ids usr/share/xserver-xorg/pci + --- xserver-xorg-video-geode-2.11.8.orig/debian/watch +++ xserver-xorg-video-geode-2.11.8/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts=passive \ +ftp://ftp.freedesktop.org/pub/xorg/individual/driver/xf86-video-geode-(.*)\.tar\.gz \ +debian uupdate --no-symlink --- xserver-xorg-video-geode-2.11.8.orig/debian/changelog +++ xserver-xorg-video-geode-2.11.8/debian/changelog @@ -0,0 +1,573 @@ +xserver-xorg-video-geode (2.11.8-7) unstable; urgency=low + + * Updated the patch from GIT to test upcoming features. + * Bumped Standards-Version up to 3.9.0 (no change required). + * Added CFLAGS+="-march=geode -mtune=geode" to the build environment. + Justification: Geode is an x86 sub-architecture with a built-in GPU, + so we might as well always produce platform-optimized binaries. + Build-Depends: gcc (>= 4.3), which breaks Ubuntu/Hardy support. + + -- Martin-Éric Racine Mon, 19 Jul 2010 16:10:36 +0300 + +xserver-xorg-video-geode (2.11.8-6) unstable; urgency=low + + * Updated the patch from GIT to test upcoming features. + + -- Martin-Éric Racine Wed, 23 Jun 2010 16:10:12 +0300 + +xserver-xorg-video-geode (2.11.8-5) unstable; urgency=low + + * Updated dependencies for all -dbg and transitional packages. + * Added unified patch from GIT to test upcoming 2.11.9 features. + + -- Martin-Éric Racine Fri, 18 Jun 2010 13:10:11 +0300 + +xserver-xorg-video-geode (2.11.8-4) unstable; urgency=low + + * Added generation of Depends:xserver-xorg-core-dbg for -dbg target. + + -- Martin-Éric Racine Sun, 18 Apr 2010 20:25:30 +0300 + +xserver-xorg-video-geode (2.11.8-3) unstable; urgency=low + + * Removed versioned Conflicts against xserver-xorg-video-nsc. + + -- Martin-Éric Racine Sun, 18 Apr 2010 13:26:40 +0300 + +xserver-xorg-video-geode (2.11.8-2) unstable; urgency=low + + * Added xserver-xorg-video-geode Provides xserver-xorg-video-amd. + * Loosened up unnecessarily thight dpkg-dev Build-Depends. + + -- Martin-Éric Racine Sat, 17 Apr 2010 08:05:29 +0300 + +xserver-xorg-video-geode (2.11.8-1) unstable; urgency=low + + * New upstream release (Closes: #568827) (LP: #520671). + * Removed unnecessary Build-Depends on x11proto-dri2-dev. + + -- Martin-Éric Racine Thu, 15 Apr 2010 17:02:46 +0300 + +xserver-xorg-video-geode (2.11.7-3) unstable; urgency=high + + * Merged upstream patch to fix a serious regression that broke pixmap + support when running under X server 1.7 or newer. + "lx_exa: bail earlier (in CheckComposite) for non-alpha-only masks" + Pushing this now so that Squeeze/Lucid ship with something usable. + + -- Martin-Éric Racine Mon, 12 Apr 2010 12:57:08 +0300 + +xserver-xorg-video-geode (2.11.7-2) unstable; urgency=low + + * Created debian/source/format. + * Updated Build-Depends. + + -- Martin-Éric Racine Thu, 08 Apr 2010 17:46:48 +0300 + +xserver-xorg-video-geode (2.11.7-1) unstable; urgency=low + + * New upstream release: + + Cleanups in the GX2 "Red Cloud" chipset support. + + Several maintenance upgrades to autotool scripts. + + Some typo fixes in the documentation and in source code comments, + including 93f0303f79ce29e896e4817e945709c6a1d3df69. + * Bumped Standards-Version up to 3.8.4 (no change required). + + -- Martin-Éric Racine Wed, 03 Feb 2010 21:30:30 +0000 + +xserver-xorg-video-geode (2.11.6-4) unstable; urgency=low + + * Added patch 93f0303f79ce29e896e4817e945709c6a1d3df69 from upstream GIT: + "Geode LX does not support PanelGeometry" + * Updated the source URL in debian/copyright to the X.Org FTP. + + -- Martin-Éric Racine Mon, 25 Jan 2010 07:17:34 +0000 + +xserver-xorg-video-geode (2.11.6-3) unstable; urgency=low + + * Revised all package descriptions in debian/control. + + -- Martin-Éric Racine Wed, 30 Dec 2009 11:27:08 +0000 + +xserver-xorg-video-geode (2.11.6-2) unstable; urgency=low + + * Removed Build-Depends on obsolete x11proto-xf86misc-dev (Closes: #559703). + + NOTE: upstream really could use some help in maintaining this driver! + + -- Martin-Éric Racine Sat, 26 Dec 2009 11:19:22 +0000 + +xserver-xorg-video-geode (2.11.6-1) unstable; urgency=low + + * New upstream release: + Revert "LX validate display modes" because it breaks detection of + arbitrary non-VESA resolutions such as with the OLPC (LP: #433228). + + -- Martin-Éric Racine Sun, 27 Sep 2009 12:16:46 +0000 + +xserver-xorg-video-geode (2.11.5-1) unstable; urgency=low + + * New upstream release: + + Drop the following patches (merged upstream): + 0001-GX-refactor-code-that-allow-backward-compatibility-w.patch + 0002-LX-validate-display-modes.patch + + Addition of LX display mode validation. + + Plenty of documentation improvements. + + Several minor fixes for GX2 support. + * Updated the Homepage filed in debian/control. + + -- Martin-Éric Racine Tue, 22 Sep 2009 15:02:28 +0000 + +xserver-xorg-video-geode (2.11.4.1-2) unstable; urgency=low + + * Added the following patches by Otavio Salvador: + 0001-GX-refactor-code-that-allow-backward-compatibility-w.patch + 0002-LX-validate-display-modes.patch + + -- Martin-Éric Racine Fri, 18 Sep 2009 19:05:43 +0000 + +xserver-xorg-video-geode (2.11.4.1-1) unstable; urgency=low + + * New upstream release. + Fixes a typo in commit b28abde0276ddd7f687242f3886f98b0e49a7fc2. + + -- Martin-Éric Racine Tue, 01 Sep 2009 12:41:55 +0000 + +xserver-xorg-video-geode (2.11.4-2) unstable; urgency=low + + * Really remove arch:lpia. Geode doesn't build on anything but i386. + + -- Martin-Éric Racine Sat, 29 Aug 2009 19:46:15 +0300 + +xserver-xorg-video-geode (2.11.4-1) unstable; urgency=low + + * Added opts=passive to debian/watch. + * New upstream release: + + Some header upgrades for newer X servers. + + Numerous documentation improvements. + + Some GX2 fixes. + * Dropped patch 0001_make_XAA_default_on_GX2; merged upstream. + + NOTE: We're aware that GX2 support is still somewhat broken. + Check the upstream README to learn how you can help. + + -- Martin-Éric Racine Fri, 28 Aug 2009 12:18:26 +0300 + +xserver-xorg-video-geode (2.11.3-2) unstable; urgency=low + + * Added patch 0001_make_XAA_default_on_GX2 + from upstream GIT commit 255c0b985731350fdfd38987a95310e72f4e5381 + EXA support is broken for GX2 so we disable it and use XAA for now. + * Updated the Homepage to http://wiki.x.org/wiki/GeodeDriver + * Bumped Standards-Version up to 3.8.3 (no change required). + + -- Martin-Éric Racine Wed, 19 Aug 2009 12:40:04 +0300 + +xserver-xorg-video-geode (2.11.3-1) unstable; urgency=low + + * New upstream release: + + Dropped GPIO detection patch; merged upstream. + + -- Martin-Éric Racine Fri, 19 Jun 2009 21:04:05 +0300 + +xserver-xorg-video-geode (2.11.2-2) unstable; urgency=low + + * Merged patch from GIT to fix GPIO detection crash (Closes: #531889). + + -- Martin-Éric Racine Fri, 05 Jun 2009 00:32:40 +0300 + +xserver-xorg-video-geode (2.11.2-1) unstable; urgency=low + + * New upstream release. + * Migrated -dbg packages to the new Section:debug. + + -- Martin-Éric Racine Thu, 21 May 2009 23:30:04 +0300 + +xserver-xorg-video-geode (2.11.1-1) unstable; urgency=low + + * New upstream release: + Supercedes both previous versions of the Mask Transform patches. + + -- Martin-Éric Racine Tue, 17 Feb 2009 09:01:31 +0200 + +xserver-xorg-video-geode (2.11.0-3) unstable; urgency=low + + * The "Hurray for Lenny & Hello Squeeze!" release: + Replace the mask transform fallback patch with a better one. + + -- Martin-Éric Racine Sun, 15 Feb 2009 19:27:22 +0200 + +xserver-xorg-video-geode (2.11.0-2) unstable; urgency=low + + * Merged "[PATCH] Fallback in case of mask transforms as well." + * Bumped Standards-Version up to 3.8.0: + + Added the Homepage field to debian/control. + + No other change required. + + -- Martin-Éric Racine Sat, 07 Feb 2009 16:54:59 +0200 + +xserver-xorg-video-geode (2.11.0-1) experimental; urgency=low + + * New upstream release. + + -- Martin-Éric Racine Wed, 10 Dec 2008 14:12:46 +0200 + +xserver-xorg-video-geode (2.10.1-5) unstable; urgency=low + + * Uploading to unstable. + * Relaxing Build-Depends on X core to >= 2:1.3 again. + + -- Martin-Éric Racine Fri, 05 Dec 2008 14:46:01 +0200 + +xserver-xorg-video-geode (2.10.1-4) experimental; urgency=low + + * Removed the Vcs fields from debian/control. + * Added lpia to Arch in debian/control. + + -- Martin-Éric Racine Wed, 15 Oct 2008 14:39:32 +0300 + +xserver-xorg-video-geode (2.10.1-3) experimental; urgency=low + + * Reintroduced debian/control and debian/rules changes from 2.10.1-1 + and uploaded to experimental. + * Reintroduced Build-Depends on X core to >= 2:1.4.99 until Lenny. + + -- Martin-Éric Racine Mon, 18 Aug 2008 13:13:04 +0300 + +xserver-xorg-video-geode (2.10.1-2) unstable; urgency=low + + * Reverted debian/control and debian/rules changes to 2.10.0-4 status, + as requested by Release Management team, for inclusion in Lenny. + + -- Martin-Éric Racine Mon, 18 Aug 2008 12:17:41 +0300 + +xserver-xorg-video-geode (2.10.1-1) unstable; urgency=low + + * New upstream release: + "Added info about the current roadmap." + "Geode: Add DDC support for the CS5535" + "lx: Fix rotate issue" + * Transitioned debian/control to XSF dependency versioning files. + This breaks backportability for Debian/Etch and Ubuntu/Gutsy, but + it makes bin-NMU and a whole bunch of other things MUCH easier. + + -- Martin-Éric Racine Fri, 15 Aug 2008 14:48:06 +0300 + +xserver-xorg-video-geode (2.10.0-6) experimental; urgency=low + + * Bumped Build-Depends on X core to >= 2:1.4.99 for experimental. + + -- Martin-Éric Racine Tue, 22 Jul 2008 07:40:34 +0300 + +xserver-xorg-video-geode (2.10.0-5) experimental; urgency=low + + * Bumped Provides to server-2.9 for upcoming X.org 1.5 core ABI. + + -- Martin-Éric Racine Tue, 08 Jul 2008 14:16:50 +0300 + +xserver-xorg-video-geode (2.10.0-4) unstable; urgency=low + + * Removed the duplicated debian/rule content once more. + + -- Martin-Éric Racine Thu, 26 Jun 2008 03:17:39 +0300 + +xserver-xorg-video-geode (2.10.0-3) unstable; urgency=medium + + * Deprecated the trouble-making transitional AMD symbolic links. + * Made GEODE Conflicts with all previous AMD and NSC packages. + + -- Martin-Éric Racine Fri, 20 Jun 2008 15:52:20 +0300 + +xserver-xorg-video-geode (2.10.0-2) unstable; urgency=low + + * Re-introduced support for GX2 hardware (PCI 100B0030): + + Conflicts: xserver-xorg-video-nsc << 1:2.8.3-3 + + -- Martin-Éric Racine Mon, 16 Jun 2008 14:49:38 +0300 + +xserver-xorg-video-geode (2.10.0-1) unstable; urgency=low + + * New upstream release: + + Bring over the DCON detection code from the OLPC tree. + + Unmap the PCI memory when we close the screen. + + Many build fixes. + + -- Martin-Éric Racine Sat, 14 Jun 2008 07:46:03 +0300 + +xserver-xorg-video-geode (2.9.0-4) unstable; urgency=medium + + * Rewrote debian/control to emphasize that -amd should be purged at + someone's earliest convenience, as soon as their static xorg.conf + has been upgraded to match the new X.org driver name. + + -- Martin-Éric Racine Mon, 02 Jun 2008 17:18:51 +0300 + +xserver-xorg-video-geode (2.9.0-3) unstable; urgency=medium + + * Removed the GX model's PCI ID from geode.ids to fix LTSP usage case. + + NOTE: GX is currently covered by two drivers, due to the "nsc" driver + including backported GX support, which produces PCI ID conflicts with + "geode". "geode" has more up-to-date GX support and cleaner code than + "nsc" but conflicts with the existing Debian "nsc" package, hence the + decision to disable GX support in this package, until further notice. + + -- Martin-Éric Racine Thu, 29 May 2008 21:02:18 +0300 + +xserver-xorg-video-geode (2.9.0-2) unstable; urgency=low + + * Moved backward-compatibility symbolic links to AMD package. + * Added a versioned Conflicts/Replaces against << 2.9.0-2 to match. + * Added usr/share/xserver-xorg/pci/geode.ids Debian PCI ID list. + + -- Martin-Éric Racine Wed, 28 May 2008 11:23:16 +0300 + +xserver-xorg-video-geode (2.9.0-1) unstable; urgency=low + + * New upstream release: + Changes from 2.8.0+git20080424 released as 2.9.0 by upstream. + + -- Martin-Éric Racine Wed, 07 May 2008 23:05:58 +0300 + +xserver-xorg-video-geode (2.8.0+git20080424-1) unstable; urgency=low + + * Merged upstream GIT commit 61663593475f61567466c105ca19d5009a4e9c41: + + "Teach libDDC to access the DDC pins on the Geode natively, instead + of using the BIOS which has proven to be broken time and time again." + + This libDDC support makes DDC polling succeed on any Geode GX/LX + hardware, regardless of how buggy the BIOS implementation is. If + DDC still fails on your hardware, it means that the DDC pins are + not physically connected to the VGA port. BADMANUFACTURER error! + + * Ran autogen.sh to regenerate the autotool files. + + -- Martin-Éric Racine Fri, 25 Apr 2008 12:56:23 +0300 + +xserver-xorg-video-geode (2.8.0-7) unstable; urgency=low + + * Added URL to the xorg-driver-geode mailing list in description. + * Fixed Lintian W: missing Depends for transitional -dbg package. + + -- Martin-Éric Racine Sun, 13 Apr 2008 11:38:18 +0300 + +xserver-xorg-video-geode (2.8.0-6) unstable; urgency=low + + * Added transitional Replaces: xserver-xorg-video-amd relationship. + + -- Martin-Éric Racine Thu, 10 Apr 2008 17:59:10 +0300 + +xserver-xorg-video-geode (2.8.0-5) unstable; urgency=low + + * Changed 'amd' module name to 'geode' in package descriptions. + + -- Martin-Éric Racine Tue, 08 Apr 2008 13:24:17 +0300 + +xserver-xorg-video-geode (2.8.0-4) unstable; urgency=low + + * Added symbolic link to amd_drv.so to enable backward compatibility. + + -- Martin-Éric Racine Mon, 07 Apr 2008 18:22:18 +0300 + +xserver-xorg-video-geode (2.8.0-3) unstable; urgency=low + + * Upgraded debian/watch to the new archive path. (DOH!) + + -- Martin-Éric Racine Mon, 07 Apr 2008 12:02:28 +0300 + +xserver-xorg-video-geode (2.8.0-2) unstable; urgency=high + + * Made transitional packages arch:i386 to prevent FTBFS (Closes: #474561). + + -- Martin-Éric Racine Mon, 07 Apr 2008 10:12:29 +0300 + +xserver-xorg-video-geode (2.8.0-1) unstable; urgency=low + + * New upstream release: + "Welcome to xf86-video-geode!" + + Renaming of the xf86-video-amd driver to xf86-video-geode driver. + + Whitespace cleanup in the GX driver. + * Renamed every Debian packaging file and script imaginable to match. + * Created dummy transitional packages to faciliate upgrades from AMD. + * Bumped Build-Depends on dpkg-dev to 1.14.16 for xs-vcs warning. + + -- Martin-Éric Racine Wed, 02 Apr 2008 16:06:09 +0300 + +xserver-xorg-video-amd (2.7.7.7-1) unstable; urgency=low + + * New upstream release: + "xf86-video-amd is dead - long live xf86-video-geode!" + + This is the last upstream release as "amd"; future releases will + be named "geode" to remove confusion with former ATI products. A + transitional mechanism exists to make this driver recognize when + it is being called under either name to facilitate upgrades. + + + Add the "geode" driver name in preparation for the renaming. + + Fix panel and DDC interation with GX (Closes: #472206). + + Add support for wide and non-standard resolutions. + + Fix a compile error in < 1.5 builds. + + Fix Gamma initialization. + + Add libpciaccess support. + + -- Martin-Éric Racine Mon, 24 Mar 2008 13:47:59 +0200 + +xserver-xorg-video-amd (2.7.7.6-1) unstable; urgency=low + + * New upstream release: + + Default depth raised to 16-bit. + + Several GCC warning fixes. + + -- Martin-Éric Racine Sat, 26 Jan 2008 02:32:59 +0200 + +xserver-xorg-video-amd (2.7.7.5-1) unstable; urgency=low + + * New upstream release: + + Basic OLPC support from Bernardo Innocenti and Jordan Crouse. + + Trivial patch to fix the ZTV module from Martin-Éric Racine. + + -- Martin-Éric Racine Mon, 14 Jan 2008 04:31:09 +0200 + +xserver-xorg-video-amd (2.7.7.4-1) unstable; urgency=low + + * New upstream release: + [GX][LX] PreInit fixes to avoid segfaults on X -configure. + + This is known to work on products with GeodeROM and Insyde BIOSes. + + On products with a General Software BIOS, a freeze occurs while X + is probing VBE. The same issue occurs with LinuxBIOS and VGAROM, + but not with LinuxBIOS omitting VGAROM. + + Both issues appear to be caused by X server core upgrading from + vm86 to x86emu since X server release 1.3, which requires fixing + x86emu, or the concerned BIOSes, or both. + + -- Martin-Éric Racine Sat, 05 Jan 2008 06:47:20 +0200 + +xserver-xorg-video-amd (2.7.7.3-1) unstable; urgency=low + + * New upstream release. + + -- Martin-Éric Racine Fri, 26 Oct 2007 15:50:48 +0300 + +xserver-xorg-video-amd (2.7.7.2-2) unstable; urgency=low + + * Bumped Build-Depends to X server 1.4 core as follow: + + xserver-xorg-dev (>= 1:1.1.1) to (>= 2:1.4). + + x11proto-randr-dev (no version) to (>= 1.2). + * Bumped binary target Provides correspondingly as follow: + xserver-xorg-video-1.0 to xserver-xorg-video-2. + * Above changes break compatibility with Debian/Etch and Ubuntu/Gutsy, + but restore ABI/API compatibility with X.org 7.3 (Closes: #443285). + + -- Martin-Éric Racine Mon, 1 Oct 2007 15:16:32 +0300 + +xserver-xorg-video-amd (2.7.7.2-1) unstable; urgency=low + + * New upstream release. + + -- Martin-Éric Racine Mon, 17 Sep 2007 15:47:48 +0300 + +xserver-xorg-video-amd (2.7.7.1-1) unstable; urgency=high + + * New upstream release. + * Fixes "content changed if build twice or more" (Closes: #441733). + + -- Martin-Éric Racine Wed, 12 Sep 2007 11:33:27 +0300 + +xserver-xorg-video-amd (2.7.7.0-1) unstable; urgency=low + + * New upstream release: + This is the first official upstream release to come out of GIT. + Many thanks go to AMD's Jordan Crouse and to other OLPC developers + for making this release happen. + + -- Martin-Éric Racine Sun, 2 Sep 2007 14:21:21 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070802-3) unstable; urgency=low + + * Added debian/watch file for official FreeDesktop.org releases. + + -- Martin-Éric Racine Fri, 24 Aug 2007 14:43:56 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070802-2) unstable; urgency=low + + * Added a link to the xserver-xorg-core bug script, to ensure that + bug reports contain the user's config and log files. + - This feature Depends on xserver-xorg-core >= 2:1.1.1-11, which + still works for backports since Etch has 2:1.1.1-21 in stock. + + -- Martin-Éric Racine Tue, 7 Aug 2007 23:00:53 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070802-1) unstable; urgency=low + + * New upstream git snapshot. + + -- Martin-Éric Racine Thu, 2 Aug 2007 21:49:31 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070725-1) unstable; urgency=low + + * New upstream git snapshot. + + -- Martin-Éric Racine Fri, 27 Jul 2007 23:06:02 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070711-2) unstable; urgency=low + + * Added substvars versioning for xserver-xorg-core (Closes: #432458). + + -- Martin-Éric Racine Sun, 22 Jul 2007 02:24:50 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070711-1) unstable; urgency=low + + * New upstream git snapshot. + + -- Martin-Éric Racine Wed, 11 Jul 2007 01:19:58 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070208-5) unstable; urgency=low + + * Migrated Source-Version to binary:Version dependency substitution. + * Retooled using autoconf 2.61, automake 1.10, libtool 1.5.22. + + -- Martin-Éric Racine Tue, 10 Jul 2007 22:12:52 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070208-4) unstable; urgency=high + + * Made both targets Architecture: i386 to fix FTBFS (Closes: #430586). + + -- Martin-Éric Racine Tue, 26 Jun 2007 12:58:51 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070208-3) unstable; urgency=low + + * Changed Architecture to i386. Thanks to Kees Cook for spotting this. + + -- Martin-Éric Racine Mon, 25 Jun 2007 21:23:41 +0300 + +xserver-xorg-video-amd (2.7.6.5+git20070208-2) unstable; urgency=low + + * Added -dbg target. + * Added NEWS.Debian. + + -- Martin-Éric Racine Mon, 18 Jun 2007 14:05:40 +0300 + +xserver-xorg-video-amd (2.7.6.5+20070208-1) unstable; urgency=low + + * Initial upload to Debian (Closes: #400748): + - Provides xserver-xorg-video-1.0 instead of xserver-xorg-video. + + -- Martin-Éric Racine Thu, 14 Jun 2007 21:46:54 +0300 + +xserver-xorg-video-amd (2.7.6.5~20070208-0ubuntu0linutop1) edgy; urgency=low + + * New upstream git snapshot. + + -- Gauvain Pocentek Thu, 8 Feb 2007 15:18:46 +0100 + +xserver-xorg-video-amd (2.7.6.5~20060905-0ubuntu1) edgy; urgency=low + + * New package xserver-xorg-video-amd, based on git checkout of + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-amd + dated 20060905. + + -- Rodrigo Parra Novo Tue, 5 Sep 2006 14:07:48 -0300 --- xserver-xorg-video-geode-2.11.8.orig/debian/rules +++ xserver-xorg-video-geode-2.11.8/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f +# +# CDBS debian/rules for xserver-xorg-video-geode +# Martin-Eric Racine +# +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +CFLAGS +=-march=geode -mtune=geode +LDFLAGS +=-Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-static --with-pic +#DEB_CONFIGURE_SCRIPT_ENV += + +DEB_DBG_PACKAGE_ALL := xserver-xorg-video-geode-dbg +DEB_DH_STRIP_ARGS := --dbg-package=xserver-xorg-video-geode-dbg + +XSERVER := $(shell cat /usr/share/xserver-xorg/serverminver) +XVIDDRIVER := $(shell cat /usr/share/xserver-xorg/videoabiver) + +install/xserver-xorg-video-geode:: + echo "xserver:Depends=xserver-xorg-core (>= $(XSERVER))" >> debian/xserver-xorg-video-geode.substvars + echo "xviddriver:Provides=xserver-xorg-video-$(XVIDDRIVER)" >> debian/xserver-xorg-video-geode.substvars + echo "xserver:Depends=xserver-xorg-core-dbg (>= $(XSERVER))" >> debian/xserver-xorg-video-geode-dbg.substvars + +common-binary-post-install-arch common-binary-post-install-indep:: list-missing + +#EOF --- xserver-xorg-video-geode-2.11.8.orig/debian/xserver-xorg-video-geode.links +++ xserver-xorg-video-geode-2.11.8/debian/xserver-xorg-video-geode.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-geode/script --- xserver-xorg-video-geode-2.11.8.orig/debian/control +++ xserver-xorg-video-geode-2.11.8/debian/control @@ -0,0 +1,72 @@ +Homepage: http://www.x.org/wiki/GeodeDriver +Source: xserver-xorg-video-geode +Section: x11 +Priority: optional +Maintainer: Martin-Éric Racine +Build-Depends: autotools-dev, cdbs (>= 0.4.23-1.1), debhelper (>= 5), gcc (>= 4:4.3), pkg-config, + xserver-xorg-dev (>= 2:1.3), + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-gl-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-video-dev, + x11proto-xext-dev, + x11proto-xf86dga-dev, + x11proto-xf86dri-dev, + x11proto-xinerama-dev +Standards-Version: 3.9.0 + +Package: xserver-xorg-video-geode +Architecture: i386 +Depends: ${misc:Depends}, ${shlibs:Depends}, ${xserver:Depends} +Provides: ${xviddriver:Provides}, xserver-xorg-video-amd +Recommends: xserver-xorg-video-cyrix, xserver-xorg-video-nsc +Conflicts: xserver-xorg-driver-geode, xserver-xorg-video-amd (<< ${binary:Version}) +Replaces: xserver-xorg (<< 7.1), xserver-xorg-driver-geode +Description: X.Org X server -- Geode GX2/LX display driver + This package provides the 'geode' driver for the Geode family of chipsets, + including NSC GX2 (Red Cloud), AMD GX and AMD LX series chips. + . + This package also provides the 'ztv' driver for the video input feature. + . + More information about X.Org can be found at: + + + + + . + This package is built from the X.Org xf86-video-geode driver module. + +Package: xserver-xorg-video-geode-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${misc:Depends}, ${shlibs:Depends}, ${xserver:Depends}, xserver-xorg-video-geode (= ${binary:Version}) +Description: Geode GX2/LX display driver (debugging symbols) + This driver supports the Geode family of chipsets, including + NSC GX2 (Red Cloud), AMD GX and AMD LX series chips. + . + This package provides debugging symbols for this X.Org driver. + +Package: xserver-xorg-video-amd +Architecture: i386 +Priority: extra +Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg-video-geode (= ${binary:Version}) +Description: Geode GX2/LX display driver (dummy transitional package) + This transitional package helps users of the obsolete AMD driver to update + their X.Org setup. It can safely be removed after the upgrade is completed. + . + If you are using a static xorg.conf, edit the Device section and change + the Driver value from "amd" to "geode" before purging this package. + . + In all other cases, you can safely purge this package immediately. + +Package: xserver-xorg-video-amd-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg-video-amd (= ${binary:Version}), xserver-xorg-video-geode-dbg (= ${binary:Version}) +Description: Geode GX2/LX display driver (debugging symbols) (dummy transitional package) + This transitional package helps users of the obsolete AMD driver to update + their X.Org setup. It can safely be removed after the upgrade is completed. --- xserver-xorg-video-geode-2.11.8.orig/debian/compat +++ xserver-xorg-video-geode-2.11.8/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-video-geode-2.11.8.orig/debian/patches/0001_2.11.9_rc3.patch +++ xserver-xorg-video-geode-2.11.8/debian/patches/0001_2.11.9_rc3.patch @@ -0,0 +1,442 @@ +diff --git a/COPYING b/COPYING +index 6c05f4f..5558790 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,23 +1,30 @@ +-Copyright (c) 2005 Advanced Micro Devices, Inc. ++Copyright (C) 2003-2008 Advanced Micro Devices, Inc. ++Copyright (C) 2007 George Sapountzis ++Copyright (C) 2002 David Dawes ++Copyright (C) 2001 VA Linux Systems Inc., Fremont, California. + +-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: ++LICENSE: ++ ++ 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 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 THE +-AUTHORS OR COPYRIGHT HOLDERS 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. ++ 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 ++ THE AUTHORS OR COPYRIGHT HOLDERS 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. ++ ++ADDITIONAL AMD CLAUSE: + +-Neither the name of the Advanced Micro Devices, Inc. nor the names of its +-contributors may be used to endorse or promote products derived from this +-software without specific prior written permission. ++ Neither the name of the Advanced Micro Devices, Inc. nor the names of its ++ contributors may be used to endorse or promote products derived from this ++ software without specific prior written permission. +diff --git a/README b/README +index a74cf73..03bc4a3 100644 +--- a/README ++++ b/README +@@ -66,6 +66,13 @@ because it utilizes the new common DDC probing libraries from X.Org. + + = FAQ = + ++Q: Why doesn't screen rotation work? ++ ++A: Make sure that a sufficient amount of video RAM is reserved in the BIOS, ++ otherwise rotation will fail and this error message appear in Xorg.log: ++ Couldn't allocate the shadow memory for rotation ++ You need XX bytes, but only YY bytes are available ++ + Q: Why doesn't this GEODE driver work at WXGA (wide screen) resolutions? + + A: Make sure that TFT Panel support is disabled in the BIOS settings, +@@ -110,27 +117,24 @@ EndSection + + The following options may be added to the section: + +-== GX == ++== Common options == + +-SWCursor: Enable software cursors (essentially disabling HW cursor support) +-NoCompression: Disable video bandwidth compression ++FBSize: Specify the size of the video space (in bytes) + NoAccel: Disable hardware assisted acceleration +-AccelMethod: "XAA" (default) or "EXA" +-Rotate: Select a orientation to start with - LEFT, INVERT, CCW ++NoCompression: Disable video bandwidth compression + NoPanel: Disable panel support ++Rotate: Select a orientation to start with - LEFT, INVERT, CCW ++SWCursor: Enable software cursors (essentially disabling HW cursor support) ++ ++== GX-specific options == ++ ++AccelMethod: "XAA" (default) or "EXA" ++PanelGeometry: Specify the geometry of the attached panel ("x") + OSMImageBuffers: Set the number of image buffers (XAA only) + OSMColorExpBuffers: Set the number of color expansion buffers (XAA only) +-FBSize: Specify the size of the video space (in bytes) +-PanelGeometry: Specify the geometry of the attached panel ("x") + +-== LX == ++== LX-specific options == + +-SWCursor: Enable software cursors (essentially disabling HW cursor support) +-NoCompression: Disable video bandwidth compression +-NoAccel: Disable hardware assisted acceleration +-Rotate: Select a orientation to start with - LEFT, INVERT, CCW +-NoPanel: Disable panel support + ExaScratch: Specify the amount of extra EXA scratch buffer (in bytes) +-FBSize: Specify the size of the video space (in bytes) + + = EOF = +diff --git a/configure.ac b/configure.ac +index 36ee002..cd31a9b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,9 +22,9 @@ + + AC_PREREQ(2.59) + AC_INIT([xf86-video-geode], +- 2.11.8, ++ [2.11.8], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode], +- xf86-video-geode, ++ [xf86-video-geode], + [http://www.x.org/wiki/GeodeDriver]) + + AC_CONFIG_SRCDIR([Makefile.am]) +diff --git a/src/cim/cim_modes.c b/src/cim/cim_modes.c +index 0e51caa..04d7edd 100644 +--- a/src/cim/cim_modes.c ++++ b/src/cim/cim_modes.c +@@ -1319,6 +1319,8 @@ static const PLL_FREQUENCY CimarronPLLFrequencies[] = { + , /* 100.187, - 3,25, 4 */ + {0x00002122, (101L << 16) | ((4200L * 65536L) / 10000L)} + , /* 101.420, - 3,19, 3 */ ++ {0x000041B1, (106L << 16) | ((5000L * 65536L) / 10000L)} ++ , /* 106.50, - 5,28, 2 */ + {0x00001081, (108L << 16) | ((0000L * 65536L) / 10000L)} + , /* 108.00, - 2, 9, 2 */ + {0x00006201, (113L << 16) | ((3100L * 65536L) / 10000L)} +@@ -1376,7 +1378,7 @@ static const PLL_FREQUENCY CimarronPLLFrequencies[] = { + {0x00002130, (320L << 16) | ((2070L * 65536L) / 10000L)} + , /* 320.207, - 3,20, 1 */ + {0x00006310, (341L << 16) | ((3490L * 65536L) / 10000L)} +- /* 341.349, - 7,50, 1 */ ++ /* 341.349, - 7,50, 1 */ + }; + + #define NUM_CIMARRON_PLL_FREQUENCIES sizeof(CimarronPLLFrequencies) / \ +diff --git a/src/geode_driver.c b/src/geode_driver.c +index 8887c23..43e9506 100644 +--- a/src/geode_driver.c ++++ b/src/geode_driver.c +@@ -58,7 +58,6 @@ + + /* Machine independent stuff */ + #include "mipointer.h" +-#include "mibank.h" + #include "micmap.h" + /* All drivers implementing backing store need this */ + #include "mibstore.h" +diff --git a/src/gx_randr.c b/src/gx_randr.c +index 91ca43e..a3aa5e4 100644 +--- a/src/gx_randr.c ++++ b/src/gx_randr.c +@@ -28,7 +28,6 @@ + + #include "xf86.h" + #include "os.h" +-#include "mibank.h" + #include "globals.h" + #include "xf86.h" + #include "xf86Priv.h" +@@ -56,7 +55,11 @@ typedef struct _GXRandRInfo + Rotation supported_rotations; /* driver supported */ + } XF86RandRInfoRec, *XF86RandRInfoPtr; + ++#if HAS_DEVPRIVATEKEYREC ++static DevPrivateKeyRec GXRandRIndex; ++#else + static int GXRandRIndex; ++#endif + + #define OLD_VIDEODRV_INTERFACE (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4) + +@@ -161,7 +164,11 @@ GXRandRSetMode(ScreenPtr pScreen, + int oldHeight = pScreen->height; + int oldmmWidth = pScreen->mmWidth; + int oldmmHeight = pScreen->mmHeight; ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 + WindowPtr pRoot = WindowTable[pScreen->myNum]; ++#else ++ WindowPtr pRoot = pScreen->root; ++#endif + DisplayModePtr currentMode = NULL; + Bool ret = TRUE; + PixmapPtr pspix = NULL; +@@ -332,6 +339,10 @@ GXRandRInit(ScreenPtr pScreen, int rotation) + #if OLD_VIDEODRV_INTERFACE + GXRandRIndex = AllocateScreenPrivateIndex(); + #endif ++#if HAS_DIXREGISTERPRIVATEKEY ++ if (!dixRegisterPrivateKey(&GXRandRIndex, PRIVATE_SCREEN, 0)) ++ return FALSE; ++#endif + + pRandr = xcalloc(sizeof(XF86RandRInfoRec), 1); + if (pRandr == NULL) +diff --git a/src/lx_exa.c b/src/lx_exa.c +index b267cc0..a70766f 100644 +--- a/src/lx_exa.c ++++ b/src/lx_exa.c +@@ -536,12 +536,15 @@ static Bool + lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst) + { + GeodeRec *pGeode = GEODEPTR_FROM_PICTURE(pDst); ++ const struct exa_format_t *srcFmt, *dstFmt; + + /* Check that the operation is supported */ + + if (op > PictOpAdd) + return FALSE; + ++ /* We need the off-screen buffer to do the multipass work */ ++ + if (usesPasses(op)) { + if (pGeode->exaBfrOffset == 0 || !pMsk) + return FALSE; +@@ -568,6 +571,10 @@ lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst) + if (pMsk && pMsk->transform) + return FALSE; + ++ /* XXX - don't know if we can do any hwaccel on solid fills or gradient types */ ++ if (pSrc->pSourcePict || (pMsk && pMsk->pSourcePict)) ++ return FALSE; ++ + /* Keep an eye out for source rotation transforms - those we can + * do something about */ + +@@ -583,21 +590,23 @@ lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst) + return FALSE; + + if (pMsk && op != PictOpClear) { ++ struct blend_ops_t *opPtr = &lx_alpha_ops[op * 2]; ++ int direction = (opPtr->channel == CIMGP_CHANNEL_A_SOURCE) ? 0 : 1; ++ ++ /* Direction 0 indicates src->dst, 1 indiates dst->src */ ++ if (((direction == 0) && (pSrc->pDrawable->bitsPerPixel < 16)) || ++ ((direction == 1) && (pDst->pDrawable->bitsPerPixel < 16))) { ++ ErrorF("Can't do mask blending with less then 16bpp\n"); ++ return FALSE; ++ } + /* We can only do masks with a 8bpp or a 4bpp mask */ + if (pMsk->format != PICT_a8 && pMsk->format != PICT_a4) + return FALSE; ++ /* The pSrc should be 1x1 pixel if the pMsk is not zero */ ++ if (pSrc->pDrawable->width != 1 || pSrc->pDrawable->height != 1) ++ return FALSE; + } + +- return TRUE; +-} +- +-static Bool +-lx_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMsk, +- PicturePtr pDst, PixmapPtr pxSrc, PixmapPtr pxMsk, PixmapPtr pxDst) +-{ +- GeodeRec *pGeode = GEODEPTR_FROM_PIXMAP(pxDst); +- const struct exa_format_t *srcFmt, *dstFmt; +- + /* Get the formats for the source and destination */ + + if ((srcFmt = lx_get_format(pSrc)) == NULL) { +@@ -631,6 +640,20 @@ lx_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMsk, + ErrorF("EXA: Can't rotate and convert formats at the same time\n"); + return FALSE; + } ++ return TRUE; ++} ++ ++static Bool ++lx_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMsk, ++ PicturePtr pDst, PixmapPtr pxSrc, PixmapPtr pxMsk, PixmapPtr pxDst) ++{ ++ GeodeRec *pGeode = GEODEPTR_FROM_PIXMAP(pxDst); ++ const struct exa_format_t *srcFmt, *dstFmt; ++ ++ /* Get the formats for the source and destination */ ++ ++ srcFmt = lx_get_format(pSrc); ++ dstFmt = lx_get_format(pDst); + + /* Set up the scratch buffer with the information we need */ + +@@ -644,14 +667,6 @@ lx_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMsk, + struct blend_ops_t *opPtr = &lx_alpha_ops[op * 2]; + int direction = (opPtr->channel == CIMGP_CHANNEL_A_SOURCE) ? 0 : 1; + +- /* Direction 0 indicates src->dst, 1 indiates dst->src */ +- +- if (((direction == 0) && (pxSrc->drawable.bitsPerPixel < 16)) || +- ((direction == 1) && (pxDst->drawable.bitsPerPixel < 16))) { +- ErrorF("Can't do mask blending with less then 16bpp\n"); +- return FALSE; +- } +- + /* Get the source color */ + + if (direction == 0) +@@ -661,11 +676,6 @@ lx_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMsk, + exaScratch.srcColor = lx_get_source_color(pxDst, pDst->format, + pSrc->format); + +- /* FIXME: What to do here? */ +- +- if (pSrc->pDrawable->width != 1 || pSrc->pDrawable->height != 1) +- return FALSE; +- + /* Save off the info we need (reuse the source values to save space) */ + + exaScratch.type = COMP_TYPE_MASK; +@@ -999,13 +1009,33 @@ lx_do_composite(PixmapPtr pxDst, int srcX, int srcY, int maskX, + srcPoint.y = F(0); + } + ++ /* Get the source point offset position */ ++ + srcOffset = GetSrcOffset(I(srcPoint.x), I(srcPoint.y)); + +- if (exaScratch.srcWidth < opWidth) +- opWidth = exaScratch.srcWidth; ++ /* When mask exists, exaScratch.srcWidth and exaScratch.srcHeight are ++ * the source width and source height; Otherwise, they are mask width ++ * and mask height */ ++ /* exaScratch.repeat is the source repeat attribute */ ++ /* If type is COMP_TYPE_MASK, maskX and maskY are not zero, we should ++ * subtract them to do the operation in the correct region */ + +- if (exaScratch.srcHeight < opHeight) +- opHeight = exaScratch.srcHeight; ++ /* FIXME: Please add the code to handle the condition when the maskX ++ * and maskY coordinate are negative or greater than ++ * exaScratch.srcWidth and exaScratch.srcHeight */ ++ ++ ++ if (exaScratch.type == COMP_TYPE_MASK) { ++ if ((exaScratch.srcWidth - maskX) < opWidth) ++ opWidth = exaScratch.srcWidth - maskX; ++ if ((exaScratch.srcHeight - maskY) < opHeight) ++ opHeight = exaScratch.srcHeight - maskY; ++ } else { ++ if (exaScratch.srcWidth < opWidth) ++ opWidth = exaScratch.srcWidth; ++ if (exaScratch.srcHeight < opHeight) ++ opHeight = exaScratch.srcHeight; ++ } + + while (1) { + +@@ -1057,10 +1087,21 @@ lx_do_composite(PixmapPtr pxDst, int srcX, int srcY, int maskX, + break; + } + +- opWidth = ((dstX + width) - opX) > exaScratch.srcWidth ? +- exaScratch.srcWidth : (dstX + width) - opX; +- opHeight = ((dstY + height) - opY) > exaScratch.srcHeight ? +- exaScratch.srcHeight : (dstY + height) - opY; ++ /* FIXME: Please add the code to handle the condition when the maskX ++ * and maskY coordinate are negative or greater than ++ * exaScratch.srcWidth and exaScratch.srcHeight */ ++ ++ if (exaScratch.type == COMP_TYPE_MASK) { ++ opWidth = ((dstX + width) - opX) > (exaScratch.srcWidth - maskX) ++ ? (exaScratch.srcWidth - maskX) : (dstX + width) - opX; ++ opHeight = ((dstY + height) - opY) > (exaScratch.srcHeight - maskY) ++ ? (exaScratch.srcHeight - maskY) : (dstY + height) - opY; ++ } else { ++ opWidth = ((dstX + width) - opX) > exaScratch.srcWidth ? ++ exaScratch.srcWidth : (dstX + width) - opX; ++ opHeight = ((dstY + height) - opY) > exaScratch.srcHeight ? ++ exaScratch.srcHeight : (dstY + height) - opY; ++ } + } + } + +diff --git a/src/lx_output.c b/src/lx_output.c +index 72e5e2a..beb1634 100644 +--- a/src/lx_output.c ++++ b/src/lx_output.c +@@ -155,15 +155,34 @@ lx_output_mode_valid(xf86OutputPtr output, DisplayModePtr pMode) + ScrnInfoPtr pScrni = output->scrn; + GeodeRec *pGeode = GEODEPTR(pScrni); + +- /* No scaling > for modes with > 1024 width */ ++ /* DCON Panel specific resolution - OLPC's one */ ++ if (pGeode->Output & (OUTPUT_PANEL | OUTPUT_DCON)) { ++ if (pGeode->panelMode->HDisplay == 1200 && ++ pGeode->panelMode->VDisplay == 900) ++ return MODE_OK; ++ } ++ ++ if (pGeode->Output & OUTPUT_PANEL && ++ gfx_is_panel_mode_supported(pGeode->panelMode->HDisplay, ++ pGeode->panelMode->VDisplay, ++ pMode->HDisplay, ++ pMode->VDisplay, ++ pScrni->bitsPerPixel) != -1) { + +- if (pGeode->Output & OUTPUT_PANEL) { +- if ((pMode->HDisplay != pGeode->panelMode->HDisplay) && +- pMode->HDisplay > 1024) +- return MODE_BAD; ++ return MODE_OK; + } + +- return MODE_OK; ++ if (gfx_is_display_mode_supported(pMode->HDisplay, ++ pMode->VDisplay, ++ pScrni->bitsPerPixel, ++ GeodeGetRefreshRate(pMode)) != -1) { ++ return MODE_OK; ++ } ++ ++ if (pMode->type & (M_T_DRIVER | M_T_PREFERRED)) ++ return MODE_OK; ++ ++ return MODE_BAD; + } + + static Bool +diff --git a/src/lx_panel.c b/src/lx_panel.c +index 7104384..f1d0686 100644 +--- a/src/lx_panel.c ++++ b/src/lx_panel.c +@@ -124,6 +124,7 @@ LXGetManualPanelMode(char *modestr) + sprintf(sname, "%dx%d", hactive, vactive); + + mode->name = xnfalloc(strlen(sname) + 1); ++ strcpy(mode->name, sname); + + mode->type = M_T_DRIVER | M_T_PREFERRED; + mode->Clock = clock; --- xserver-xorg-video-geode-2.11.8.orig/debian/source/format +++ xserver-xorg-video-geode-2.11.8/debian/source/format @@ -0,0 +1 @@ +1.0