--- xserver-xorg-video-intel-2.8.0.orig/src/i830_lvds.c +++ xserver-xorg-video-intel-2.8.0/src/i830_lvds.c @@ -81,6 +81,7 @@ "asus-laptop", "eeepc", "thinkpad_screen", + "mbp_backlight", "acpi_video1", "acpi_video0", "fujitsu-laptop", --- xserver-xorg-video-intel-2.8.0.orig/debian/xserver-xorg-video-intel.links +++ xserver-xorg-video-intel-2.8.0/debian/xserver-xorg-video-intel.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-intel/script --- xserver-xorg-video-intel-2.8.0.orig/debian/control +++ xserver-xorg-video-intel-2.8.0/debian/control @@ -0,0 +1,68 @@ +Source: xserver-xorg-video-intel +Section: x11 +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Drew Parsons , Julien Cristau , Brice Goglin +Build-Depends: + debhelper (>= 5), + pkg-config, + xserver-xorg-dev (>= 2:1.5.99.901), + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-xinerama-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + x11proto-video-dev, + libx11-dev, + libdrm-dev (>= 2.4.11), + x11proto-xf86dri-dev, + x11proto-gl-dev, + libgl1-mesa-dev | libgl-dev, + libpciaccess-dev (>= 0.8.0+git20071002), +# following are only needed for xvmc: + x11proto-dri2-dev, + libxvmc-dev (>= 1:1.0.1), + libxext-dev, + libxfixes-dev, +# end xvmc + dpkg-dev (>= 1.14.17), + automake, + libtool, + xutils-dev +Standards-Version: 3.8.1 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git + +Package: xserver-xorg-video-intel +Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386 lpia +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, libdrm-intel1 +Provides: ${xviddriver:Provides} +Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810 +Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810, 915resolution +Description: X.Org X server -- Intel i8xx, i9xx display driver + This package provides the driver for the Intel i8xx and i9xx family + of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945 + and i965 series chips. + . + This package also provides XvMC (XVideo Motion Compensation) drivers + for i810/i815 and i9xx and newer chipsets. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xf86-video-intel driver module. + +Package: xserver-xorg-video-intel-dbg +Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386 lpia +Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}, libdrm-intel1 +Section: debug +Priority: extra +Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols) + This driver provides support for the Intel i8xx and i9xx family of chipsets, + including i810, i815, i830, i845, i855, i865, i915, and i945 series chips. + . + This package provides debugging symbols for this Xorg X driver. --- xserver-xorg-video-intel-2.8.0.orig/debian/xserver-xorg-video-intel.manpages +++ xserver-xorg-video-intel-2.8.0/debian/xserver-xorg-video-intel.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man4/* --- xserver-xorg-video-intel-2.8.0.orig/debian/README.source +++ xserver-xorg-video-intel-2.8.0/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +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 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. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- xserver-xorg-video-intel-2.8.0.orig/debian/xserver-xorg-video-intel-dbg.install +++ xserver-xorg-video-intel-2.8.0/debian/xserver-xorg-video-intel-dbg.install @@ -0,0 +1 @@ +usr/bin/intel_reg_dumper --- xserver-xorg-video-intel-2.8.0.orig/debian/compat +++ xserver-xorg-video-intel-2.8.0/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-video-intel-2.8.0.orig/debian/copyright +++ xserver-xorg-video-intel-2.8.0/debian/copyright @@ -0,0 +1,440 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +This copyright file is based on xf86-video-intel 2.3.1. + +The files under src/modes/ and src/parser/ are stolen from the xorg-server +source. + +The authors of this core are, see below for copyright declarations. + +* Alan Hourihane / +* Bob Paauwe +* Dave Airlie +* Dave Mueller +* David Dawes +* Eric Anholt +* Jens Owen +* Jesse Barnes +* Jonathan Bian +* Keith Packard +* Keith Whitwell +* Kevin E. Martin / +* Kristian Høgsberg +* Luc Verhaegen +* Matt Sottek +* Rickard E. (Rik) Faith +* Thomas Hellstrom +* Wang Zhenyu +* Xiang Haihao + +==== + +Most of the code is covered by the MIT/X11 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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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 copyright holders are: + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas: +src/i810_accel.c +src/i810_wmark.c +src/i810_reg.h +src/i810_driver.c +src/i810_memory.c +src/i810_io.c +src/i810_cursor.c +src/i830_accel.c +src/i830_xaa.c +src/i830_exa.c + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +* Copyright 2000 VA Linux Systems, Inc. +src/xvmc/xf86dri.h +src/xvmc/xf86dri.c + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +* Copyright 2002 David Dawes +src/i830_memory.c +src/i830.h +src/i830_ring.h +src/i830_cursor.c +src/i810_ring.h +src/i810.h +src/common.h +src/xvmc/xf86dristr.h + +* Copyright 2000 Intel Corporation. All Rights Reserved: +src/i810_hwmc.c +src/i830_video.h +src/i810_video.c +src/i830_video.c + +* Copyright 2001 Intel Corporation. All Rights Reserved. +src/xvmc/I810XvMC.h +src/xvmc/I810XvMC.c + +* Copyright 2001 VA Linux Systems Inc., Fremont, California. +* Copyright 2002 by David Dawes +src/i830_dri.c +src/i830_driver.c + +* Copyright 2001 VA Linux Systems Inc., Fremont, California. +* Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas. +src/i830_common.h + +* Copyright 2002 David Dawes +* Copyright 2006 Intel Corporation +src/i830_modes.c + +* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. +src/i810_common.h + +* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. +src/i830_reg.h +src/i830_3d.c +src/i915_3d.c +src/i915_reg.h +src/xvmc/intel_batchbuffer.c + +* Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas. +src/brw_structs.h +src/brw_defines.h + +* Copyright 2005 Red Hat, Inc. +src/i830_io.c + +* Copyright 2005 Adam Jackson: +src/Makefile.am + +* Copyright (c) 2005 Jesse Barnes +src/i830_exa.c + +* Copyright 2005 Thomas Hellstrom. All rights reserved. +src/xvmc/driDrawable.c +src/xvmc/driDrawable.h + +* Copyright 2005-2006 Luc Verhaegen. +src/modes/xf86cvt.c + +* Copyright 2006 Luc Verhaegen. +src/modes/xf86EdidModes.c + +* Copyright 2006 Dave Airlie +src/i830_i2c.c +src/i830_sdvo.c +src/i830_dvo.c +src/sil164/sil164.c +src/sil164/sil164.h +src/sil164/sil164_reg.h +src/ch7xxx/ch7xxx_reg.h +src/ch7xxx/ch7xxx.c +src/ch7xxx/ch7xxx.h + +* Copyright 2006 Intel Corporation: +src/xvmc/i915_xvmc.c +src/xvmc/i915_xvmc.h +src/xvmc/i915_structs.h +src/i915_hwmc.h +src/i915_hwmc.c +src/i915_video.c +src/i915_render.c +src/i915_3d.h +src/exa_wm.g4i +src/exa_wm_src_sample_argb.g4a +src/exa_wm_mask_affine.g4a +src/exa_wm_projective.g4i +src/exa_sf.g4a +src/exa_wm_affine.g4i +src/exa_wm_mask_sample_a.g4a +src/exa_sf_mask.g4a +src/exa_wm_write.g4a +src/exa_wm_mask_sample_argb.g4a +src/exa_wm_ca.g4a +src/exa_wm_src_affine.g4a +src/exa_wm_xy.g4a +src/exa_wm_noca.g4a +src/exa_wm_ca_srcalpha.g4a +src/exa_wm_mask_projective.g4a +src/exa_wm_src_sample_a.g4a +src/exa_wm_src_projective.g4a +src/i830_lvds.c +src/i830_sdvo.h +src/i830_bios.c +src/i830_bios.h +src/i830_debug.c +src/i830_crt.c +src/i830_display.c +src/i830_sdvo_regs.h +src/i830_render.c +src/i830_tv.c +src/i830_display.h +src/i830_debug.h +src/packed_yuv_sf.g4a +src/packed_yuv_wm.g4a +src/i965_video.c +src/i965_render.c +src/ch7017/ch7017.c +src/ch7017/ch7017_reg.h +src/sil164/Makefile.am +src/modes/xf86Modes.h +src/ivch/ivch.c +src/ivch/ivch_reg.h +src/ivch/ivch_module.c + +* Copyright 2007 Intel Corporation: +src/bios_reader/bios_dumper.c +src/bios_reader/bios_reader.c +src/i830_hwmc.h +src/i830_hwmc.c +src/i830_quirks.c +src/xvmc/intel_xvmc.c +src/xvmc/intel_xvmc.h +src/reg_dumper/idle.c +src/reg_dumper/stepping.c +src/reg_dumper/main.c +src/reg_dumper/reg_dumper.h + +* Copyright 2007 Dave Mueller +src/tfp410/tfp410.c +src/tfp410/tfp410.h +src/tfp410/tfp410_reg.h + +==== + +src/i810_dga.c is Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK +and covered by the following license: + +- + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Alan Hourihane not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Alan Hourihane makes no representations + * about the suitability of this software for any purpose. It is provided + * "as is" without express or implied warranty. + * + * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. +- + +==== +A few files a covered by the following license: + +- + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. +- + +The copyright holders are: + +* Copyright 2002 Keith Packard, member of The XFree86 Project, Inc. +src/modes/xf86RandR12.c + +* Copyright 2006 Keith Packard +src/modes/xf86Crtc.c +src/modes/xf86RandR12.h +src/modes/xf86Rename.h +src/local_xf86Rename.h +src/modes/xf86DiDGA.c +src/modes/xf86Rotate.c +src/modes/xf86Crtc.h + +* Copyright 2006 Eric Anholt +src/i2c_vid.h + +* Copyright 2007 Keith Packard +src/modes/xf86Cursors.c + +==== + +src/parser/xf86Parser.h and src/parser/xf86Optrec.h are covered by a license +similar to the MIT/X11 license, but with an additional advertising clause: + +* Copyright (c) 1997 Metro Link Incorporated +* Copyright (c) 1997-2003 by The XFree86 Project, Inc. +* Copyright (c) 1997-2001 by The XFree86 Project, Inc. + +- + * 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 X CONSORTIUM 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 the Metro Link shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from Metro Link. +- + +==== + +src/modes/xf86Modes.c is covered by a license similar to the MIT/X11 license, +but with an additional advertising clause: + +- + * Copyright (c) 1997-2003 by The XFree86 Project, Inc. + * + * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ +- + +==== + +src/reg_dumper/xprintf.c is covered by a license similar to the MIT/X11 license, +but with an additional advertising clause: + +- + * Copyright (c) 2004 Alexander Gottwald + * + * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright + * holders shall not be used in advertising or otherwise to promote the sale, + * use or other dealings in this Software without prior written authorization. + */ +- + +==== + +All files generated by the buildsystem toolchain (e.g. autogen.sh) remain +under the copyright of their authors from the respective tools. + +==== + + +A couple of files are without explicit copyright: + +Some tiny Makefile.am: +src/reg_dumper/Makefile.am +src/xvmc/Makefile.am +src/ch7017/Makefile.am +src/tfp410/Makefile.am +src/ivch/Makefile.am +src/ch7xxx/Makefile.am + + +src/exa_wm_write.g4b +src/exa_sf.g4b +src/exa_wm_xy.g4b +src/packed_yuv_sf.g4b +src/exa_wm_src_sample_argb.g4b +src/exa_sf_mask.g4b +src/exa_wm_src_sample_a.g4b +src/exa_wm_src_affine.g4b +src/packed_yuv_wm.g4b +src/exa_wm_mask_sample_argb.g4b +src/exa_wm_ca.g4b +src/exa_wm_mask_affine.g4b +src/exa_wm_ca_srcalpha.g4b +src/exa_wm_nomask.g4a +src/exa_wm_mask_projective.g4b +src/exa_wm_noca.g4b +src/exa_wm_mask_sample_a.g4b +src/exa_wm_src_projective.g4b + + +src/tfp410/tfp410_module.c +src/ch7xxx/ch7xxx_module.c +src/ch7017/ch7017_module.c +src/xvmc/i915_program.h +src/xvmc/intel_batchbuffer.h +src/scripts/clock-graph.5c +src/scripts/clock.5c +src/scripts/fix.5c +src/scripts/tv.5c +src/sil164/sil164_module.c +src/i810_dri.h +src/i810_dri.c +src/i830_dri.h --- xserver-xorg-video-intel-2.8.0.orig/debian/changelog +++ xserver-xorg-video-intel-2.8.0/debian/changelog @@ -0,0 +1,2049 @@ +xserver-xorg-video-intel (2:2.8.0-0ubuntu2~mactel1) karmic; urgency=low + + * Add mbp_backlight to kernel backlight properties + + -- Henrik Rydberg Sun, 23 Aug 2009 16:58:56 +0200 + +xserver-xorg-video-intel (2:2.8.0-0ubuntu2) karmic; urgency=low + + * No change rebuild against the new dri2proto 2.1 features since xserver + was upgraded. + + -- Bryce Harrington Wed, 05 Aug 2009 07:49:03 -0700 + +xserver-xorg-video-intel (2:2.8.0-0ubuntu1) karmic; urgency=low + + * New upstream release 2.8.0 + * Disable installation of ChangeLog + + -- Bryce Harrington Tue, 21 Jul 2009 01:23:22 -0700 + +xserver-xorg-video-intel (2:2.7.99.902+git20090720.bb300738-0ubuntu1) karmic; urgency=low + + * Update to git 20090720 (master branch) up to commit bb300738 + - Fix intel driver reports Couldn't find PLL settings on i915 + (LP: #312133) + - Fix X freezing on intel 855GM + (LP: #370292) + - Implement vblank sync'd GL buffer swap + (LP: #377090) + + -- Bryce Harrington Mon, 20 Jul 2009 22:05:31 -0700 + +xserver-xorg-video-intel (2:2.7.99.901+git20090702.74227141-0ubuntu1) karmic; urgency=low + + [Robert Hooker] + * Update to git 20090702 (master branch) up to commit 74227141 + - Treat disabled CRTCs as "not covering" for scanline wait purposes. + Fixes problems returning from a dpms off state. + (LP: #390917, #383973, #390633, #385448, #388357) + - Add an xorg.conf option to control swapbuffers behavior. + - Set hot plug interrupt to detect HDMI output. + - Add a pipe-a quirk for Dell mini + (LP: #395306) + - Add a pipe-a quirk for thinkpad x30 + (LP: #304614) + - Reenable XvMC support in UXA. Now includes vld support. + - Fix EDID for LVDS output device to add the default modes in UMS. + (LP: #385832) + - Export EDID when using KMS, so Display options shows info correctly + (LP: #395140) + - Fixes for SDVO LVDS mode detection. + - Fix major performance regression of trapezoid rendering in UXA. + - Fixes for hangs when GL compositing is used with multiple monitors + with different refresh rates. + - Support for new IGDNG devices. + - Only get the VBIOS in non-KMS mode + - Add a few error messages for DRM initialization + - Don't try to pin buffers in KMS mode + - Fix 945GM VT switch in UMS + - Clear the bo on the rotate scratch pixmap (Fixes problems with rotation) + - uxa: Fix segfault on source-only picture usage with FallbackDebug. + - Various XvMC fixes. + * Merge with Debian experimental. Remaining Ubuntu changes: + - Add lpia architecture + * Drop patches since they're already upstream: + - 110_quirk_hp_mini.patch + - 117_quirk_thinkpad_x30.patch + - 118_pixmap_inline_funcs.patch + - 119_fix_drawable_abuse.patch + - 120_fix_dri2_vblank_syncing_segfault.patch + - 121_dont_change_blank_sync_width.patch + - 122_wait_for_vblank_to_sub_border_color.patch + - 123_kms_export_edid.patch + + -- Bryce Harrington Thu, 09 Jul 2009 14:02:45 -0700 + +xserver-xorg-video-intel (2:2.7.99.901-2) experimental; urgency=low + + * Pull upstream fix for xvmc build. + * Update build-depends, and reenable xvmc. + + -- Julien Cristau Thu, 11 Jun 2009 18:52:10 +0200 + +xserver-xorg-video-intel (2:2.7.99.901-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Thu, 11 Jun 2009 08:18:49 +0200 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu5) karmic; urgency=low + + * Add 123_kms_export_edid.patch: Allow EDID to be exported in the KMS + case as a randr property. This should help the display properties applet + list the proper resolutions, and solve some dpi issues. + + -- Bryce Harrington Wed, 01 Jul 2009 19:54:22 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu4) karmic; urgency=low + + * Add 122_wait_for_vblank_to_sub_border_color.patch: Wait for next + Vblank to substitue border color for Color info. Otherwise, this can + result in incorrect resolution detection due to phantom VGA port + on i915 and earlier. Cherrypick from upstream's main branch. + (LP: #273306) + + -- Bryce Harrington Sat, 27 Jun 2009 16:15:14 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu3) karmic; urgency=low + + * Add 121_dont_change_blank_sync_width.patch: Don't change the + blank/sync width when calculating scaled modes. Fixes fullscreen + graphical corruption on LVDS. + (LP: #351761) + + -- Bryce Harrington Sat, 27 Jun 2009 15:53:47 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu2) karmic; urgency=low + + * Add 118_pixmap_inline_funcs.patch, 119_fix_drawable_abuse.patch, + 120_fix_dri2_vblank_syncing_segfault.patch: Cherrypicks from upstream + to fix segfault associated with a last minute commit in the prior + snapshot to enable vsync for DRI2 CopyRegion. + (LP: #383129) + + -- Bryce Harrington Thu, 04 Jun 2009 07:45:05 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu1) karmic; urgency=low + + * Update to git 20090602 (master branch) up to commit ec2fde7c + - xvmc is disabled since DRI1 no longer supported + - LP: #96991 - 3D stuff breaks with Compiz: Redirected Direct Rendering + is needed in DRI + - LP: #120834 - X freezes with I830WaitLpRing error when running OpenGL apps + - LP: #337608 - X crashes in fbBlt() when using Sun Java Plugin 6 + firefox3.0 + - LP: #339555 - compiz slowmotion after Jaunty upgrade + - LP: #363900 - X.org freezes with intel driver, no apparent trigger + - LP: #331719 - VT switching doesn't work on Intel 915GM + - LP: #339091 - X freezes a few minutes after resuming + - LP: #348436 - Kubuntu: X server crash when screensaver is started (4500MHD) + - LP: #279727 - Kubuntu: Display Corruption w/ Intel 4700MHD + - LP: #357851 - Kubuntu: Distorted display after switching virtual desktops w/ exa + - LP: #158415 - Front buffer dynamic resize not supported + - LP: #324998 - x server restarts itself w/ compiz on Intel 945GM + - LP: #355593 - after upgrade to 9.04, rotating desktop cube ran slow + - LP: #357290 - 1 fps in 3d apps like neverball with EXA + - LP: #360774 - Graphical Corruption with EXA on X4500 + - LP: #364126 - screensaver prefs dialog in 9.04 RC livecd leaves dirt + - LP: #375712 - Native resolution for dell "2005fpw" monitor not listed + - LP: #375264 - Choppy flash video and poor performance with compiz + - LP: #349568 - Jaunty / Compiz slow and tearing on GMA 4500MHD + - LP: #356056 - window tearing during movement on 965 (no compiz) + - LP: #330460 - xorg shows black image/hangs with jpg in firefox + - LP: #347587 - X asserts on pI830->batch_ptr != 0 on resume from suspend + * Merge with Debian experimental. Remaining Ubuntu changes: + - Add lpia architecture + - Re-enable the patch system, add quilt to build-deps. + - 110_quirk_hp_mini.patch: quirk (sent upstream) + - 117_quirk_thinkpad_x30.patch: quirk (sent upstream) + * Drop 116_8xx_disable_dri.patch. There have been fixes for 3d on 8xx + chipsets upstream, so drop the DRI disablement so the fixes can be + re-tested. + * Drop 103_quirk_intel_mb890.patch. Better quirk available upstream. + (LP: #305269) + + -- Bryce Harrington Tue, 02 Jun 2009 10:47:32 -0700 + +xserver-xorg-video-intel (2:2.7.99.1-2) experimental; urgency=low + + [ Julien Cristau ] + * Pull from upstream git branch 'master', commit 8e942b70. + * Bump libdrm-dev build-dep to 2.4.11. + * Merge changes from 2:2.7.1-1. + * Bump Standards-Version to 3.8.1. + + [ David Nusinow ] + * Add README.source + + -- Julien Cristau Thu, 28 May 2009 20:10:30 +0200 + +xserver-xorg-video-intel (2:2.7.99.1-1) experimental; urgency=low + + * New upstream release candidate. + * Stop installing libI810XvMC.so and libIntelXvMC.so for now. They are + disabled in configure for now because DRI1 is not supported anymore. + * Install the upstream NEWS file, closes: #524334, #524336. + * Move the -dbg package to section debug. + + -- Brice Goglin Wed, 29 Apr 2009 19:50:26 +0200 + +xserver-xorg-video-intel (2:2.7.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Add lpia architecture + - 103_quirk_intel_mb890.patch: quirk + - 110_quirk_hp_mini.patch: quirk + - 116_8xx_disable_dri.patch: DRI proved buggy on certain 8xx chips so + this disables it. The DRI probably needs re-testing to verify this + patch is still needed, but it will be kept for now. + - 117_quirk_thinkpad_x30.patch: quirk + * Drop 119_drm_bo_unreference_needs_null.patch: upstream. + * Re-enable the patch system, add quilt to build-deps. + + -- Timo Aaltonen Fri, 22 May 2009 11:17:55 +0300 + +xserver-xorg-video-intel (2:2.7.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + * Install the upstream NEWS file, closes: #524334, #524336. + * Move the -dbg package to section debug. + + [ David Nusinow ] + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. + + -- Brice Goglin Wed, 13 May 2009 07:14:50 +0200 + +xserver-xorg-video-intel (2:2.7.0-1ubuntu2) karmic; urgency=low + + * Drop 109_i830-fifo-watermark-conservative.patch: + + Patch was insufficient to fix #311895, and doesn't help any more + anyway. + + -- Bryce Harrington Sat, 16 May 2009 13:50:15 -0700 + +xserver-xorg-video-intel (2:2.7.0-1ubuntu1) karmic; urgency=low + + * Merge from Debian of upstream's 2.7.0 release. + - Fixes: memory leak causes system to run out of memory + (LP: #360319) + - Fixes: Video playback suffers from tearing on GMA 4500MHD + (LP: #339233) + - Fixes: powertop wakeups 71.6 : i915@pci + (LP: #352763) + - Fixes: `man intel` does not mention UXA in the AccelMethod section + (LP: #364284) + - Fixes: TV Format changes don't work + (LP: #298422) + * Remaining ubuntu changes against Debian version: + - Add lpia architecture + - 103_quirk_intel_mb890.patch: quirk + - 109_i830-fifo-watermark-conservative.patch: Still in progress + upstream in fd.o #19304, but retain as a placeholder until better + fix is found. + - 110_quirk_hp_mini.patch: quirk + - 116_8xx_disable_dri.patch: DRI proved buggy on certain 8xx chips so + this disables it. The DRI probably needs re-testing to verify this + patch is still needed, but it will be kept for now. + - 117_quirk_thinkpad_x30.patch: quirk + - 119_drm_bo_unreference_needs_null.patch: Fixes several crashes; + seems not to be included upstream yet. + * Drop patches no longer needed: + - Drop 112_num_used_fences.patch; no longer needed with updated kernel + - Drop 105_no_modesetting.diff; now we want to enable kernel modesetting + - Drop 115_fix_crash_xv_overlay.patch; included in upstream + - Drop 118_drop_legacy3d.patch; included in upstream + - Drop 120_fix_vt_switch.patch; included in upstream + - Drop 106_remove_triple_buffering.diff; included in upstream + - Drop 107_remove_pageflipping.diff; included in upstream + * Refresh 119_drm_bo_unreference_needs_null.patch to apply + + -- Bryce Harrington Fri, 08 May 2009 12:08:57 -0700 + +xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 16 Apr 2009 07:11:09 +0200 + +xserver-xorg-video-intel (2:2.6.99.903-1) experimental; urgency=low + + * New upstream release candidate. + * Bump build-dep on libdrm-dev to 2.4.6. + + -- Brice Goglin Sat, 11 Apr 2009 22:45:57 +0200 + +xserver-xorg-video-intel (2:2.6.3-1) unstable; urgency=low + + * New upstream release. + * Bump build-dep on libdrm-dev to 2.4.5. + * Upload to unstable. + * Cherry-pick some patches from upstream git, so this doesn't FTBFS with the + new libdrm (closes: #523125) + + -- Julien Cristau Thu, 09 Apr 2009 10:25:22 +0100 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu9) jaunty; urgency=low + + * Add 120_fix_vt_switch.patch: Fix null pointer deref in + I830StopVideo(), which can lead to segfaults calling + drm_intel_bo_unpin or drm_intel_bo_unreference when entering DPMS. + Thanks to unggnu for shepherding this bug to solution! + (LP: #345796) + + -- Bryce Harrington Wed, 08 Apr 2009 19:12:39 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu8) jaunty; urgency=low + + * Expand patch 116 and rename to 116_8xx_disable_dri.patch to + fix freezing issue on i810 as well. + (LP: #279835) + + -- Bryce Harrington Mon, 06 Apr 2009 18:18:46 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu7) jaunty; urgency=low + + * Add 119_drm_bo_unreference_needs_null.patch: + - The first time through the Xv code, an allocated buffer is + unreferenced but the pointer is not reset to NULL. Thus, the next time + a video is played, -intel thinks it has a valid buffer and crashes + when it tries to access the freed memory. Fixes a number of crashes + reported since moving to the 2.6.3 driver. + - Fixes crash on i945 with frame buffer width > 2048. DRI is disabled + on this chipset when the frame buffer exceeds this width. + (LP: #354688) + - Fixes crash on i865 where DRI is off because of patch 116 + (LP: #352760) + - Fixes crash on i845 starting after 304871 was fixed + (LP: #354889) + - Fixes crash on i830 when manually disabling DRI + (LP: #347527) + + -- Bryce Harrington Mon, 06 Apr 2009 14:28:29 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu6) jaunty; urgency=low + + * Update 116_865g_disable_dri.patch: Permit DRI on 845. + Evidence so far suggests the freezes on 845 due to DRI are gone. + + -- Bryce Harrington Sat, 04 Apr 2009 12:49:38 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu5) jaunty; urgency=low + + * Disable 114_fix_xv_with_non_gem.patch: At the time we accepted it, it + sounded a little risky, so I took it on the condition that it didn't + cause regressions, which apparently we have proof that it does. + (LP: #348428) (Reopen 344740) + + -- Bryce Harrington Fri, 03 Apr 2009 20:03:39 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu4) jaunty; urgency=low + + * Add 117_quirk_thinkpad_x30.patch: + - Pipe-A quirk to fix lid close freeze on Thinkpad X30 + (LP: #304614) + * Add 118_drop_legacy3d.patch: + - Remove Legacy3D as a user-configurable option and force fallback to + legacy fixed textures when GEM is not being used. Fixes "couldn't + bind memory for BO backbuffer" issue on at least i855 chipsets. + (LP: #322646) + + -- Bryce Harrington Wed, 01 Apr 2009 00:25:55 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu3) jaunty; urgency=low + + * Add 116_865g_disable_dri.patch: + - On 865G chipset, X freezes during boot with DRI enabled. Disabling it + as a workaround until a better fix is found. + (LP: #317457) + * Drop explicit dependency on libdrm-intel1, as libdrm now provides + this properly (libdrm2 commit a87c1a081b77a29fe3430d). + + -- Bryce Harrington Tue, 31 Mar 2009 18:36:00 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu2) jaunty; urgency=low + + * Add 114_fix_xv_with_non_gem.patch, 115_fix_crash_xv_overlay.patch: + - Fix green window when playing movies with Xv extension (LP: #344740) + + -- Bryce Harrington Wed, 18 Mar 2009 17:05:09 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu1) jaunty; urgency=low + + * New upstream release: + - Access the Xv buffer through the GTT for the non-KMS case. + - Fix i915 textured video to work with the i830_memory -> bo change. + - Make i830_allocate_memory take tiling parameters. + - Fixup bogus VBT when detected. Causes incorrect video modes for + several Dell and Sony machines. + - Various KMS, BOs, UXA, and DRI2 fixes + - Various new hw quirks + * Add ChangeLog not included in upstream tarball (else FTBS) + * Add 112_num_used_fences.patch: Work around FTBS due to missing kernel + header changes (from drm commit 0f973f27888e4664b253ab2cf69c67c2eb80ab1b) + * debian/control: Update libdrm2 dependency to 2.4.5 + * Drop patches applied upstream: + - 104_i830-vbt-timing-hack.patch + - 108_dont_disable_vga_centering_bit.patch + - 111_quirks_march4_sync.patch (Fixes LP: #343577) + * Refresh 107_remove_pageflipping.diff to apply + + -- Bryce Harrington Tue, 17 Mar 2009 13:34:59 -0700 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu5) jaunty; urgency=low + + * Add 111_quirks_march4_sync.patch: Cherrypick from upstream's quirks + - Fix LVDS issues on MSI IM-945GSE-A and all GM45 chips + - Fix lid close issue on Mirrus Centrino laptop + - Fix tv-out issue on HP Compaq nx6310 systems + + -- Bryce Harrington Wed, 04 Mar 2009 14:46:30 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu4) jaunty; urgency=low + + * Add 110_quirk_hp_mini.patch: Pipe-A quirk for an HP Mini + * Renumber patch 02_i830-fifo-watermark-conservative.patch to + 109_i830-fifo-watermark-conservative.patch + + -- Bryce Harrington Mon, 02 Mar 2009 21:52:04 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu3) jaunty; urgency=low + + * Add 02_i830-fifo-watermark-conservative.patch: Avoid pipe underruns on + high graphics activity, which caused flicker and sometimes complete screen + corruption. (LP: #311895, fd.o #19304) + + -- Martin Pitt Wed, 25 Feb 2009 08:26:35 +0100 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu2) jaunty; urgency=low + + * Add 108_dont_disable_vga_centering_bit.patch. Cherry-pick from + upstream commit 3aa8591abfbe8db0f13912910c850fdd748808df. + Don't disable vga centering bit. Causes failure to display + lower resolutions on Eee PCs, etc. + (LP: #324913) + + -- Bryce Harrington Mon, 09 Feb 2009 15:20:29 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu1) jaunty; urgency=low + + * Merge with Debian experimental, remaining changes: + - debian/control: + + Add lpia to the list of architectures. + + Drop Vcs-* as we're not using these repos for -intel. + - debian/patches: + + 103_quirk_intel_mb890.patch + Add ignore lvds quirk for mb890 motherboards to fix issue where + display shows all in one color. (LP: 305269) + + 104_i830-vbt-timing-hack.patch + Adjust h and vblank end to fix issue on Dell Studio 15 and + other similar hardware. Fixes issue where X comes up with an + unusable white screen on the LVDS. (LP: 297245) + * Add 105_no_modesetting.diff + - 2.6.28 doesn't ship drm headers that support modesetting, so + disable it for the driver to build. + * Add 106_remove_triple_buffering.diff + - Obsolete code, prerequisite for the next patch. + * Add 107_remove_pageflipping.diff + - Remove pageflipping support. It never got in the kernel drm code, + so without this the build fails. + + -- Timo Aaltonen Fri, 23 Jan 2009 10:41:27 +0200 + +xserver-xorg-video-intel (2:2.6.1-1) experimental; urgency=low + + * New upstream release. + * Build against xserver 1.6 rc1. + + -- Julien Cristau Thu, 22 Jan 2009 00:18:25 +0100 + +xserver-xorg-video-intel (2:2.6.0-1) experimental; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 15 Jan 2009 10:54:17 +0100 + +xserver-xorg-video-intel (2:2.5.99.2-1) experimental; urgency=low + + * New upstream release. + + doesn't crash on EnterVT with libdrm 2.4.3 (closes: #511263) + * Update libdrm-dev build-dep to 2.4.3. + + -- Julien Cristau Wed, 14 Jan 2009 08:08:20 +0100 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu9) jaunty; urgency=low + + * i830-vbt-timing-hack.patch: Adjust h and vblank end to fix issue on + Dell Studio 15 and other similar hardware. Fixes issue where X + comes up with an unusable white screen on the LVDS. + (LP: #297245) + + -- Bryce Harrington Tue, 13 Jan 2009 16:18:19 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu8) jaunty; urgency=low + + * 103_quirk_intel_mb890.patch: Add ignore lvds quirk for mb890 + motherboards to fix issue where display shows all in one color. + (LP: #305269) + + -- Bryce Harrington Tue, 13 Jan 2009 00:01:48 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu7) jaunty; urgency=low + + * Also add lpia in the Architecture list of the -dbg package to clear it off + jaunty_outdate.txt (we have the -dbg on other arches anyway). + + -- Loic Minier Sat, 20 Dec 2008 21:38:09 +0100 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu6) jaunty; urgency=low + + * Rebuild against the new xserver + + -- Timo Aaltonen Mon, 15 Dec 2008 10:19:55 +0200 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu5) jaunty; urgency=low + + * Add explicit Depends for libdrm-intel1 (LP: #303177) + + -- Bryce Harrington Fri, 05 Dec 2008 20:03:20 +0000 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu4) jaunty; urgency=low + + * Drop 111_textured_video_option.patch. XvPreferOverlay (commit + 24c34f02) now provides an equivalent capability for turning textured + video off, making this patch redundant. + + -- Bryce Harrington Tue, 02 Dec 2008 12:47:10 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu3) jaunty; urgency=low + + * 102_quirk_hp_2730p.patch: pipea quirk for hp 2730p (LP: #291555) + + -- Bryce Harrington Tue, 02 Dec 2008 11:47:28 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu2) jaunty; urgency=low + + * Drop 128_stolen_memory_counting_g4x.patch (already upstream) + * Refresh and re-enable 111_textured_video_option.patch + + -- Bryce Harrington Tue, 02 Dec 2008 09:13:34 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu1) jaunty; urgency=low + + * Merge with debian experimental. Remaining changes: + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Drop Vcs-* as we're not using these repos for -intel. + - debian/patches: + + Renumber Ubuntu patches +100 + + 101_quirk_quanta_w251u.patch + + 111_textured_video_option.patch (disabled) + + 128_textured_video_option.patch (disabled) + * Drop 01_fix_compiz_video.diff. Was already disabled in Ubuntu previously + * Drop 05_intel_exa_force_greedy.patch. Should no longer be necessary. + * Drop patches already upstream: + - 20_thinkpad_g40_quirk.patch + - 21_quirk_lenovo.patch + - 22_no_pipe_for_hotplug_detection.patch + - 23_quirks_studiohybrid_eeepc_and_w251u.patch + - 24_no_render_suspend + - 25_quirk_nc6110.patch + - 26_i830-use-lfp-data-ptrs.patch + - 27_disable_fbc_on_965.patch + + -- Bryce Harrington Thu, 27 Nov 2008 10:46:18 -0800 + +xserver-xorg-video-intel (2:2.5.1-1) experimental; urgency=low + + * New upstream release. + * Wrap build-deps in debian/control. + * Build depend on libdrm-dev on all archs, since it's now required, and bump + the build dep to 2.4.1. + + -- Julien Cristau Sun, 23 Nov 2008 17:02:31 +0100 + +xserver-xorg-video-intel (2:2.4.2-1) experimental; urgency=low + + * Drop the xserver-xorg-video-i810 transitional package. + * Build against xorg-server 1.5. + * New upstream release (no changes from the previous snapshot other than the + version number). + + -- Julien Cristau Thu, 04 Sep 2008 02:49:59 +0200 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu11) jaunty; urgency=low + + * Re-enable 11_textured_video_option.patch, but change logic so it is + enabled by default. This allows people seeing issues with it to + turn it off if they wish. (LP: #278318) + + -- Bryce Harrington Fri, 14 Nov 2008 14:55:33 -0800 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10) intrepid; urgency=low + + * 28_stolen_memory_counting_g4x.patch: + - Fixes freeze on login for G45 hardware when X.org runs in EXA mode. + Issue was fixed upstream in both the kernel and x driver. This + patch is also in Debian. + (LP: #285572) + + -- Bryce Harrington Tue, 21 Oct 2008 11:35:13 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu9) intrepid; urgency=low + + * 27_disable_fbc_on_965.patch: + - Works around issue where flash videos freeze after playing for a few + moments on i965 chipset, by disabling Frame Buffer Compression, which + is not working reliably on this chipset. It can be re-enabled via the + FrameBufferCompression option for testing purposes. + (LP: #275285) + + -- Bryce Harrington Fri, 17 Oct 2008 18:11:03 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu8) intrepid; urgency=low + + * 26_i830-use-lfp-data-ptrs.patch: + - Fixes fatal server error "Couldn't find PLL settings for mode" + on a 855GM chipset, due to having an inaccurate VBT LFP_DATA + section from the BIOS parser. This pulls the info from a + different (more trustworthy) version of the data structure. + (LP: #274045) + + -- Bryce Harrington Thu, 16 Oct 2008 12:38:19 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu7) intrepid; urgency=low + + * Drop Vcs-* as we're not using these repos for -intel. + + -- Loic Minier Wed, 15 Oct 2008 13:24:36 +0200 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu6) intrepid; urgency=low + + * 25_quirks_nx6110.patch: + - Fixes error msg that "Mode 1280x1024 does not fit virtual size" + (LP: #271707) + + -- Bryce Harrington Sat, 20 Sep 2008 18:20:56 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu5) intrepid; urgency=low + + * 24_no_render_suspend: + - Fix blank screen and crash on startup with x4500 (LP: #265119) + + -- Christopher James Halse Rogers (RAOF) Fri, 19 Sep 2008 14:00:28 +1000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu4) intrepid; urgency=low + + * 23_quirks_studiohybrid_eeepc_and_w251u.patch: + - Fix blank screen on startup on Asus Eee PC due to LVDS + misconfiguration (LP: #233787) + - Fix blank screen on startup on Dell Studio Hybrid due to LVDS + misconfiguration (LP: #267945) + - Fix crash on lid close on Gigabyte W251U - pipeA quirk (LP: #244242) + + -- Bryce Harrington Fri, 12 Sep 2008 00:53:01 +0000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu3) intrepid; urgency=low + + * Rebuild against the new xserver-xorg-dev. + + -- Timo Aaltonen Fri, 12 Sep 2008 01:09:40 +0300 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu2) intrepid; urgency=low + + * 22_no_pipe_for_hotplug_detection.patch: Don't allocate a pipe for + hotplug detection. (LP: #256142) + + -- Timo Aaltonen Tue, 02 Sep 2008 16:13:52 +0300 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu1) intrepid; urgency=low + + * New upstream version, this is basically version 2.4.2. (LP: #260603) + * Merge with debian experimental. Remaining changes: + - debian/patches + + 20_thinkpad_g40_quirk.patch: + Quirk for IBM Thinkpad G40 + + 21_quirk_lenovo.patch: + Pipe-A quirks for Lenovo ThinkPad T60 + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + * Disable 01_fix_compiz_video.diff, since it appears to be obsolete + by now. + * Drop 05_intel_exa_force_greedy.patch, since it was not used (crash) + and the option doesn't seem to improve the performance anymore. + * Disable 11_textured_video_option.patch for now, textured video seems + to work just fine now. + + -- Timo Aaltonen Tue, 26 Aug 2008 14:19:55 +0300 + +xserver-xorg-video-intel (2:2.4.1-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + [ Julien Cristau ] + * Pull from 2.4-branch HEAD as of August 24th. + + -- Julien Cristau Sun, 24 Aug 2008 18:28:32 +0200 + +xserver-xorg-video-intel (2:2.4.0-1ubuntu1) intrepid; urgency=low + + * Merge with debian experimental. + * 20_thinkpad_g40_quirk.patch: don't remove another quirk, must've been + a mistake (and not related to G40). + * 21_quirk_lenovo.patch: rename and drop the HP quirk, since it's + upstream. + * rules: drop the change to not build intel_reg_dumper, libpciaccess is + in main now. + * changelog: bring back old entries lost during an old merge (ahem..). + * Fixes from upstream 2.4-branch: + 30_update_dsparb.patch + - Update DSPARB while planes are still off. + 31_reorder_visuals.patch + - Reorder visuals reported by the intel driver. + 32_dont_program_dsparb.patch + - Don't program dsparb on new Intel chip. + 33_fix_hp_pavilion_quirk.patch + - Fix up the HP Pavilion ze4944ea quirk. The chip is 855GM, not GM45. + + -- Timo Aaltonen Thu, 07 Aug 2008 14:38:09 +0300 + +xserver-xorg-video-intel (2:2.4.0-1) experimental; urgency=low + + * New upstream release. + * Refresh patch 01_gen_pci_ids.diff. + * Don't handle the nostrip build option in debian/rules, dh_strip does that; + allow the parallel=n option. + * Run autoreconf at build-time; build-depend on automake, libtool and + xutils-dev. + * Drop the debian revision from the libxvmc-dev build-dep. + + -- Julien Cristau Sun, 27 Jul 2008 13:18:42 +0200 + +xserver-xorg-video-intel (2:2.3.2-3) experimental; urgency=low + + * Build against xserver 1.5 rc5. + + -- Julien Cristau Mon, 14 Jul 2008 01:26:43 +0200 + +xserver-xorg-video-intel (2:2.3.2-2+lenny1) unstable; urgency=low + + * Cherry-pick patches from the 2.4.0 release: + - Add support for Intel 4 series chipsets + - add some quirks to force enable pipe A on some machines: in particular, + all 855GM (closes: #482819), and Lenovo T60 (closes: #487672) + - i810: Remove an effectively unused variable (only used in an incorrect + free()) + - Give asus and eeepc backlight method higher priority + - Don't use the phase shift bits on GM45 + - Fix official name for GM45 chipset + - Improve FBC size checking + - Only initialize integrated TV encoder for mobile chips + - Add no LVDS quirk for Transtec Senyo 610 mini PC + - Thinkpad R60e TV quirk via DMI info + * Fix debian/rules build/patch dependencies. + + -- Julien Cristau Sun, 27 Jul 2008 11:44:09 +0200 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu3) intrepid; urgency=low + + * Remove 19_check_exa_pitch_to_fix_rotate_crash.patch, fixed upstream + using a different approach. (LP: #246835) + + -- Timo Aaltonen Wed, 09 Jul 2008 15:31:08 +0300 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu2) intrepid; urgency=low + + * Disable 05_intel_exa_force_greedy.patch, since it makes the driver + to segfault the xserver. (LP: #246581) + + -- Timo Aaltonen Tue, 08 Jul 2008 18:31:22 +0300 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 11_textured_video_option.patch: + Renamed and reworked version of the old + 11_hw_overlay_option.diff patch, to re-enable the textured video + option, to allow users to turn off textured video. + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + + debian/patches/20_thinkpad_g40_quirk.patch: Quirk for IBM Thinkpad G40 + (LP: #240457) + + 21_quirk_lenovo_and_hp_pavilion.patch: Pipe-A quirks for Lenovo + ThinkPad T60 (LP: #243405) and HP Pavilion ze4944ea (LP: #242389) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + + -- Bryce Harrington Mon, 07 Jul 2008 21:10:38 -0700 + +xserver-xorg-video-intel (2:2.3.2-2) unstable; urgency=high + + * High urgency upload for RC bug fix. + * Update debian/copyright, thanks to Thomas Viehmann for reporting, and + Moritz Muehlenhoff for the thorough analysis (closes: #486340). + * Change the libdrm memory manager check in configure to look for 2.4.0 + instead of 2.3.1, as libdrm 2.3.1 was released without it. + + -- Julien Cristau Thu, 03 Jul 2008 16:55:05 +0200 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu3) intrepid; urgency=low + + * debian/patches/21_quirk_lenovo_and_hp_pavilion.patch: + + Quirk for fixing lockup on lid close for the Lenovo ThinkPad T60 + (LP: #243405) + + Quirk for fixing lockup on lid close for the HP Pavilion ze4944ea + (LP: #242389) + + -- Bryce Harrington Thu, 26 Jun 2008 20:36:29 -0700 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu2) intrepid; urgency=low + + * debian/patches/20_thinkpad_g40_quirk.patch: Quirk for IBM Thinkpad G40 + (LP: #240457) + + -- Bryce Harrington Fri, 20 Jun 2008 22:48:30 -0700 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 11_textured_video_option.patch: + Renamed and reworked version of the old + 11_hw_overlay_option.diff patch, to re-enable the textured video + option, to allow users to turn off textured video. + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + + -- Bryce Harrington Thu, 19 Jun 2008 22:36:51 -0700 + +xserver-xorg-video-intel (2:2.3.2-1) unstable; urgency=low + + * New upstream release. + + Revert "Add FIFO watermark regs to register dumper", + closes: #482369, #471413. + + Fix TV programming: add vblank wait after TV_CTL writes, + closes: #485616. + + -- Brice Goglin Wed, 18 Jun 2008 07:16:05 +0200 + +xserver-xorg-video-intel (2:2.3.1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + * 11_textured_video_option.patch: + - Renamed and reworked version of the old 11_hw_overlay_option.diff + patch, to re-enable the textured video option, to allow users to + turn off textured video. + * Dropped patches that are now upstream + * Restore Debian's Conflicts/Replaces for -i810 and symlink i810 to + intel. We are now following suit to Debian and X.org and fully + deprecating the i810 driver and with 915resolution with this + release; remaining issues requiring use of the i810 driver need to + be reported to Launchpad and upstream so they can finally all get + fixed. + + -- Bryce Harrington Fri, 06 Jun 2008 19:34:28 -0700 + +xserver-xorg-video-intel (2:2.3.1-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Mon, 12 May 2008 03:55:45 +0200 + +xserver-xorg-video-intel (2:2.3.0-1) experimental; urgency=low + + * Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings. + * New upstream release. + + -- Julien Cristau Wed, 23 Apr 2008 17:53:26 +0200 + +xserver-xorg-video-intel (2:2.2.99.903-1) experimental; urgency=low + + * New upstream release candidate. + + Fix LVDS regression: disable panel fitting on 855GM, + and fix dither setting, closes: #473838. + + -- Brice Goglin Tue, 15 Apr 2008 15:04:32 +0200 + +xserver-xorg-video-intel (2:2.2.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Disable DRI earlier if fb width > 2048, closes: #465421, #452357. + + -- Brice Goglin Mon, 31 Mar 2008 08:46:32 +0200 + +xserver-xorg-video-intel (2:2.2.99.901-2) experimental; urgency=low + + * Install libIntelXvMC.so. + + -- Brice Goglin Sat, 29 Mar 2008 12:15:14 +0100 + +xserver-xorg-video-intel (2:2.2.99.901-1) experimental; urgency=low + + [ Julien Cristau ] + * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to + bring in libpciaccess0 (closes: #467215). + * Only build on x86, this package doesn't make sense anywhere else. + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * Bump Standards-Version to 3.7.3 (no changes). + + [ Brice Goglin ] + * New upstream release. + + Fix pciaccess version check, closes: #470266. + + Fix crash on VT switch, closes: #469113. + + Fix video playback on rotated display, closes: #432157. + + -- Brice Goglin Fri, 21 Mar 2008 21:50:59 +0100 + +xserver-xorg-video-intel (2:2.2.1-2ubuntu2) intrepid; urgency=low + + * 20_dpll_prg_in_crtc_mode_set.patch: + - Fixes display problems caused by Jesse's force pipe A enablement + patch, which breaks DPLL programming. + + -- Bryce Harrington Wed, 28 May 2008 15:30:31 -0700 + +xserver-xorg-video-intel (2:2.2.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 03_dell_1535_quirk.diff: + Add a quirk for Dell Inspiron 1535 so it does not configure + against the HDMI port instead of the LCD's native resolution + (LP: 187860). + + 04_dell_1735_quirk.diff: + Another HDMI port quirk, for the Dell Inspiron 1735. + (LP: 188204) + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on i965 hardware. + (LP: 177492, 148247, 152206) + + 08_945gm_quirk.diff: + Adds quirk for another laptop model with a tv out detection bug. + (LP: 152416) + + 10_hw_overlay.diff: + Replace explicit checks for G965 for having no overlay since it + has one, with general check for future chips that may have no + overlay. (LP: 201596, 152206) + + 11_hw_overlay_option.diff: + Add a Boolean "TexturedVideo" option with default 'true' value + to be able to turn textured video off. + (LP: 201596, 152206) + + 12_quirk_sync.patch: Add some quirks from current git + upstream, and a quirk for Dell Latitude D630 (LP: 197740) + + 13_dpms_low_power_overlay.patch: + Fix crash triggered by dpms low power mode with hardware overlay + running (LP: 160309) + + 14_sysfs_fujitsu_backlight.patch: + Add sysfs backlight support for Fujitsu laptops (LP: 197620) + + 15_quirk_sony_vaio_vgn-sz4mn.patch: + Another Pipe A quirk - not already included - for the Sony Vaio + VGN-SZ4MN. (LP: 212163) + + 16_legacy_backlight_blc_pwn_ctl.patch: + Fixes issue where gdm, opengl apps, and vlc resets brightness to + xbacklight value on i915, by switching from BCM_LEGACY to + BCM_COMBO. (LP: 201933) + + 17_lockup_virtual_size_2048.patch: + Fixes crash if Virtual set to >2048 by disabling DRI in this case, + prior to initializing the DRI subsystem. (LP: 188178) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Nuke Conflicts and Replaces related to -i810. + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + Don't conflict with 915resolution, since it breaks upgrades + where people are still using i810 with widescreen resolutions. + (LP: 206167) + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to + coexist until -intel is able to replace it completely. + * debian/patches/18_quirks.patch: + - Add quirks for pipe A and tv output bugs. + (Closes LP: #204603, #216490, #201257, #224102) + * debian/patches/19_check_exa_pitch_to_fix_rotate_crash.patch: + - Fixes crash on xrandr rotation by checking EXA pitch size. + EXA wasn't checking devKind in ModifyPixmapHeader, which + makes it impossible to check homemade pixmaps (like produced + by rotate_pixmap(). So this patch checks in all !965 cases now. + 965G supports max pitch for current exa limit (128k) so doesn't + need checks. (Closes LP: #174745) + * debian/rules: + - Drop dpkg-shlibdeps with --warnings=6 (FTBS), sounds just cosmetic + + -- Bryce Harrington Fri, 09 May 2008 00:22:45 -0700 + +xserver-xorg-video-intel (2:2.2.1-2) unstable; urgency=low + + * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to + bring in libpciaccess0 (closes: #467215). + * Only build on x86, this package doesn't make sense anywhere else. + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266). + * 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. + + -- Julien Cristau Sun, 13 Apr 2008 02:10:18 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu12) hardy; urgency=low + + * debian/patches/17_lockup_virtual_size_2048.patch: + - merging patch from http://bugs.freedesktop.org/show_bug.cgi?id=13376. + Fixes crash if Virtual set to >2048 by disabling DRI in this case, + prior to initializing the DRI subsystem. (closes LP: #188178) + + -- Emmanuel Bretelle Sat, 29 Mar 2008 14:06:49 +0000 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu11) hardy; urgency=low + + * debian/patches/16_legacy_backlight_blc_pwn_ctl.patch: + - Fixes issue where gdm, opengl apps, and vlc resets brightness to + xbacklight value on i915, by switching from BCM_LEGACY to BCM_COMBO. + This won't affect users using the kernel's /sys/class/backlight + interfaces for managing the backlight, but should produce better + results for the majority of legacy bit users. (LP: #201933) + + -- Bryce Harrington Mon, 07 Apr 2008 23:41:38 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu10) hardy; urgency=low + + * debian/patches/15_quirk_sony_vaio_vgn-sz4mn.patch: + - Another Pipe A quirk - not already included - for the Sony Vaio + VGN-SZ4MN. (LP: #212163) + + -- Bryce Harrington Sat, 05 Apr 2008 13:00:38 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu9) hardy; urgency=low + + * debian/patches/14_sysfs_fujitsu_backlight.patch: + - Add sysfs backlight support for Fujitsu laptops (LP: #197620) + + -- Bryce Harrington Fri, 04 Apr 2008 20:02:03 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu8) hardy; urgency=low + + * debian/patches/13_dpms_low_power_overlay.patch: + - Fix crash triggered by dpms low power mode with hardware overlay + running (LP: #160309) + + -- Bryce Harrington Fri, 04 Apr 2008 16:33:51 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu7) hardy; urgency=low + + * debian/patches/12_quirk_sync.patch: Add some quirks from current git + upstream, and a quirk for Dell Latitude D630 (LP: #197740) + + -- Bryce Harrington Fri, 04 Apr 2008 14:02:07 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu6) hardy; urgency=low + + [ Bryce Harrington ] + * debian/patches/05_intel_exa_force_greedy.patch: Another shot at the + greedy patch. This time by slightly modifying the working patch by + moving its logic outside the i965 if loop, so it'll apply to all + hardware. (LP: #177492) + + [ Timo Aaltonen ] + * Don't conflict with 915resolution, since it breaks upgrades where + people are still using i810 with widescreen resolutions. + (LP: #206167) + + -- Timo Aaltonen Tue, 25 Mar 2008 11:25:42 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu5) hardy; urgency=low + + * Fix the overlay patch to really disable TexturedVideo by default. + (LP: #201596) + + -- Timo Aaltonen Fri, 14 Mar 2008 11:01:09 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu4) hardy; urgency=low + + * Revert the greedy change, use the old patch again since the new one + doesn't work right. (LP: #177492) + * Add patches to enable hardware overlay for i965, and disable textured + video by default. It can be enabled again by setting + 'Option "TexturedVideo" "true"'. (LP: #152206) + + -- Timo Aaltonen Tue, 11 Mar 2008 21:42:43 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu3) hardy; urgency=low + + * Add 07_intel_exa_force_all_greedy.patch, to expand the fix from + 05_intel_exa_force_greedy.patch to cover all Intel chipsets, not just + 965. (LP: #177492) + * Drop 05_intel_exa_force_greedy.patch, since 07 is a superset of it. + * Add 08_945gm_quirk.diff, to add quirk for another laptop model with a + tv out detection bug. (LP: #152416) + + -- Bryce Harrington Fri, 29 Feb 2008 15:52:16 -0800 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu2) hardy; urgency=low + + * Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + -- Timo Aaltonen Wed, 27 Feb 2008 00:04:15 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #189868, #195424), remaining + changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 03_dell_1535_quirk.diff: + Add a quirk for Dell Inspiron 1535 so it does not configure + against the HDMI port instead of the LCD's native resolution + (LP: 187860). + + 04_dell_1735_quirk.diff: + Another HDMI port quirk, for the Dell Inspiron 1735. + (LP: 188204) + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on i965 hardware. + (LP: 177492, 148247, 152206) + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + -- Timo Aaltonen Tue, 26 Feb 2008 14:04:11 +0200 + +xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + + Fix some blinking pixels and unreadable text, closes: #465921. + + Fix i830 stolen memory mask, closes: #464661. + + Fix flickering on i855, closes: #443809, #435621. + + [ Julien Cristau ] + * Build the intel_reg_dumper tool, and install it in the -dbg package. + Add build-dependency on libpciaccess-dev. + + -- Brice Goglin Sat, 23 Feb 2008 00:52:39 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-3) unstable; urgency=low + + * Grab upstream commit 2c8f87be99957e0e18d8bcda46bd8706ab374253 + to unbreak FramebufferCompression on i965. + + -- Brice Goglin Wed, 06 Feb 2008 21:29:44 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu7) hardy; urgency=low + + * Drop the xaa-patch, as it turns out that not only i965 has issues + with Xv & compiz. + * Bump the build-dep on xserver-xorg-dev to match the current version + that is needed in order to default to greedy EXA. + + -- Timo Aaltonen Thu, 21 Feb 2008 09:00:53 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu6) hardy; urgency=low + + * Add 06_xaa_as_default_except_i965.patch to switch us back to XAA by + default for intel chipsets for performance reasons, except for i965 + which does not work as well with XAA (Xv video doesn't display + properly.) This patch essentially just reverts upstream's 'Default to + EXA' patch, and adds a special case i965 to allow it to use EXA. + + -- Bryce Harrington Tue, 19 Feb 2008 14:27:18 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu5) hardy; urgency=low + + * Add 05_intel_exa_force_greedy.patch to force use of greedy mode on + i965 hardware. (closes LP: #177492, #148247, #152206) + + -- Bryce Harrington Tue, 19 Feb 2008 13:48:02 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu4) hardy; urgency=low + + * 04_dell_1735_quirk.patch: Another HDMI port quirk, for the Dell + Inspiron 1735. (LP: #188204) + + -- Bryce Harrington Thu, 14 Feb 2008 18:08:47 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu3) hardy; urgency=low + + * 03_dell_1535_quirk.patch: Add a quirk for Dell Inspiron 1535 so it + does not configure against the HDMI port instead of the LCD's native + resolution (LP: #187860). + + -- Bryce Harrington Thu, 14 Feb 2008 15:52:01 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu2) hardy; urgency=low + + * 02_quick_fix.patch: Patch from upstream to prevent a crash on start. + + -- Timo Aaltonen Wed, 06 Feb 2008 19:04:04 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * Drop 05_fix_xv_reset.diff, different implementation upstream. + + -- Timo Aaltonen Wed, 06 Feb 2008 18:03:24 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2) unstable; urgency=low + + * Actually pull the new upstream release candidate. + + -- Julien Cristau Wed, 06 Feb 2008 10:27:18 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-1) unstable; urgency=low + + * New upstream stable branch release candidate. Fixes the following bugs: + + server leaves pipe disabled at shutdown / vt switch ; closes: #453374 + + [855GM] need to use BIOS for mode information ; closes: #437066 + + Intel 2.2 crashes if playing a video then switching to another desktop; + closes: #452372 + + [G33] 2.2.0 locks up X with error "First SDVO output reported failure to + sync" ; closes: #451917 + + -- David Nusinow Tue, 05 Feb 2008 21:41:13 -0500 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1ubuntu2) hardy; urgency=low + + * 10_merge_upstream.diff: + - Merge all upstream commits from the stable branch up to commit + 103dc34f3afc17cea7e086927e124a30c605a686 + * 02_force_16bit_i81x.diff + - Dropped, upstream now. + + -- Timo Aaltonen Tue, 29 Jan 2008 12:58:37 +0200 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * debian/patches/02_force_16bit_i81x.diff: + - Force 16bit depth on i81{0,5} chips (LP: #178837) + + -- Timo Aaltonen Tue, 08 Jan 2008 17:22:38 +0200 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1) experimental; urgency=low + + * New upstream snapshot + + Clarifies backlight abilities in the manpage. Closes: #451847 + + Will use a functional backlight on older chips now. Newer chips may + benefit from configured to use something other than the legacy setting + though. Closes: #451848 + + Fixes exa rendering corruption on some 855GM laptops. Closes: #439210 + + Xv window hidden for a little while no longer causes segfaults. + Closes: #457587 + + -- David Nusinow Mon, 07 Jan 2008 22:41:51 -0500 + +xserver-xorg-video-intel (2:2.2.0-2) UNRELEASED; urgency=low + + * Conflict with 915resolution. This driver now handles all of this itself + and better. Closes: #452803 + + -- David Nusinow Mon, 03 Dec 2007 21:35:07 -0500 + +xserver-xorg-video-intel (2:2.2.0-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + - These patches have been disabled for now, since they don't apply + fully and need closer investigation: + + 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + + 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + + 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + -- Timo Aaltonen < tepsipakki@ubuntu.com> Sat, 24 Nov 2007 19:35:11 +0200 + +xserver-xorg-video-intel (2:2.2.0-1) unstable; urgency=low + + * New upstream release. + + Also pull bugfix commit 4a2b0f340357c4ca58dc9586fad1337b83966362. + + Fix backlight problems on various chipsets, + closes: #443111, #438969, #439744. + + Fix some issues with high resolution, closes: #420840. + * Add myself to Uploaders and remove Branden with his permission. + + -- Brice Goglin Fri, 16 Nov 2007 09:30:26 +0100 + +xserver-xorg-video-intel (2:2.1.99-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * Drop patches 02, 06, 08 which have been merged upstream. + * These patches have been disabled for now, since they don't apply fully + and need closer investigation: + - 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + - 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + - 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + -- Timo Aaltonen Thu, 15 Nov 2007 00:12:47 +0200 + +xserver-xorg-video-intel (2:2.1.99-1) experimental; urgency=low + + [ David Nusinow ] + * Make -i810 arch: all again + + [ Julien Cristau ] + * New upstream release candidate + + fixes VT switch issues (closes: #431373, #436336) + + fixes memory allocation issues (closes: #423416) + + adds support for ch701x LVDS controllers (closes: #438650, #420350, + #424952) + + -- Julien Cristau Sun, 11 Nov 2007 11:16:03 +0100 + +xserver-xorg-video-intel (2:2.1.1-5) unstable; urgency=low + + * Use the same architectures for the -dbg and i810 packages as -intel. + This should allow it to transition to testing. Closes: #449228 + + -- David Nusinow Sun, 04 Nov 2007 09:10:31 -0500 + +xserver-xorg-video-intel (2:2.1.1-4ubuntu2) hardy; urgency=low + + * Duh, really nuke the i810 manpage conflict. + + -- Timo Aaltonen Thu, 08 Nov 2007 18:52:43 +0200 + +xserver-xorg-video-intel (2:2.1.1-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 02_xps1330_tvout_quirk.diff: + add quirk, xps1330 has no tv out + + 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + + 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + + 06_sync_quirks.diff: + Sync TV out quirks with upstream + + 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + 08_fix_855_3D_state.diff + Emit the invariant 3D state to the GPU during EnterVT after + marking the 3D state as clobbered. This fixes / works around + textured surface corruption after resume on 855GM hardware. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + -- Timo Aaltonen Thu, 08 Nov 2007 08:53:28 +0200 + +xserver-xorg-video-intel (2:2.1.1-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 16:34:39 -0400 + +xserver-xorg-video-intel (2:2.1.1-3) experimental; urgency=low + + * Shorten the short description of the -dbg package a bit (thanks, Marc 'HE' + Brockschmidt). + * Rebuild for xserver 1.4. + + -- Julien Cristau Wed, 12 Sep 2007 11:21:49 +0200 + +xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low + + [ Julien Cristau ] + * Build against xserver 1.3.99.0. + + [ David Nusinow ] + * Add 01_gen_pci_ids.diff. This patch has the driver generate a list of pci + id's that it supports and installs it where the X server can find it. The + server with appropriate support will be able to automatically determine if + the intel driver is the proper driver to load when no driver is specified + in xorg.conf. + + -- Julien Cristau Sun, 19 Aug 2007 03:21:24 +0200 + +xserver-xorg-video-intel (2:2.1.1-1) unstable; urgency=low + + * New upstream release. + + manpage typo fixed (closes: #432061). Thanks, A Costa! + + adds quirk for TV output on some 965-based laptops (closes: #434297). + + -- Julien Cristau Tue, 14 Aug 2007 12:48:02 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu10) hardy; urgency=low + + [ Bryce Harrington ] + [Peter Clifton] + * 08_fix_855_3D_state.diff + - Emit the invariant 3D state to the GPU during EnterVT after + marking the 3D state as clobbered. This fixes / works around + textured surface corruption after resume on 855GM hardware. + (Closes LP: #133118) + * 07_fix_startup_blink.diff + - Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + (Closes LP: #148686) + * 04_fix_hw_restore.diff + - Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + (Closes LP: #108056) + + [Kyle McMartin, Bryce Harrington] + * 06_sync_quirks.diff: + - Sync TV out quirks with upstream + + -- Timo Aaltonen < tepsipakki@ubuntu.com> Thu, 01 Nov 2007 21:44:36 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu9) gutsy; urgency=low + + [Peter Clifton] + * 01_fix_compiz_video.diff: + - Bracket second clause in test for textured video to avoid + compiler warning and possibly incorrect testing. + * 04_fix_hw_restore.diff + - Only restore palette registers for pipes which are enabled, or + the system may hard-lock. (Initial patch by Bryce Harrington). + (Closes LP: #127101) + * 05_fix_xv_reset.diff + - Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + (Closes LP: #141063) + + -- Bryce Harrington Sat, 13 Oct 2007 12:58:07 -0700 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu8) gutsy; urgency=low + + * Brown paper bag release. + * Uncomment dh_installchangelogs. + + -- Kyle McMartin Thu, 11 Oct 2007 13:05:43 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu7) gutsy; urgency=low + + * 04-fix-g33-gtt-stolen-mem-range.diff: + - Nuke, caused graphics corruption on G33, reverted kernel code. + + -- Kyle McMartin Tue, 09 Oct 2007 09:51:18 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu6) gutsy; urgency=low + + * 04-fix-g33-gtt-stolen-mem-range.diff: + - Latest kernel release changes how stolen mem range is computed on + G33 hardware, needs this corresponding X change otherwise we die + trying to allocate GART memory. + + -- Kyle McMartin Sat, 06 Oct 2007 10:01:17 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu5) gutsy; urgency=low + + * 03_fix_brightness_control.diff: + - add code from upstream to avoid confusing the platform firmware + brightness control + + -- Matthew Garrett Thu, 04 Oct 2007 00:09:54 +0100 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu4) gutsy; urgency=low + + * 02_xps1330_tvout_quirk.diff: + - add quirk, xps1330 has no tv out + + -- Kyle McMartin < kyle@ubuntu.com> Fri, 28 Sep 2007 09:45:48 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu3) gutsy; urgency=low + + * debian/patches/01_fix_compiz_video.diff: + - default to overlay mode on hardware that supports it to + make compiz video work + + -- Michael Vogt Tue, 18 Sep 2007 09:48:45 +0100 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu2) gutsy; urgency=low + + * debian/patches/01_fix_compiz_video.diff: + - use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + -- Michael Vogt < michael.vogt@ubuntu.com> Tue, 14 Aug 2007 21:46:28 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu1) gutsy; urgency=low + + * New upstream version. + * Drop ChangeLog since it isn't updated upstream and is just + needless diff. + + -- Kyle McMartin Tue, 14 Aug 2007 02:38:09 -0400 + +xserver-xorg-video-intel (2:2.1.0-2) unstable; urgency=low + + [ Brice Goglin ] + * Fix XvMC support for only i810 and i815 in the long description. + * Build a xserver-xorg-video-intel-dbg package with debugging symbols. + + [ Julien Cristau ] + * Add upstream URL in the copyright file (thanks, Loïc Minier). + + -- Julien Cristau Mon, 09 Jul 2007 14:25:25 +0200 + +xserver-xorg-video-intel (2:2.1.0-1ubuntu2) gutsy; urgency=low + + * Add lpia to the list of architectures. + + -- Matthias Klose Tue, 07 Aug 2007 13:12:48 +0000 + +xserver-xorg-video-intel (2:2.1.0-1ubuntu1) gutsy; urgency=low + + [ Kyle McMartin ] + + * Merge changes from 2.0.0-1ubuntu2. + * Set Maintainer to core-dev. + * Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + - Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + - Nuke /usr/share/man/man4/i810.4 conflict + - Nuke Conflicts and Replaces related to -i810. + + -- Kyle McMartin Tue, 03 Jul 2007 12:45:17 -0400 + +xserver-xorg-video-intel (2:2.1.0-1) unstable; urgency=low + + * New upstream release. + * Actually install the upstream README. + + -- Julien Cristau Tue, 03 Jul 2007 11:19:48 +0200 + +xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low + + * Update to latest upstream (commit 1e2e3013). + * Add myself to uploaders. + + -- Julien Cristau Mon, 02 Jul 2007 03:08:51 +0200 + +xserver-xorg-video-intel (2:2.0.0-5) experimental; urgency=low + + [ Drew Parsons ] + * The upstream README file looks interesting, include it with docs. + + [ Julien Cristau ] + * Pull in latest upstream git. + + -- Julien Cristau Fri, 22 Jun 2007 03:58:48 +0100 + +xserver-xorg-video-intel (2:2.0.0-4) experimental; urgency=low + + [ Julien Cristau ] + * Update watch file (s/i810/intel/). + + [ Drew Parsons ] + * Pull in latest upstream git (probably contains final Xv fix). + Closes: #417860. + + -- Drew Parsons Tue, 05 Jun 2007 18:35:50 +1000 + +xserver-xorg-video-intel (2:2.0.0-3) experimental; urgency=low + + * Pull in latest upstream git (updated Xv fix) + + -- Drew Parsons Wed, 30 May 2007 12:20:45 +1000 + +xserver-xorg-video-intel (2:2.0.0-2) experimental; urgency=low + + [ Julien Cristau ] + * Build xserver-xorg-video-i810 in binary-indep instead of binary-arch + (closes: #420240). Thanks, Aaron M. Ucko! + * Mention i965 chipsets in the long description. + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-i810. + + [ Drew Parsons ] + * Pull in latest upstream git + - Restores Xv video overlay. Closes: #417860, #420281 + * autoreconf + + -- Drew Parsons Sat, 26 May 2007 18:08:33 +1000 + +xserver-xorg-video-intel (2:2.0.0-1ubuntu2) gutsy; urgency=low + + * Set Maintainer to core-dev. + * Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + - Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + - Nuke /usr/share/man/man4/i810.4 conflict + - Nuke Conflicts and Replaces related to -i810. + + -- Kyle McMartin Tue, 22 May 2007 18:53:04 +0000 + +xserver-xorg-video-intel (2:2.0.0-1ubuntu1) gutsy; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/control: + + Stop building the transitional xserver-xorg-video-i810, so that + it doesnt overwrite the identically-named package in main + + Replace and Conflict xserver-xorg-driver-i810. + + Change Maintainer address. + + -- Timo Aaltonen Mon, 21 May 2007 12:54:24 +0300 + +xserver-xorg-video-intel (2:2.0.0-1) unstable; urgency=low + + * New upstream release. + * Add XS-Vcs-*. + * Bump build-dep on xserver-xorg-dev to >= 2:1.3.0.0. + * Remove Fabio from Uploaders, with his permission. + * Install the bug script in the xserver-xorg-video-intel dir instead of + -i810. + * Install the upstream changelog. + * Upload to unstable. + + -- Julien Cristau Fri, 20 Apr 2007 08:54:20 +0200 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu3) feisty; urgency=low + + * Stop building the transitional xserver-xorg-video-i810, so that it doesnt + overwrite the identically-named package in main + + -- Sarah Hobbs Tue, 17 Apr 2007 15:10:03 +1000 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu2) feisty; urgency=low + + * src/ch7017/Makefile.{am,in} + - [FTBFS] Fix AM_CFLAGS to include '-I$(srcdir)/..' and + '-I$(srcdir)/../modes'. + + -- Timo Aaltonen Mon, 16 Apr 2007 15:47:59 +0300 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu1) feisty; urgency=low + + * Merge with Debian, remaining changes: + debian/control + - Change the Maintainer address. + - Replace and Conflict xserver-xorg-driver-i810 + - Ease the dependancy on xserver-xorg-dev. + debian/rules: + - Add '--with-xserver-source=/' so configure uses the included headers. + + -- Timo Aaltonen Wed, 4 Apr 2007 00:15:30 +0300 + +xserver-xorg-video-intel (2:1.9.94-1) experimental; urgency=low + + * New upstream release candidate. + + -- Julien Cristau Tue, 03 Apr 2007 11:36:43 +0200 + +xserver-xorg-video-intel (2:1.9.93-1) experimental; urgency=low + + * New upstream release candidate. + + bump build-dep on xserver-xorg-dev to >= 2:1.2.99.903. + + -- Julien Cristau Tue, 27 Mar 2007 08:25:39 +0200 + +xserver-xorg-video-intel (2:1.9.92-1) experimental; urgency=low + + * New upstream release candidate. + * Build-depend on xserver-xorg-dev 1.3rc2. + + -- Julien Cristau Thu, 15 Mar 2007 14:38:06 +0100 + +xserver-xorg-video-intel (2:1.9.91-2) experimental; urgency=low + + * Revert commit c2c62559e702e7de1fa2ef309fa647ab13564dc3 "Move + single mode setting code to X server." Brings i830PipeFindClosestMode + back into a consistent state. Closes: #414612. + * autoreconf and git-add Makefile.in files in ./src subdirectories. + + -- Drew Parsons Tue, 13 Mar 2007 22:49:18 +1100 + +xserver-xorg-video-intel (2:1.9.91-1) experimental; urgency=low + + * Bump build-dep on libdrm-dev to >= 2.2. Thanks, Marc 'HE' Brockschmidt! + * New upstream release candidate. + * Rename from -i810 to -intel to follow upstream naming. + * (Build-)Depend on a newer xserver. + + -- Julien Cristau Thu, 8 Mar 2007 18:55:05 +0100 + +xserver-xorg-video-i810 (2:1.7.4-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream version + * Generate Provides: line automatically + * Bump xserver-xorg-core build-depend to 2:1.2.0-6 to handle this properly + + [ Julien Cristau ] + * Drop duplicate build dependency on libdrm-dev, so this really + closes: #383918. + * Add support for the armeb and armel architectures, thanks to Riku Voipio + (closes: #408797). + * Drop all our patches, applied upstream. + * debian/rules clean needs to depend on xsfclean. + * Generate the dependency on xserver-xorg-core automatically. + + -- David Nusinow Sun, 4 Mar 2007 18:20:38 -0500 + +xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low + + [ Julien Cristau ] + * Don't build-dep on libdrm-dev on hurd-i386, and don't try to install + the libI810XvMC library there, as it isn't built without drm. Thanks to + Samuel Thibault for the patch! (closes: #383918) + + [ Drew Parsons ] + * Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty + BIOSes (where VBE initialization failed). Closes: #382120. + + -- Drew Parsons Sat, 20 Jan 2007 02:29:30 +1100 + +xserver-xorg-video-i810 (2:1.7.2-3) unstable; urgency=low + + * Build-Depends: quilt, needed to apply patches. + * Replace the cvs source url in the long description with an XS-Vcs-Git + control field and a reference to the xf86-video-intel module. + Added a link to www.X.org. + + -- Drew Parsons Wed, 6 Dec 2006 12:52:18 +1100 + +xserver-xorg-video-i810 (2:1.7.2-2) 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. + + [ Drew Parsons ] + * Apply upstream patch 1-overlay_fix_lockup.patch (git commit + e065324661ad08b3b359136f48090232f6138959, upstream bug #5774). + Should remove remaining lockup problems in I830WaitLpRing(). + Closes: #272294. + * While we're at it, apply upstream patch 11-xv_lockup.patch (git + commit fbb376bd1a4daad4c86e349df98438989ce173f1, upstream bug + #8594), fixing lockups related to Xv. We'll have no lockup bugs + in etch, dammit! Closes: #397485. + + -- Drew Parsons Wed, 6 Dec 2006 11:50:10 +1100 + +xserver-xorg-video-i810 (2:1.7.2-1) unstable; urgency=low + + * New upstream version + + Shipping the git log as part of our diff.gz rather than a separate patch + since upstream didn't include an updated Changelog + + -- David Nusinow Fri, 13 Oct 2006 14:33:20 -0400 + +xserver-xorg-video-i810 (2:1.6.5-4) UNRELEASED; urgency=low + + * Typo fix in man page. Closes: #364559. + + -- Drew Parsons Thu, 21 Sep 2006 23:21:14 +1000 + +xserver-xorg-video-i810 (2:1.6.5-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + [ Drew Parsons ] + * Standards version 3.7.2. + * Use debhelper 5. + * Use dh_installman to install man pages. + * Exclude .la from dh_install. + + -- David Nusinow Mon, 18 Sep 2006 19:57:38 -0400 + +xserver-xorg-video-i810 (2:1.6.5-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:32 +0000 + +xserver-xorg-video-i810 (2:1.6.5-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Thu, 10 Aug 2006 22:53:34 +0000 + +xserver-xorg-video-i810 (2:1.6.4-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Wed, 9 Aug 2006 22:37:24 +0000 + +xserver-xorg-video-i810 (2:1.6.3-1) experimental; urgency=low + + * New upstream release + * Add x11proto-xinerama-dev to build-dep + + -- David Nusinow Tue, 8 Aug 2006 22:01:43 +0000 + +xserver-xorg-video-i810 (2:1.6.1-2) experimental; urgency=low + + * Fix for botched upload. Identical to -1, which I built wrong. + + -- David Nusinow Sun, 6 Aug 2006 18:37:45 +0000 + +xserver-xorg-video-i810 (2:1.6.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 version + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Sun, 6 Aug 2006 17:29:12 +0000 + +xserver-xorg-video-i810 (2:1.4.1.3-1) unstable; urgency=low + + * Roll back the version to what was released with 7.0. Stupid ABI + incompatibilities. (closes: #359328) + * Add call to dh_makeshlibs. Reorder dh_installdeb and dh_shlibdeps so that + ldconfig is called during postinst. Thanks Justin Pryzby and Steve + Langasek. (closes: #364012) + + -- David Nusinow Sat, 22 Apr 2006 18:21:51 -0400 + +xserver-xorg-video-i810 (1:1.5.1.0-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:40 -0500 + +xserver-xorg-video-i810 (1:1.5.1.0-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Tue, 21 Mar 2006 22:40:04 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-3) experimental; urgency=low + + * Version build dependency on libxvmc-dev. Thanks John Hughes. + (closes: #358165) + + -- David Nusinow Tue, 21 Mar 2006 20:49:27 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-2) experimental; urgency=low + + * Don't build on sparc. Partial port of + sparc/103_sparc_dont_build_useless_drivers.diff. + + -- David Nusinow Sun, 5 Mar 2006 20:32:01 -0500 + +xserver-xorg-video-i810 (1:1.4.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:37:39 -0500 + +xserver-xorg-driver-i810 (1:1.4.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 19:57:22 +1100 + +xserver-xorg-driver-i810 (1:1.4.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:06:03 +1100 + +xserver-xorg-driver-i810 (1:1.4.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Bump Build-Depends on libdrm-dev to >> 2.0. + + -- Daniel Stone Mon, 12 Dec 2005 13:20:11 +1100 + +xserver-xorg-driver-i810 (1:1.4.1-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, libdrm (>> 1.0.5), + x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:54:24 +1100 + +xserver-xorg-driver-i810 (1:1.4.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:30:52 +1100 + +xserver-xorg-driver-i810 (1:1.4.0.1-1) dapper; urgency=low + + * New upstream version. + + -- Daniel Stone Thu, 20 Oct 2005 13:37:40 +1000 + +xserver-xorg-driver-i810 (1:1.4.0-1) breezy; urgency=low + + * First xserver-xorg-driver-i810 release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 + --- xserver-xorg-video-intel-2.8.0.orig/debian/xserver-xorg-video-intel.install.hurd-i386 +++ xserver-xorg-video-intel-2.8.0/debian/xserver-xorg-video-intel.install.hurd-i386 @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/xserver-xorg/pci/* --- xserver-xorg-video-intel-2.8.0.orig/debian/watch +++ xserver-xorg-video-intel-2.8.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-intel-(.*)\.tar\.gz --- xserver-xorg-video-intel-2.8.0.orig/debian/xserver-xorg-video-intel.install +++ xserver-xorg-video-intel-2.8.0/debian/xserver-xorg-video-intel.install @@ -0,0 +1,3 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* --- xserver-xorg-video-intel-2.8.0.orig/debian/rules +++ xserver-xorg-video-intel-2.8.0/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-driver-i810 package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so +confflags += --disable-static + +configure: + dh_testdir + autoreconf -vfi + +obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure + dh_testdir + test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE) + cd obj-$(DEB_BUILD_GNU_TYPE) && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + +.PHONY: build +build: build-stamp +build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status + dh_testdir + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + >$@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf obj-* + rm -f $$(find -name Makefile.in) + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs + rm -f m4/lt* m4/libtool.m4 + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + install -d $(CURDIR)/debian/tmp/usr/bin + install -m 755 obj-$(DEB_BUILD_GNU_TYPE)/src/reg_dumper/intel_reg_dumper $(CURDIR)/debian/tmp/usr/bin/ + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-s +binary-arch: build install serverabi + dh_testdir + dh_testroot + + dh_installdocs README NEWS + dh_installchangelogs + dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4 + dh_installman + dh_link + dh_strip --dbg-package=xserver-xorg-video-intel-dbg + dh_compress + dh_fixperms + dh_makeshlibs + dh_shlibdeps -- --warnings=6 + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: + # nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xserver-xorg-video-intel-2.8.0.orig/debian/xsfbs/repack.sh +++ xserver-xorg-video-intel-2.8.0/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 --- xserver-xorg-video-intel-2.8.0.orig/debian/xsfbs/xsfbs.sh +++ xserver-xorg-video-intel-2.8.0/debian/xsfbs/xsfbs.sh @@ -0,0 +1,863 @@ +# $Id$ + +# This is the X Strike Force shell library for X Window System package +# maintainer scripts. It serves to define shell functions commonly used by +# such packages, and performs some error checking necessary for proper operation +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# removal tasks. + +# If you are reading this within a Debian package maintainer script (e.g., +# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_whitespace () { + # syntax: reject_whitespace [ operand ] + # + # scan operand (typically a shell variable whose value cannot be trusted) for + # whitespace characters and barf if any are found + if [ -n "$1" ]; then + # does the operand contain any whitespace? + if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + fi +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + + +maplink () { + # returns what symlink should point to; i.e., what the "sane" answer is + # Keep this in sync with the debian/*.links files. + # This is only needed for symlinks to directories. + # + # XXX: Most of these look wrong in the X11R7 world and need to be fixed. + # If we've stopped using this function, fixing it might enable us to re-enable + # it again and catch more errors. + case "$1" in + /etc/X11/xkb/compiled) echo /var/lib/xkb ;; + /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; + /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; + /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; + /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; + /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; + /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; + /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; + /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; + /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; + /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; + /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; + /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; + /usr/bin/X11) echo ../X11R6/bin ;; + /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; + /usr/include/X11) echo ../X11R6/include/X11 ;; + /usr/lib/X11) echo ../X11R6/lib/X11 ;; + *) internal_error "maplink() called with unknown path \"$1\"" ;; + esac +} + +analyze_path () { + # given a supplied set of pathnames, break each one up by directory and do an + # ls -dl on each component, cumulatively; i.e. + # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin + # Thanks to Randolph Chung for this clever hack. + + local f g + + while [ -n "$1" ]; do + reject_whitespace "$1" + g= + message "Analyzing $1:" + for f in $(echo "$1" | tr / \ ); do + if [ -e /$g$f ]; then + ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true + g=$g$f/ + else + message "/$g$f: nonexistent; directory contents of /$g:" + ls -l /$g + break + fi + done + shift + done +} + +find_culprits () { + local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ + msg + + reject_whitespace "$1" + message "Searching for overlapping packages..." + dpkg_info_dir=/var/lib/dpkg/info + if [ -d $dpkg_info_dir ]; then + if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then + possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \ + "(xbase-clients|x11-common|xfs|xlibs)") + if [ -n "$possible_culprits" ]; then + smoking_guns=$(grep -l "$1" $possible_culprits || true) + if [ -n "$smoking_guns" ]; then + bad_packages=$(printf "\\n") + for f in $smoking_guns; do + # too bad you can't nest parameter expansion voodoo + p=${f%*.list} # strip off the trailing ".list" + package=${p##*/} # strip off the directories + bad_packages=$(printf "%s\n%s" "$bad_packages" "$package") + done + msg=$(cat < /dev/null 2>&1; then + message "The readlink command was not found. Please install version" \ + "1.13.1 or later of the debianutils package." + readlink () { + # returns what symlink in $1 actually points to + perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" + } +fi + +check_symlink () { + # syntax: check_symlink symlink + # + # See if specified symlink points where it is supposed to. Return 0 if it + # does, and 1 if it does not. + # + # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). + + local symlink + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "check_symlink() called with wrong number of arguments;" \ + "expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + symlink="$1" + + if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then + return 0 + else + return 1 + fi +} + +check_symlinks_and_warn () { + # syntax: check_symlinks_and_warn symlink ... + # + # For each argument, check for symlink sanity, and warn if it isn't sane. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install". + + local errmsg symlink + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "check_symlinks_and_warn() called with wrong number of" \ + "arguments; expected at least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + while [ -n "$1" ]; do + symlink="$1" + if [ -L "$symlink" ]; then + if ! check_symlink "$symlink"; then + observe "$symlink symbolic link points to wrong location" \ + "$(readlink "$symlink"); removing" + rm "$symlink" + fi + elif [ -e "$symlink" ]; then + errmsg="$symlink exists and is not a symbolic link; this package cannot" + errmsg="$errmsg be installed until this" + if [ -f "$symlink" ]; then + errmsg="$errmsg file" + elif [ -d "$symlink" ]; then + errmsg="$errmsg directory" + else + errmsg="$errmsg thing" + fi + errmsg="$errmsg is removed" + die "$errmsg" + fi + shift + done +} + +check_symlinks_and_bomb () { + # syntax: check_symlinks_and_bomb symlink ... + # + # For each argument, check for symlink sanity, and bomb if it isn't sane. + # + # Call this function from a postinst script. + + local problem symlink + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "check_symlinks_and_bomb() called with wrong number of" + "arguments; expected at least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + while [ -n "$1" ]; do + problem= + symlink="$1" + if [ -L "$symlink" ]; then + if ! check_symlink "$symlink"; then + problem=yes + warn "$symlink symbolic link points to wrong location" \ + "$(readlink "$symlink")" + fi + elif [ -e "$symlink" ]; then + problem=yes + warn "$symlink is not a symbolic link" + else + problem=yes + warn "$symlink symbolic link does not exist" + fi + if [ -n "$problem" ]; then + analyze_path "$symlink" "$(readlink "$symlink")" + find_culprits "$symlink" + die "bad symbolic links on system" + fi + shift + done +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + local dir cmd shortcmd x_font_dir_prefix + + x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for dir in $FONTDIRS; do + if [ -d "$x_font_dir_prefix/$dir" ]; then + for cmd in $UPDATECMDS; do + if which "$cmd" > /dev/null 2>&1; then + shortcmd=${cmd##*/} + observe "running $shortcmd in $dir font directory" + cmd_opts= + if [ "$shortcmd" = "update-fonts-alias" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-dir" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-scale" ]; then + cmd_opts=--x11r7-layout + fi + $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$cmd not found; not updating corresponding $dir font" \ + "directory data" + fi + done + else + warn "$dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + shift + + # does the conffile even exist? + if [ -e "$conffile" ]; then + # calculate its checksum + current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $conffile for removal" + mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_lookup () { + # syntax: remove_conffile_lookup package filename + # + # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal + # if it matches the actual file's md5sum. + # + # Call this function when you would call remove_conffile_prepare but only + # want to check against dpkg's status database instead of known checksums. + + local package conffile old_md5sum + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "remove_conffile_lookup() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + package="$1" + conffile="$2" + + if ! [ -e "$conffile" ]; then + return + fi + old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ + awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" + if [ -n "$old_md5sum" ]; then + remove_conffile_prepare "$conffile" "$old_md5sum" + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $conffile" + rm "$conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- xserver-xorg-video-intel-2.8.0.orig/debian/xsfbs/xsfbs.mk +++ xserver-xorg-video-intel-2.8.0/debian/xsfbs/xsfbs.mk @@ -0,0 +1,293 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc and to use debian/patches +QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the codename of a release in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts + >$@ + +.PHONY: log +stampdir_targets+=log +log: $(STAMP_DIR)/log +$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: $(STAMP_DIR)/log + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if $(QUILT) applied >/dev/null 2>/dev/null; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -rf .pc + rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf imports + dh_clean debian/shlibs.local \ + debian/po/pothead + +# Generate the debconf templates POT file header. +debian/po/pothead: debian/po/pothead.in + sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ + -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ + +# Update POT and PO files. +.PHONY: updatepo +updatepo: debian/po/pothead + debian/scripts/debconf-updatepo --pot-header=pothead --verbose + +# Remove files from the upstream source tree that we don't need, or which have +# licensing problems. It must be run before creating the .orig.tar.gz. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +# Generate the shlibs.local file. +debian/shlibs.local: + cat debian/*.shlibs >$@ + +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: install +ifeq ($(SERVERMINVERS),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars +endif + +# vim:set noet ai sts=8 sw=8 tw=0: