diff options
Diffstat (limited to 'abs/core-testing/xf86-video-intel')
9 files changed, 0 insertions, 641 deletions
diff --git a/abs/core-testing/xf86-video-intel/20_thinkpad_g40_quirk.patch b/abs/core-testing/xf86-video-intel/20_thinkpad_g40_quirk.patch deleted file mode 100644 index c2c72a7..0000000 --- a/abs/core-testing/xf86-video-intel/20_thinkpad_g40_quirk.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nurp xserver-xorg-video-intel-2.3.1-patched/src/i830_quirks.c xserver-xorg-video-intel-2.3.1-working/src/i830_quirks.c ---- xserver-xorg-video-intel-2.3.1-patched/src/i830_quirks.c 2008-06-20 00:05:23.000000000 -0700 -+++ xserver-xorg-video-intel-2.3.1-working/src/i830_quirks.c 2008-06-20 00:20:19.000000000 -0700 -@@ -266,9 +266,13 @@ static i830_quirk i830_quirk_list[] = { - /* HP Compaq 6730s has no TV output */ - { PCI_CHIP_IGD_GM, 0x103c, 0x30e8, quirk_ignore_tv }, - -+ /* Thinkpad G40 needs pipe A force quirk (See LP: #240457) */ -+ { PCI_CHIP_I855_GM, 0x1014, 0x0543, quirk_pipea_force }, - /* Thinkpad R31 needs pipe A force quirk */ - { PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force }, -- /* Dell Latitude D400 needs pipe A force quirk (LP: #228519) */ -+ /* Dell Latitude C400 needs pipe A force quirk (See LP: #216490) */ -+ { PCI_CHIP_I855_GM, 0x1028, 0x00c8, quirk_pipea_force }, -+ /* Dell Latitude D400 needs pipe A force quirk (See LP: #228519) */ - { PCI_CHIP_I855_GM, 0x1028, 0x0139, quirk_pipea_force }, - /* Dell Latitude D500 needs pipe A force quirk */ - { PCI_CHIP_I855_GM, 0x1028, 0x0152, quirk_pipea_force }, diff --git a/abs/core-testing/xf86-video-intel/21_quirk_lenovo.patch b/abs/core-testing/xf86-video-intel/21_quirk_lenovo.patch deleted file mode 100644 index 8479a40..0000000 --- a/abs/core-testing/xf86-video-intel/21_quirk_lenovo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp xserver-xorg-video-intel-2.3.2-1ubuntu2-patched/src/i830_quirks.c xserver-xorg-video-intel-2.3.2-1ubuntu2-working/src/i830_quirks.c ---- xserver-xorg-video-intel-2.3.2-1ubuntu2-patched/src/i830_quirks.c 2008-06-26 20:21:14.000000000 -0700 -+++ xserver-xorg-video-intel-2.3.2-1ubuntu2-working/src/i830_quirks.c 2008-06-26 20:30:23.000000000 -0700 -@@ -242,6 +242,8 @@ static i830_quirk i830_quirk_list[] = { - - /* Lenovo Napa TV (use dmi)*/ - { PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi }, -+ /* Lenovo T60/R60 needs pipe A force quirk (See LP: #243405) */ -+ { PCI_CHIP_I945_GM, 0x17aa, 0x201a, quirk_pipea_force }, - /* Lenovo T61 has no TV output */ - { PCI_CHIP_I965_GM, 0x17aa, 0x20b5, quirk_ignore_tv }, - /* Lenovo 3000 v200 */ diff --git a/abs/core-testing/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch b/abs/core-testing/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch deleted file mode 100644 index d82923f..0000000 --- a/abs/core-testing/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurp xserver-xorg-video-intel-2.4.1-patched/src/i830_quirks.c xserver-xorg-video-intel-2.4.1-working/src/i830_quirks.c ---- xserver-xorg-video-intel-2.4.1-patched/src/i830_quirks.c 2008-09-08 20:12:28.000000000 -0700 -+++ xserver-xorg-video-intel-2.4.1-working/src/i830_quirks.c 2008-09-08 21:02:53.000000000 -0700 -@@ -312,6 +317,9 @@ static i830_quirk i830_quirk_list[] = { - /* Sony vaio VGN-SZ4MN (See LP: #212163) */ - { PCI_CHIP_I830_M, 0x104d, 0x81e6, quirk_pipea_force }, - -+ /* Quanta Gigabyte W251U (See LP: #244242) */ -+ { PCI_CHIP_I945_GM, 0x152d, 0x0755, quirk_pipea_force }, -+ - /* Ordi Enduro UW31 (See LP: #152416) */ - { PCI_CHIP_I945_GM, 0x1584, 0x9900, quirk_ignore_tv }, - diff --git a/abs/core-testing/xf86-video-intel/25_quirk_nc6110.patch b/abs/core-testing/xf86-video-intel/25_quirk_nc6110.patch deleted file mode 100644 index a6db410..0000000 --- a/abs/core-testing/xf86-video-intel/25_quirk_nc6110.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/i830_quirks.c b/src/i830_quirks.c -index 089e458..09b7c53 100644 ---- a/src/i830_quirks.c -+++ b/src/i830_quirks.c -@@ -278,6 +278,8 @@ static i830_quirk i830_quirk_list[] = { - /* Samsung Q45 has no TV output */ - { PCI_CHIP_I965_GM, 0x144d, 0xc510, quirk_ignore_tv }, - -+ /* HP Compaq nx6110 has no TV output */ -+ { PCI_CHIP_I915_GM, 0x103c, 0x099c, quirk_ignore_tv }, - /* HP Compaq 6730s has no TV output */ - { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv }, - diff --git a/abs/core-testing/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch b/abs/core-testing/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch deleted file mode 100644 index d74b809..0000000 --- a/abs/core-testing/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nurp patched/src/bios_reader/bios_reader.c working/src/bios_reader/bios_reader.c ---- patched/src/bios_reader/bios_reader.c 2008-10-16 14:06:07.000000000 -0700 -+++ working/src/bios_reader/bios_reader.c 2008-10-16 14:25:07.000000000 -0700 -@@ -180,6 +180,19 @@ static void dump_lvds_options(void *data - printf("\tPFIT mode: %d\n", options->pfit_mode); - } - -+static void dump_lvds_ptr_data(void *data, unsigned char *base) -+{ -+ struct bdb_lvds_lfp_data_ptrs *ptrs = data; -+ -+ struct lvds_fp_timing *fp_timing = -+ (struct lvds_fp_timing *)(base + ptrs->ptr[panel_type].fp_timing_offset); -+ -+ printf("LVDS timing pointer data:\n"); -+ -+ printf("\tpanel type %02i: %dx%d\n", panel_type, fp_timing->x_res, -+ fp_timing->y_res); -+} -+ - static void dump_lvds_data(void *data, unsigned char *base) - { - struct bdb_lvds_lfp_data *lvds_data = data; -@@ -274,6 +287,8 @@ int main(int argc, char **argv) - dump_general_definitions(find_section(bdb, BDB_GENERAL_DEFINITIONS)); - dump_lvds_options(find_section(bdb, BDB_LVDS_OPTIONS)); - dump_lvds_data(find_section(bdb, BDB_LVDS_LFP_DATA), bdb); -+ dump_lvds_ptr_data(find_section(bdb, BDB_LVDS_LFP_DATA_PTRS), -+ (unsigned char *)bdb); - - return 0; - } -diff -Nurp patched/src/i830_bios.c working/src/i830_bios.c ---- patched/src/i830_bios.c 2008-10-16 14:06:07.000000000 -0700 -+++ working/src/i830_bios.c 2008-10-16 14:27:15.000000000 -0700 -@@ -89,7 +89,8 @@ parse_panel_data(I830Ptr pI830, struct b - { - struct bdb_lvds_options *lvds_options; - struct bdb_lvds_lfp_data *lvds_lfp_data; -- struct bdb_lvds_lfp_data_entry *entry; -+ struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs; -+ int timing_offset; - DisplayModePtr fixed_mode; - unsigned char *timing_ptr; - -@@ -104,12 +105,13 @@ parse_panel_data(I830Ptr pI830, struct b - if (lvds_options->panel_type == 0xff) - return; - -- lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA); -- if (!lvds_lfp_data) -+ lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS); -+ if (!lvds_lfp_data_ptrs) - return; - -- entry = &lvds_lfp_data->data[lvds_options->panel_type]; -- timing_ptr = (unsigned char *)&entry->dvo_timing; -+ timing_offset = -+ lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset; -+ timing_ptr = (unsigned char *)bdb + timing_offset; - - fixed_mode = xnfalloc(sizeof(DisplayModeRec)); - memset(fixed_mode, 0, sizeof(*fixed_mode)); diff --git a/abs/core-testing/xf86-video-intel/27_disable_fbc_on_965.patch b/abs/core-testing/xf86-video-intel/27_disable_fbc_on_965.patch deleted file mode 100644 index cc881b9..0000000 --- a/abs/core-testing/xf86-video-intel/27_disable_fbc_on_965.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/i830.h b/src/i830.h -index 5b78236..89f19d2 100644 ---- a/src/i830.h -+++ b/src/i830.h -@@ -950,6 +950,13 @@ static inline int i830_fb_compression_supported(I830Ptr pI830) - */ - if (!pI830->tiling || (IS_I965G(pI830) && pI830->accel <= ACCEL_XAA)) - return FALSE; -+ /* We have not gotten FBC to work consistently on 965GM. Our best -+ * working theory right now is that FBC simply isn't reliable on -+ * that device. See this bug report for more details: -+ * https://bugs.freedesktop.org/show_bug.cgi?id=16257 -+ */ -+ if (IS_I965GM(pI830)) -+ return FALSE; - return TRUE; - } - diff --git a/abs/core-testing/xf86-video-intel/LICENSE b/abs/core-testing/xf86-video-intel/LICENSE deleted file mode 100644 index a4c83af..0000000 --- a/abs/core-testing/xf86-video-intel/LICENSE +++ /dev/null @@ -1,440 +0,0 @@ -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 <alanh@fairlite.demon.co.uk> / <alanh@tungstengraphics.com> -* Bob Paauwe <bob.j.paauwe@intel.com> -* Dave Airlie <airlied@linux.ie> -* Dave Mueller <dave.mueller@gmx.ch> -* David Dawes <dawes@xfree86.org> -* Eric Anholt <eric@anholt.net> -* Jens Owen <jens@tungstengraphics.com> -* Jesse Barnes <jbarnes@virtuousgeek.org> -* Jonathan Bian <jonathan.bian@intel.com> -* Keith Packard <keithp@keithp.com> -* Keith Whitwell <keith@tungstengraphics.com> -* Kevin E. Martin <kevin@precisioninsight.com> / <martin@valinux.com> -* Kristian Høgsberg <krh@redhat.com> -* Luc Verhaegen -* Matt Sottek <matthew.j.sottek@intel.com> -* Rickard E. (Rik) Faith <faith@valinux.com> -* Thomas Hellstrom -* Wang Zhenyu <zhenyu.z.wang@intel.com> -* Xiang Haihao <haihao.xiang@intel.com> - -==== - -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 <airlied@linux.ie> -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 diff --git a/abs/core-testing/xf86-video-intel/PKGBUILD b/abs/core-testing/xf86-video-intel/PKGBUILD deleted file mode 100644 index f417cdd..0000000 --- a/abs/core-testing/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 85324 2010-07-12 17:03:09Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-intel -pkgver=2.12.0 -pkgrel=1 -pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('intel-dri>=7.8' 'libpciaccess>=0.10.9' 'libdrm>=2.4.20' 'libxvmc>=1.0.5' 'libxcb>=1.5' 'xcb-util>=0.3.6') -makedepends=('pkgconfig' 'xorg-server>=1.8.0' 'xf86driproto>=2.1.0' 'glproto>=1.4.11' 'mesa>=7.8' 'xineramaproto>=1.2' 'inputproto') -conflicts=('xorg-server<1.8.0' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') -groups=('xorg-video-drivers') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - intel-2.11-no-pageflipping.patch - LICENSE) -md5sums=('8314def847dcdc4f2970e2d193054f96' - 'dfc9f59fe048b412726c87fe3d45f4f5' - 'b924480931774dec14515e270db4924d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/intel-2.11-no-pageflipping.patch" || return 1 - ./configure --prefix=/usr --enable-dri || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/xf86-video-intel/intel-2.11-no-pageflipping.patch b/abs/core-testing/xf86-video-intel/intel-2.11-no-pageflipping.patch deleted file mode 100644 index 39500e2..0000000 --- a/abs/core-testing/xf86-video-intel/intel-2.11-no-pageflipping.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip xf86-video-intel-2.11.0/src/drmmode_display.c ---- xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip 2010-05-03 15:30:19.000000000 -0400 -+++ xf86-video-intel-2.11.0/src/drmmode_display.c 2010-05-03 15:30:59.000000000 -0400 -@@ -1504,10 +1504,15 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn, - gp.value = &has_flipping; - (void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp, - sizeof(gp)); -+ -+ xf86DrvMsg(scrn->scrnIndex, X_INFO, -+ "Pageflipping %s in kernel, %s disabled in X\n", -+ has_flipping ? "enabled" : "disabled", -+ has_flipping ? "but" : "and"); - if (has_flipping) { - xf86DrvMsg(scrn->scrnIndex, X_INFO, -- "Kernel page flipping support detected, enabling\n"); -- intel->use_pageflipping = TRUE; -+ "Don't panic: https://bugzilla.redhat.com/588421\n"); -+ intel->use_pageflipping = FALSE; - drmmode->flip_count = 0; - drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION; - drmmode->event_context.vblank_handler = drmmode_vblank_handler; -diff -up xf86-video-intel-2.11.0/src/i830_dri.c.no-flip xf86-video-intel-2.11.0/src/i830_dri.c ---- xf86-video-intel-2.11.0/src/i830_dri.c.no-flip 2010-03-29 14:23:02.000000000 -0400 -+++ xf86-video-intel-2.11.0/src/i830_dri.c 2010-05-03 15:30:19.000000000 -0400 -@@ -1013,7 +1013,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen - - info.CopyRegion = I830DRI2CopyRegion; - #if DRI2INFOREC_VERSION >= 4 -- if (intel->use_pageflipping) { -+ if (intel->use_pageflipping || 1) { - info.version = 4; - info.ScheduleSwap = I830DRI2ScheduleSwap; - info.GetMSC = I830DRI2GetMSC; |