--- xserver-xorg-video-intel-2.20.9.orig/NEWS +++ xserver-xorg-video-intel-2.20.9/NEWS @@ -8,7 +8,8 @@ restore sanity, and when the screen came back it was stuck on the image seen before it went to sleep. (Note that there are also some related kernel bugs, but this update should prevent the most conspicious of the -freezes.) +freezes.) Many thanks to Timo Aaltonen for his efforts in tracking down +the issue. In other news: @@ -23,7 +24,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=54978 * Fix use of an uninitialised GC when drawing glyphs to a depth=1 pixmap - + Release 2.20.8 (2012-09-16) =========================== --- xserver-xorg-video-intel-2.20.9.orig/ChangeLog +++ xserver-xorg-video-intel-2.20.9/ChangeLog @@ -1,3 +1,11 @@ +commit a192f8cbc238d84e058b01b7682abe7ef09d3508 +Author: Chris Wilson +Date: Sat Sep 29 10:51:00 2012 +0100 + + 2.20.9 release + + Signed-off-by: Chris Wilson + commit 16860d448f11ba405050bd1ff02dc63a4b26280c Author: Chris Wilson Date: Sat Sep 29 10:40:51 2012 +0100 --- xserver-xorg-video-intel-2.20.9.orig/RELEASING +++ xserver-xorg-video-intel-2.20.9/RELEASING @@ -0,0 +1,52 @@ +The process for releasing a new tarball is as follows: + +1. Make sure you have the latest build requirements installed: + + git://git.freedesktop.org/git/util/macros + git://git.freedesktop.org/git/util/modular + +2. Add relevant release notes to the NEWS files + + Skim the git log since the last release, and add notes in a + similar style to previous releases. + + For major releases list added features and known limitations. + + For minor releases indicate which bugs were fixed and which + are still present. + + +3. Update your module version (usually found in configure.ac) + + $ vi configure.ac # bump version + $ git commit + $ git push origin # make sure you're on the release branch + +4. Verify your module builds + + $ make distcheck + +5. Tag the release + + $ git tag -m "Intel release" + +6. Run the release script (this should push the tag) + + $ /util/modular/release.sh driver + +7. Edit and send the generated release message. + + At the very least, add the release notes from the NEWS file. + + The message is generated as xf86-video-intel-.announce + + For snapshots and release candidates, mail to: + + intel-gfx@lists.freedesktop.org + + For major releases also send to: + + xorg@lists.freedesktop.org + xorg-announce@lists.freedesktop.org + +8. Throw a release party, you're done! :) --- xserver-xorg-video-intel-2.20.9.orig/autogen.sh +++ xserver-xorg-video-intel-2.20.9/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-intel-2.20.9.orig/debian/copyright +++ xserver-xorg-video-intel-2.20.9/debian/copyright @@ -0,0 +1,403 @@ +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 + +* 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). + */ +- + +==== + +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/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.20.9.orig/debian/xserver-xorg-video-intel.lintian-overrides +++ xserver-xorg-video-intel-2.20.9/debian/xserver-xorg-video-intel.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libI810XvMC1 libIntelXvMC1 --- xserver-xorg-video-intel-2.20.9.orig/debian/xserver-xorg-video-intel.docs +++ xserver-xorg-video-intel-2.20.9/debian/xserver-xorg-video-intel.docs @@ -0,0 +1,2 @@ +NEWS +README --- xserver-xorg-video-intel-2.20.9.orig/debian/compat +++ xserver-xorg-video-intel-2.20.9/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-intel-2.20.9.orig/debian/rules +++ xserver-xorg-video-intel-2.20.9/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +SOURCE_NAME := $(shell dpkg-parsechangelog | awk -F': ' '/^Source: / {print $$2}') +SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print $$2}') +BUILDER := $(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {print $$2}') + +# Enable SNA, pass builderstring: +override_dh_auto_configure: + dh_auto_configure -- --enable-sna --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, libxvmc symlinks, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + rm -f debian/tmp/usr/lib/libI810XvMC.so + rm -f debian/tmp/usr/lib/libIntelXvMC.so + dh_install --fail-missing + +# Debug package: +override_dh_strip: + dh_strip --dbg-package=xserver-xorg-video-intel-dbg + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ + +# Snapshots should only target experimental: +generate-snapshot: UPSTREAM_VERSION = $(shell echo $(SOURCE_VERSION) | sed 's/^[0-9]*://;s/-.*$$//') +generate-snapshot: UPSTREAM_BRANCH ?= upstream-experimental +generate-snapshot: ORIG = ../$(SOURCE_NAME)_$(UPSTREAM_VERSION).orig.tar.gz +generate-snapshot: + if [ -f $(ORIG) ]; then \ + echo "$(ORIG) already exists, stopping"; exit 1; \ + fi + git archive --format=tar --prefix=$(SOURCE_NAME)-$(UPSTREAM_VERSION)/ $(UPSTREAM_BRANCH) \ + | gzip -9 > $(ORIG) + pristine-tar commit $(ORIG) $(UPSTREAM_BRANCH) --- xserver-xorg-video-intel-2.20.9.orig/debian/control +++ xserver-xorg-video-intel-2.20.9/debian/control @@ -0,0 +1,77 @@ +Source: xserver-xorg-video-intel +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: Drew Parsons , Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, + xserver-xorg-dev (>= 2:1.11.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.23), + 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, + libx11-xcb-dev, + libxcb-util0-dev, + libxcb-dri2-0-dev, +# end xvmc + libudev-dev [linux-any], + dpkg-dev (>= 1.14.17), + quilt (>= 0.46-7~), + xutils-dev (>= 1:7.5+4), +Standards-Version: 3.9.3 +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 i386 +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +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 i386 +Depends: + xserver-xorg-video-intel (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Recommends: + intel-gpu-tools, +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.20.9.orig/debian/README.source +++ xserver-xorg-video-intel-2.20.9/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-video-intel-2.20.9.orig/debian/xserver-xorg-video-intel.links +++ xserver-xorg-video-intel-2.20.9/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.20.9.orig/debian/xserver-xorg-video-intel.udev +++ xserver-xorg-video-intel-2.20.9/debian/xserver-xorg-video-intel.udev @@ -0,0 +1,10 @@ +# do not edit this file, it will be overwritten on update + +# Jesse Barnes on ubuntu-devel@lists.ubuntu.com: +# You'll get three events, one when the error is detected, one before the +# reset and one after. Each has a different environment variable set; the +# initial error has ERROR=1, the pre-reset event has RESET=1 and the +# post-reset event has ERROR=0. + +# Disable freeze hook. +SUBSYSTEM=="drm", ACTION=="change", ENV{ERROR}=="1", RUN+="/usr/share/apport/apport-gpu-error-intel.py" --- xserver-xorg-video-intel-2.20.9.orig/debian/xserver-xorg-video-intel.install +++ xserver-xorg-video-intel-2.20.9/debian/xserver-xorg-video-intel.install @@ -0,0 +1,4 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* +usr/share/man --- xserver-xorg-video-intel-2.20.9.orig/debian/watch +++ xserver-xorg-video-intel-2.20.9/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-intel +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-intel-(.*)\.tar\.gz --- xserver-xorg-video-intel-2.20.9.orig/debian/changelog +++ xserver-xorg-video-intel-2.20.9/debian/changelog @@ -0,0 +1,1210 @@ +xserver-xorg-video-intel (2:2.20.9-0ubuntu2) quantal; urgency=low + + [ Maarten Lankhorst ] + * Add fix-glamor-check.diff to fix a valgrind error, upstream. + + -- Timo Aaltonen Mon, 01 Oct 2012 15:39:54 +0300 + +xserver-xorg-video-intel (2:2.20.9-0ubuntu1) quantal; urgency=low + + * Merge from unrelease debian git. + - fixes racy UXA pageflip code (LP: #966744) + * Drop dont-run-intel-mode-fini-before-preinit.diff, upstream. + + -- Timo Aaltonen Sat, 29 Sep 2012 16:45:35 +0300 + +xserver-xorg-video-intel (2:2.20.9-1) UNRELEASED; urgency=low + + [ Timo Aaltonen ] + * New upstream bugfix release. + - Fixes a long-standing bug in UXA pageflip code that was the + source of many GPU hangs. + + [ Maarten Lankhorst ] + * Add patch to fix a valgrind error. + - fix-glamor-check.diff + + -- Timo Aaltonen Wed, 05 Sep 2012 17:07:07 +0300 + +xserver-xorg-video-intel (2:2.20.8-0ubuntu2) quantal; urgency=low + + * dont-run-intel-mode-fini-before-preinit.diff, don't crash if + Screen is deleted before the driver has fully initialized. + (LP: #1053836) + + -- Timo Aaltonen Wed, 26 Sep 2012 15:14:07 +0300 + +xserver-xorg-video-intel (2:2.20.8-0ubuntu1) quantal; urgency=low + + * Merge from unreleased debian git. + + -- Timo Aaltonen Tue, 18 Sep 2012 12:39:11 +0300 + +xserver-xorg-video-intel (2:2.20.7-0ubuntu1) quantal; urgency=low + + * Merge from unreleased debian git. + + -- Timo Aaltonen Wed, 12 Sep 2012 07:43:59 +0300 + +xserver-xorg-video-intel (2:2.20.6-0ubuntu1) quantal; urgency=low + + * Merge from unreleased debian git. + + -- Timo Aaltonen Wed, 05 Sep 2012 17:27:17 +0300 + +xserver-xorg-video-intel (2:2.20.5-1) experimental; urgency=low + + * New upstream release. + - Remove patch to support passing a builder string, merged upstream + 0001-Fix-build-failure-when-passing-with-builderstring.patch + + -- Julien Danjou Sun, 26 Aug 2012 14:25:55 +0200 + +xserver-xorg-video-intel (2:2.20.2-1ubuntu1) quantal-proposed; urgency=low + + * New upstream release (2.20.2) + * Drop upstreamed 101_copy-fb.patch + * Merge from Debian. Remaining Ubuntu changes: + - debian/xserver-xorg-video-intel.install: + + Don't install unnecessary i915-kms.conf; KMS is kernel default. + - debian/xserver-xorg-video-intel.udev + + Add apport hook, triggered on udev GPU error event + + -- Maarten Lankhorst Mon, 30 Jul 2012 10:10:37 +0200 + +xserver-xorg-video-intel (2:2.20.2-1) experimental; urgency=low + + [ Maarten Lankhorst ] + * New upstream release: + - First official release with sna + * Update to 2.20.1 point release: + - A bug affecting gen4 handling of trapezoids was fixed, and CPU + overhead reduced. + https://bugs.freedesktop.org/show_bug.cgi?id=52158 + - A fix for a bug causing corruption of a DRI2 unredirected client + window that was resized whilst under a compositor. + - Support for snoopable buffers on non-LLC architectures, coming to + a future kernel. The aim to accelerate transfers between the CPU + and the GPU, in particular to dramatically improve readback + performance, and to further minimise clflushes. + - Improvement to the composite performance on GT2 SandyBridge and + IvyBridge devices, in particular the render copy is significantly + improved. + - Improved handling for when acceleration is disabled, including + permitting DRI2 to remain supported even if the X server believes + the GPU wedged. + - Shadow support was dropped from UXA as it was neither complete nor + correct, use SNA instead. + + [ Julien Danjou ] + * New upstream release (2.20.2) + + -- Julien Danjou Sun, 29 Jul 2012 00:06:11 +0200 + +xserver-xorg-video-intel (2:2.18.0-1+exp1) experimental; urgency=low + + * Enable SNA again, in experimental. + + -- Cyril Brulebois Fri, 24 Feb 2012 14:19:00 +0100 + +xserver-xorg-video-intel (2:2.18.0-1) unstable; urgency=low + + * New upstream release. + * No SNA for unstable, it's too fast of a moving target for now. + * Since we're building for unstable, let's go back to the previous + xorg-server build-dep. + + -- Cyril Brulebois Fri, 24 Feb 2012 14:16:47 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120204-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 24ece4a87e. + + -- Cyril Brulebois Sat, 04 Feb 2012 09:20:13 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120115-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 5df7147b09. + + -- Cyril Brulebois Mon, 16 Jan 2012 00:52:23 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120104-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 4119e68fb1. + * Implement a generate-snapshot rule to ease packaging snapshots. + + -- Cyril Brulebois Wed, 04 Jan 2012 22:19:19 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120101-2) experimental; urgency=low + + * Build against Xserver 1.12 RC1 (Closes: #653914). + + -- Cyril Brulebois Sun, 01 Jan 2012 14:58:27 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120101-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 770a953ff0. + * Enable SNA support, as suggested by upstream. It should be usable now + and regression reports are welcome. + * Add patch to support passing a builder string: + - 0001-Fix-build-failure-when-passing-with-builderstring.patch + * Pass a builder string, as done in the server. + + -- Cyril Brulebois Sun, 01 Jan 2012 06:34:09 +0100 + +xserver-xorg-video-intel (2:2.17.0-1) unstable; urgency=low + + [ Timo Aaltonen ] + * New upstream release. (Closes: #635953) + + -- Cyril Brulebois Sat, 19 Nov 2011 12:46:57 +0100 + +xserver-xorg-video-intel (2:2.16.0-1) unstable; urgency=low + + * New upstream release. + + -- Cyril Brulebois Sun, 28 Aug 2011 13:15:24 +0200 + +xserver-xorg-video-intel (2:2.15.901-1) experimental; urgency=low + + * Re-enable XvMC. + * New upstream snapshot. + * Build against xserver 1.10.99.x. + + -- Julien Cristau Mon, 01 Aug 2011 01:37:49 +0200 + +xserver-xorg-video-intel (2:2.15.0-3) unstable; urgency=high + + * Temporarily disable xvmc to sidestep the xcb-util mess and move to + testing. + + -- Julien Cristau Sat, 14 May 2011 19:00:38 +0200 + +xserver-xorg-video-intel (2:2.15.0-2) unstable; urgency=low + + * xcb-util was split up in 0.3.8 and libxcb-aux has been merged + into libxcb-util, thus update Build-Depends accordingly. + * Add ${misc:Depends} to xserver-xorg-video-intel-dbg Depends. + + -- Arnaud Fontaine Fri, 06 May 2011 23:53:39 +0900 + +xserver-xorg-video-intel (2:2.15.0-1) unstable; urgency=low + + * New upstream release. + * Merge from upstream master up to c9fb69cb25 to fix crashes with i965 + and kwin in particular, thanks to Julian Andres Klode and Modestas + Vainius for their reports in Debian and upstream (Closes: #622653): + - NEWS: typo. + - intel: Beware the unsigned promotion when checking for batch overflows + - i965/video: We need 150 dwords of space for video state emission + + -- Cyril Brulebois Tue, 19 Apr 2011 03:37:23 +0200 + +xserver-xorg-video-intel (2:2.14.902-1) unstable; urgency=low + + * New upstream snapshot (2.15 rc2). + * Apparently, using libXvMC means adding the name of the library (like + libI810XvMC.so.1 or libIntelXvMC.so.1) to the libXvMC configuration + file (/etc/X11/XvMCConfig). Accordingly, remove extraneous symlinks: + - /usr/lib/libI810XvMC.so + - /usr/lib/libIntelXvMC.so + * Override lintian warning about the libXvMC shared objects. + + -- Cyril Brulebois Sun, 10 Apr 2011 23:30:19 +0200 + +xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low + + * Cherry-pick from upstream: + - uxa: Fallback if the temporary is too large + * This fixes a null pointer dereference with some rendering operations + involving large pictures (Closes: #613830). Thanks, Enrico! + + -- Cyril Brulebois Fri, 18 Feb 2011 12:44:23 +0100 + +xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + - Specify usr/share/man in .install, remove .manpages accordingly. + - Specify NEWS and README in .docs file. + * Get rid of maintainer scripts, since they were only used to handle + switching between versions with or without KMS. Starting with squeeze, + KMS is mandatory, so stop worrying about that. + * Remove xsfbs accordingly. + * Remove leftovers: + - NEWS file is outdated, UMS is no longer available, and that's + covered by README.Debian + - The .install.hurd-i386 file is no longer relevant, this package is + now Linux-only. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces. + * Wrap Depends/Provides/Recommends. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:47:04 +0100 + +xserver-xorg-video-intel (2:2.14.0-2) experimental; urgency=low + + * Cherry-pick from upstream to fix many rendering issues + (https://bugs.freedesktop.org/show_bug.cgi?id=33650): + - uxa: Undo damage translation before appending + + -- Cyril Brulebois Fri, 04 Feb 2011 15:37:47 +0100 + +xserver-xorg-video-intel (2:2.14.0-1) experimental; urgency=low + + * New upstream release. + + -- Cyril Brulebois Sat, 08 Jan 2011 18:10:23 +0100 + +xserver-xorg-video-intel (2:2.13.903-1) experimental; urgency=low + + [ Robert Hooker ] + * Add libudev-dev to the build deps for monitor hotplug detection + events. + + [ Cyril Brulebois ] + * New upstream release candidate. + * Bump libdrm-dev build-dep. + * Drop libdrm-from-sid-is-ok.diff accordingly. + + -- Cyril Brulebois Tue, 04 Jan 2011 15:43:17 +0100 + +xserver-xorg-video-intel (2:2.13.901-2) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Tue, 09 Nov 2010 15:53:43 +0100 + +xserver-xorg-video-intel (2:2.13.901-1) experimental; urgency=low + + * New upstream release candidate. + * Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked + changes to allow this release candidate to build and run. + * Drop patch: i8xx-shadow.diff + + -- Cyril Brulebois Tue, 09 Nov 2010 14:54:21 +0100 + +xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low + + [ Cyril Brulebois ] + * Merge from experimental. + * Lower build-dep on libdrm-dev from 2.4.22 to 2.4.21-1~squeeze3 since + the latter contains the needed bits, making it possible to build + within unstable. + * Add patch to make configure.ac happy: libdrm-from-sid-is-ok.diff + * Add README.Debian documenting the need for a kernel driver to handle + modesetting. + * Drop shadow-no-dri2.diff, obsoleted by upstream's 537e73f3. + + [ Julien Cristau ] + * Update i8xx-shadow.diff. + + -- Cyril Brulebois Sun, 07 Nov 2010 19:51:56 +0100 + +xserver-xorg-video-intel (2:2.13.0-1) experimental; urgency=low + + [ Sven Joachim ] + * New upstream release. + * Bump libdrm build-dependency to 2.4.22. + + [ Cyril Brulebois ] + * Bump xutils-dev build-dependency to 1:7.5+4 (needed for xorg macros + 1.8). + * Picked from unstable to avoid introducing back binaries on non-Linux + architectures: UMS is gone, this means Linux-only. + * Add myself to Uploaders. + + -- Cyril Brulebois Sat, 02 Oct 2010 09:51:48 +0200 + +xserver-xorg-video-intel (2:2.12.0+shadow-2) unstable; urgency=low + + * UMS is gone, this means Linux-only (closes: 597845). + + -- Julien Cristau Thu, 23 Sep 2010 16:40:26 +0200 + +xserver-xorg-video-intel (2:2.12.0+shadow-1) unstable; urgency=low + + * Revert the come-back of UMS. Update to upstream HEAD instead. + Closes: #594623, #594338. + * Dropping UMS means its bugs are irrelevant, so this closes: #570766, + #594815. + * Bump libdrm build-dep for DRM_MODE_CONNECTOR_eDP. + * Don't enable DRI2 if the shadow option is on. + * Use shadowfb on i8xx by default. Hopefully closes: #570988, #572105, + #576848, #592586, #593293. + * New upstream doesn't assert() when running sm (closes: #593199). + + -- Julien Cristau Mon, 20 Sep 2010 19:44:14 +0200 + +xserver-xorg-video-intel (2:2.12.0+legacy1-1) unstable; urgency=low + + * Merge from people.freedesktop.org/~ickle/xf86-video-intel:legacy. + This reintroduces UMS and EXA for legacy chips, while allowing us to get + the fixes and new hw support from 2.12. + + -- Julien Cristau Tue, 24 Aug 2010 21:33:56 +0200 + +xserver-xorg-video-intel (2:2.12.0-1) experimental; urgency=low + + * New upstream release. + + Fix Xv distortion, closes: #581705. + * Bump libdrm build-dependency to 2.4.21. + + -- Brice Goglin Sat, 26 Jun 2010 00:26:59 +0200 + +xserver-xorg-video-intel (2:2.11.0-1) experimental; urgency=low + + * New upstream release. + + -- Brice Goglin Tue, 30 Mar 2010 07:04:52 +0200 + +xserver-xorg-video-intel (2:2.10.903-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Tue, 23 Mar 2010 07:39:23 +0100 + +xserver-xorg-video-intel (2:2.10.902-1) experimental; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Brice Goglin ] + * New upstream release candidate, closes: #567829. + + User mode-setting is not supported anymore. + * Bump xutils-dev build dependency for new util-macros. + * Bump libdrm build dependency to 2.4.18-3 for latest i915 drm headers. + * Build depend on libx11-xcb-dev, libxcb-aux0-dev and libxcb-dri2-0-dev + for XVMC. + * Recommends intel-gpu-tools since intel_reg_dumper is not provided + by xserver-xorg-video-intel-dbg anymore. + + -- Brice Goglin Tue, 16 Mar 2010 20:53:53 +0100 + +xserver-xorg-video-intel (2:2.9.1-4) unstable; urgency=medium + + * Update xsfbs, use new ${xviddriver:Depends} subsvar. + + -- Julien Cristau Fri, 14 May 2010 17:44:44 +0200 + +xserver-xorg-video-intel (2:2.9.1-3) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * Add a NEWS.Debian entry about KMS. + * Backport KMS video overlay from upstream 2.10 (closes: #565328). + * Bump libdrm-dev build-dep for the above. + + [ Brice Goglin ] + * Bump Standards-Version to 3.8.4, no changes. + + -- Brice Goglin Sun, 21 Mar 2010 10:25:27 +0100 + +xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 07 Jan 2010 20:53:45 +0000 + +xserver-xorg-video-intel (2:2.9.1-1+exp1) experimental; urgency=low + + [ Julien Cristau ] + * Enable kernel mode setting by default on linux (closes: #555906). + + [ Brice Goglin ] + * Build against xserver 1.7. + + -- Brice Goglin Wed, 02 Dec 2009 15:50:17 +0100 + +xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium + + * New upstream bugfix release (closes: #508005). + + reverts change from 2.9.0 that broke DVI detection for some people + (closes: #548045) + + -- Julien Cristau Wed, 25 Nov 2009 16:32:29 +0100 + +xserver-xorg-video-intel (2:2.9.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Tue, 29 Sep 2009 07:16:54 +0200 + +xserver-xorg-video-intel (2:2.8.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Fix crash on server regen, closes: #543326. + + -- Brice Goglin Wed, 23 Sep 2009 01:03:49 +0200 + +xserver-xorg-video-intel (2:2.8.1-2) unstable; urgency=low + + * Re-enable render accel on 8xx. The major problem turned out to be related + to agp chipset flushing (see #541307), so hopefully this should work now. + * Add missing xsfclean dependency to debian/rules clean. + * Bump Standards-Version to 3.8.3 (no changes). + * Mention intel_reg_dumper in the debug package's long description. + + -- Julien Cristau Thu, 17 Sep 2009 20:55:47 +0200 + +xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low + + * New upstream release. + + Calculate the DVO relative offset in LVDS data entry to get the + DVO timing, closes: #538148. + + Fix sampler indexes on i965 planar video, closes: #513427. + + -- Brice Goglin Wed, 26 Aug 2009 09:50:15 +0200 + +xserver-xorg-video-intel (2:2.8.0-2) unstable; urgency=low + + [ Julien Cristau ] + * Disable UXA render accel on i8xx chips for now. It currently causes + hangs, and doesn't seem likely to get fixed quickly upstream + (closes: #527349). + * Reenable patch system and bring back quilt build-dep. + + -- Brice Goglin Fri, 31 Jul 2009 22:44:13 +0200 + +xserver-xorg-video-intel (2:2.8.0-1) unstable; urgency=low + + * New upstream release. + + Fixes crash at startup if KMS is not used, closes: #537052. + + -- Brice Goglin Tue, 21 Jul 2009 16:23:39 +0200 + +xserver-xorg-video-intel (2:2.7.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Fix crash in drm_intel_gem_bo_unreference_locked, closes: #535772. + + -- Brice Goglin Tue, 14 Jul 2009 00:17:00 +0200 + +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-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-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-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.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-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-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-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-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-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-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-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-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-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-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-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-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-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.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-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-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-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.20.9.orig/debian/README.Debian +++ xserver-xorg-video-intel-2.20.9/debian/README.Debian @@ -0,0 +1,13 @@ +xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low + + * Starting from 2.10, the Intel X driver depends on a kernel driver for + mode setting (that's called KMS). The corresponding kernel option is + CONFIG_DRM_I915, and is enabled in Debian kernels. + * To enable KMS, either of those should be sufficient: + + /etc/modprobe.d/i915-kms.conf should contain: + options i915 modeset=1 + + CONFIG_DRM_I915_KMS=y should be set in the kernel config. + * If you have issues with this driver, the "vesa" or "fbdev" drivers + may be useful fallbacks. + + -- Cyril Brulebois Sun, 07 Nov 2010 19:51:56 +0100 --- xserver-xorg-video-intel-2.20.9.orig/debian/patches/fix-glamor-check.diff +++ xserver-xorg-video-intel-2.20.9/debian/patches/fix-glamor-check.diff @@ -0,0 +1,29 @@ +commit 51202798862c79ad417936cfe2d1847b1da4ab87 +Author: Chris Wilson +Date: Mon Oct 1 13:06:42 2012 +0100 + + uxa: Remove USE_GLAMOR check from unrealize glyph caches + + In an interesting twist during teardown, the driver info structure is + freed long before the caches. However, the glyph cache teardown was + checking to see if glamor was enabled to see if it could skip the + teardown. In fact, since we won't have created the glyph caches in that + circumstances it was safe any way. + + Reported-by: Maarten Lankhorst + Signed-off-by: Chris Wilson + +diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c +index 527942a..f5d4d08 100644 +--- a/uxa/uxa-glyphs.c ++++ b/uxa/uxa-glyphs.c +@@ -112,9 +112,6 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen) + uxa_screen_t *uxa_screen = uxa_get_screen(pScreen); + int i; + +- if (uxa_screen->info->flags & UXA_USE_GLAMOR) +- return; +- + if (!uxa_screen->glyph_cache_initialized) + return; + --- xserver-xorg-video-intel-2.20.9.orig/debian/patches/series +++ xserver-xorg-video-intel-2.20.9/debian/patches/series @@ -0,0 +1 @@ +fix-glamor-check.diff --- xserver-xorg-video-intel-2.20.9.orig/src/scripts/fix.5c +++ xserver-xorg-video-intel-2.20.9/src/scripts/fix.5c @@ -0,0 +1,14 @@ +/* + * Convert CSC fix point values to floats + */ + +real fixval (int fix) +{ + int exp = fix >> 9; + int mant = fix & ((1 << 9) - 1); + real ret; + if (exp == 0x7) + return 1.0; + ret = (2 ** -exp) * mant / (1 << 9); + return ret; +} --- xserver-xorg-video-intel-2.20.9.orig/src/scripts/clock-graph.5c +++ xserver-xorg-video-intel-2.20.9/src/scripts/clock-graph.5c @@ -0,0 +1,174 @@ +autoload Cairo; +import Cairo; +library "examples/sort.5c"; +import Sort; + +int width = 1000, height = 200; +int min_vco = 1400000000; +int max_vco = 2800000000; +int min = 0xffffffff; +int max = 0; + +int max_clocks = 2000; +int[4][max_clocks] clocks; +int[4][max_clocks] vcos; +int[4] clock_count = {0...}; + +int[4] p2vals = {5,10,7,14}; + +cairo_t cr = Cairo::new(width, height); + +void calc_p2(int p2i) +{ + int p2 = p2vals[p2i]; + int min_p, max_p; + + clocks[p2i] = (int [max_clocks]){0...}; + + if (p2 == 7 || p2 == 14) { + /* LVDS */ + min_p = 7; + max_p = 98; + } else { + /* SDVO/DAC */ + min_p = 5; + max_p = 80; + } + + for (int m1 = 10; m1 <= 22; m1++) { + for (int m2 = 5; m2 <= 9; m2++) { + for (int n = 1; n <= 5; n++) { + for (int p1 = 1; p1 <= 8; p1++) { + int ref = 96000000; + int m = 5 * (m1 + 2) + (m2 + 2); + int p = p1 * p2; + int vco = floor(ref * m / (n + 2)); + int clock = floor(vco / p); + + if (p < min_p || p > max_p) + continue; + if (m < 70 || m > 120) + continue; + if (m2 > m1) + continue; /* won't happen */ + if (vco < min_vco || vco > max_vco) + continue; + +/* + printf("clock: %d (%d,%d), %d, " + "(%d,%d)\n", + floor(clock / 1000), + m1, m2, n, p1, p2); +*/ + + clocks[p2i][clock_count[p2i]] = clock; + vcos[p2i][clock_count[p2i]] = vco; + clock_count[p2i]++; + } + } + } + } +} + +bool sort_p2(poly a, poly b) +{ + return a > b; +} + +int min_rate = 25000 * 1000; +int max_rate = 200000 * 1000; + +real scale_x(real clock) +{ + int min_x = 75, max_x = width - 50; + + real frac = (clock - min_rate) / (max_rate - min_rate); + + return min_x + frac * (max_x - min_x); +} + +for (p2i = 0; p2i < dim(p2vals); p2i++) { + int p2 = p2vals[p2i]; + calc_p2(p2i); + real row_y1 = (p2i + 1) / (dim(p2vals) + 1) * height; + real row_y2 = p2i / (dim(p2vals) + 1) * height; + + /*qsort(&p2vals[p2i], sort_p2);*/ + + switch (p2) { + case 5: + set_source_rgb(cr, 1,0,0); + break; + case 10: + set_source_rgb(cr, 0,1,0); + break; + case 7: + set_source_rgb(cr, 0,0,1); + break; + case 14: + set_source_rgb(cr, 0,0,0); + break; + } + + /* draw the line for the clock */ + for (int i = 0; i < clock_count[p2i]; i++) { + int clock = clocks[p2i][i]; + real xpos; + + if (clock < min_rate || clock > max_rate) + continue; + + xpos = scale_x(clock); + move_to(cr, xpos, row_y1); + line_to(cr, xpos, row_y2); + stroke(cr); + } + + set_source_rgb(cr, 1, 1, 1); + /* add a mark for the vco value of the clocks at each location */ + for (int i = 0; i < clock_count[p2i]; i++) { + int clock = clocks[p2i][i]; + int vco = vcos[p2i][i]; + real mark_center; + + if (clock < min_rate || clock > max_rate) + continue; + + real xpos = scale_x(clock); + real vcofrac = (vco - min_vco) / (max_vco - min_vco); + real mark_height = (row_y1 + vcofrac * (row_y2 - row_y1)); + + move_to(cr, xpos, mark_height - 1); + line_to(cr, xpos, mark_height + 1); + stroke(cr); + } + + set_source_rgb(cr, 0, 0, 0); + string p2label = sprintf("p2 = %d", p2); + move_to(cr, 5, (p2i + .5) / (dim(p2vals) + 1) * height + 4); + show_text(cr, p2label); +} + +void label_clock(real clock) { + real center_x = scale_x(clock); + string label = sprintf("%d", floor((clock + 500) / 1000000)); + text_extents_t e = text_extents(cr, label); + real left_x = center_x - e.x_advance / 2; + save(cr); + move_to(cr, left_x, height - 20); + show_text(cr, label); + restore(cr); +} + +label_clock(min_rate); +label_clock(max_rate); +label_clock(140 * 1000 * 1000); +label_clock(115 * 1000 * 1000); +label_clock(100 * 1000 * 1000); +label_clock(82 * 1000 * 1000); + +string xlabel = "Clock in Mhz"; +text_extents_t e = text_extents(cr, xlabel); +move_to(cr, width / 2 - e.x_advance / 2, height - 5); +show_text(cr, xlabel); +sleep(10); --- xserver-xorg-video-intel-2.20.9.orig/src/scripts/clock.5c +++ xserver-xorg-video-intel-2.20.9/src/scripts/clock.5c @@ -0,0 +1,40 @@ +int p2 = 14; +int min_p, max_p; + +if (p2 == 7 || p2 == 14) { + /* LVDS */ + min_p = 7; + max_p = 98; +} else { + /* SDVO/DAC */ + min_p = 5; + max_p = 80; +} + +for (int m1 = 10; m1 <= 22; m1++) { + for (int m2 = 5; m2 <= 9; m2++) { + for (int n = 1; n <= 6; n++) { + for (int p1 = 1; p1 <= 8; p1++) { + int ref = 96000000; + int m = 5 * (m1 + 2) + (m2 + 2); + int p = p1 * p2; + int vco = floor(ref * m / (n + 2)); + int clock = floor(vco / p); + + if (p < min_p || p > max_p) + continue; + if (m < 70 || m > 120) + continue; + if (m2 > m1) + continue; /* won't happen */ + if (vco < 1400000000 || + vco > 2800000000) + continue; + + printf("clock: %d (%d,%d),%d,(%d,%d)\n", + floor(clock / 1000), + m1, m2, n, p1, p2); + } + } + } +} --- xserver-xorg-video-intel-2.20.9.orig/src/scripts/tv.5c +++ xserver-xorg-video-intel-2.20.9/src/scripts/tv.5c @@ -0,0 +1,128 @@ +/* + * tv.5c + * + * Compute tv encoder subcarrier dda constants + * + * The TV encoder subcarrier must be set precisely to the + * required frequency or the cumulative phase errors will be + * quite visible in the output. To accomplish this, the TV encoder + * has a complex circuit that takes a fixed clock, generated by the PLL + * and generates a precise subcarrier clock from that using the following + * formula: + * + * subcarrier = pixel_clock * (S1 + (S2 + (S3/Z3)) / Z2) / 4096 + * + * Careful selection of the constants will provide the necessarily + * precise clock. + * + * In the code below, S1 is represented by dda1, S2/Z2 by dda2 and S3/Z3 + * by dda3. + */ + +typedef struct { + int step; + int size; +} term_t; + +/* + * Find the approximation closest, but no larger than 'v', where + * 0 <= v < 1, and the result denominator must be less than 30000. + */ +term_t approx (rational v) +{ + rational best_dist = 1.0; + term_t best; + + for (int den = 20000; den < 30000; den++) + { + int num = floor (v * den); + term_t approx = { step = num, size = den }; + rational dist = v - approx.step/approx.size; + if (dist >= 0 && dist < best_dist) + { + best_dist = dist; + best = approx; + } + } + return best; +} + +typedef struct { + rational subcarrier; + rational pixel; + rational result; + term_t dda1; + term_t dda2; + term_t dda3; +} dda; + +/* + * Compute the dda constants for the given pixel clock and + * desired subcarrier frequency + */ + +dda find_dda (rational pixel, rational subcarrier) +{ + dda d; + + d.subcarrier = subcarrier; + d.pixel = pixel; + + rational dda1 = subcarrier / pixel * 4096; + d.dda1 = (term_t) { step = floor (dda1), size = 4096 }; + + rational dda2 = dda1 - d.dda1.step; + d.dda2 = approx (dda2); + + rational dda3 = dda2 * d.dda2.size - d.dda2.step; + d.dda3 = approx (dda3); + + /* Compute the resulting pixel clock to compare */ + d.result = d.pixel * (d.dda1.step + + (d.dda2.step + d.dda3.step/d.dda3.size) / + d.dda2.size) / d.dda1.size; + return d; +} + +/* + * Print out the computed constants + */ +void print_dda (dda d) +{ + printf ("\t/* desired %9.7f actual %9.7f clock %g */\n", + d.subcarrier, d.result, d.pixel); + printf ("\t.dda1_inc\t= %6d,\n", d.dda1.step); + printf ("\t.dda2_inc\t= %6d,\t.dda2_size\t= %6d,\n", + d.dda2.step, d.dda2.step != 0 ? d.dda2.size : 0); + printf ("\t.dda3_inc\t= %6d,\t.dda3_size\t= %6d,\n", + d.dda3.step, d.dda3.step != 0 ? d.dda3.size : 0); +} + +/* + * These are all of the required subcarrier frequencies + */ +rational[] subcarriers = { + /* these are the values we use; for some reason, this generates + * a more stable image (at least for NTSC) */ + 3.580, 4.434, 3.582, 3.576, 4.430, + + /* these are the values pulled out of the various specs */ + 3.579545, 4.433618, 3.582056, 3.575611, 4.433618 +}; + +/* + * We fix the pixel clock to a value which the hardware can + * generate exactly + */ +rational pixel = 107.520; + +void main () +{ + for (int i = 0; i < dim(subcarriers); i++) + { + dda d = find_dda (pixel, subcarriers[i]); + print_dda (d); + } +} + +main (); --- xserver-xorg-video-intel-2.20.9.orig/src/sna/brw/brw_eu_debug.c +++ xserver-xorg-video-intel-2.20.9/src/sna/brw/brw_eu_debug.c @@ -0,0 +1,95 @@ +/* + Copyright (C) Intel Corp. 2006. All Rights Reserved. + Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to + develop this 3D driver. + + 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 (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 NONINFRINGEMENT. + IN NO EVENT SHALL THE COPYRIGHT OWNER(S) 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. + + **********************************************************************/ + /* + * Authors: + * Keith Whitwell + */ + + +#include "main/mtypes.h" +#include "main/imports.h" +#include "brw_eu.h" + +void brw_print_reg( struct brw_reg hwreg ) +{ + static const char *file[] = { + "arf", + "grf", + "msg", + "imm" + }; + + static const char *type[] = { + "ud", + "d", + "uw", + "w", + "ub", + "vf", + "hf", + "f" + }; + + printf("%s%s", + hwreg.abs ? "abs/" : "", + hwreg.negate ? "-" : ""); + + if (hwreg.file == BRW_GENERAL_REGISTER_FILE && + hwreg.nr % 2 == 0 && + hwreg.subnr == 0 && + hwreg.vstride == BRW_VERTICAL_STRIDE_8 && + hwreg.width == BRW_WIDTH_8 && + hwreg.hstride == BRW_HORIZONTAL_STRIDE_1 && + hwreg.type == BRW_REGISTER_TYPE_F) { + /* vector register */ + printf("vec%d", hwreg.nr); + } + else if (hwreg.file == BRW_GENERAL_REGISTER_FILE && + hwreg.vstride == BRW_VERTICAL_STRIDE_0 && + hwreg.width == BRW_WIDTH_1 && + hwreg.hstride == BRW_HORIZONTAL_STRIDE_0 && + hwreg.type == BRW_REGISTER_TYPE_F) { + /* "scalar" register */ + printf("scl%d.%d", hwreg.nr, hwreg.subnr / 4); + } + else if (hwreg.file == BRW_IMMEDIATE_VALUE) { + printf("imm %f", hwreg.dw1.f); + } + else { + printf("%s%d.%d<%d;%d,%d>:%s", + file[hwreg.file], + hwreg.nr, + hwreg.subnr / type_sz(hwreg.type), + hwreg.vstride ? (1<<(hwreg.vstride-1)) : 0, + 1< + */ + + +#include "brw_context.h" +#include "brw_defines.h" +#include "brw_eu.h" + + +void brw_math_invert( struct brw_compile *p, + struct brw_reg dst, + struct brw_reg src) +{ + brw_math( p, + dst, + BRW_MATH_FUNCTION_INV, + BRW_MATH_SATURATE_NONE, + 0, + src, + BRW_MATH_PRECISION_FULL, + BRW_MATH_DATA_VECTOR ); +} + + + +void brw_copy4(struct brw_compile *p, + struct brw_reg dst, + struct brw_reg src, + GLuint count) +{ + GLuint i; + + dst = vec4(dst); + src = vec4(src); + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, byte_offset(dst, delta), byte_offset(src, delta)); + brw_MOV(p, byte_offset(dst, delta+16), byte_offset(src, delta+16)); + } +} + + +void brw_copy8(struct brw_compile *p, + struct brw_reg dst, + struct brw_reg src, + GLuint count) +{ + GLuint i; + + dst = vec8(dst); + src = vec8(src); + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, byte_offset(dst, delta), byte_offset(src, delta)); + } +} + + +void brw_copy_indirect_to_indirect(struct brw_compile *p, + struct brw_indirect dst_ptr, + struct brw_indirect src_ptr, + GLuint count) +{ + GLuint i; + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, deref_4f(dst_ptr, delta), deref_4f(src_ptr, delta)); + brw_MOV(p, deref_4f(dst_ptr, delta+16), deref_4f(src_ptr, delta+16)); + } +} + + +void brw_copy_from_indirect(struct brw_compile *p, + struct brw_reg dst, + struct brw_indirect ptr, + GLuint count) +{ + GLuint i; + + dst = vec4(dst); + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, byte_offset(dst, delta), deref_4f(ptr, delta)); + brw_MOV(p, byte_offset(dst, delta+16), deref_4f(ptr, delta+16)); + } +} + + + +