xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog | 1104 +++
Makefile.am | 7
NEWS | 55
configure.ac | 137
debian/changelog | 69
debian/control | 4
debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch | 60
debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch | 51
debian/patches/Link-the-driver-against-pixman.patch | 38
debian/patches/fix-preinit-cleanup-paths.patch | 94
debian/patches/series | 9
debian/patches/sna-fall-back-to-proc-cpuinfo.patch | 85
debian/patches/sna-fix-typo-in-computing-box.patch | 77
debian/patches/sna-note-that-borderClip-region.patch | 90
debian/rules | 18
src/Makefile.am | 76
src/brw_defines.h | 881 --
src/brw_structs.h | 1723 -----
src/common.h | 73
src/i830_3d.c | 225
src/i830_reg.h | 805 --
src/i830_render.c | 876 --
src/i915_3d.c | 110
src/i915_3d.h | 619 --
src/i915_pciids.h | 211
src/i915_reg.h | 844 --
src/i915_render.c | 1010 ---
src/i915_video.c | 486 -
src/i965_3d.c | 443 -
src/i965_reg.h | 476 -
src/i965_render.c | 2962 ----------
src/i965_video.c | 1939 ------
src/intel.h | 663 --
src/intel_batchbuffer.c | 314 -
src/intel_batchbuffer.h | 226
src/intel_display.c | 2124 -------
src/intel_dri.c | 1639 -----
src/intel_driver.c | 1310 ----
src/intel_driver.h | 235
src/intel_glamor.c | 254
src/intel_glamor.h | 67
src/intel_hwmc.c | 260
src/intel_hwmc.h | 75
src/intel_memory.c | 286
src/intel_module.c | 358 -
src/intel_uxa.c | 1420 ----
src/intel_video.c | 1776 -----
src/intel_video.h | 95
src/legacy/i810/Makefile.am | 4
src/legacy/i810/i810_dri.c | 2
src/legacy/i810/xvmc/Makefile.am | 4
src/sna/Makefile.am | 6
src/sna/blt.c | 10
src/sna/brw/Makefile.am | 1
src/sna/compiler.h | 4
src/sna/fb/Makefile.am | 2
src/sna/gen4_render.c | 2
src/sna/gen5_render.c | 36
src/sna/gen6_render.c | 6
src/sna/gen7_render.c | 94
src/sna/kgem.c | 82
src/sna/kgem.h | 20
src/sna/sna.h | 16
src/sna/sna_accel.c | 501 +
src/sna/sna_blt.c | 41
src/sna/sna_composite.c | 144
src/sna/sna_cpu.c | 20
src/sna/sna_cpuid.h | 86
src/sna/sna_damage.c | 8
src/sna/sna_display.c | 57
src/sna/sna_dri.c | 572 -
src/sna/sna_driver.c | 51
src/sna/sna_glyphs.c | 11
src/sna/sna_io.c | 22
src/sna/sna_render.c | 9
src/sna/sna_render.h | 9
src/sna/sna_render_inline.h | 2
src/sna/sna_trapezoids.c | 18
src/sna/sna_video_hwmc.c | 4
src/sna/sna_video_overlay.c | 32
src/sna/sna_video_sprite.c | 10
src/sna/sna_video_textured.c | 16
src/uxa/Makefile.am | 88
src/uxa/brw_defines.h | 881 ++
src/uxa/brw_structs.h | 1723 +++++
src/uxa/common.h | 71
src/uxa/i830_3d.c | 225
src/uxa/i830_reg.h | 805 ++
src/uxa/i830_render.c | 876 ++
src/uxa/i915_3d.c | 110
src/uxa/i915_3d.h | 619 ++
src/uxa/i915_reg.h | 844 ++
src/uxa/i915_render.c | 1010 +++
src/uxa/i915_video.c | 486 +
src/uxa/i965_3d.c | 443 +
src/uxa/i965_reg.h | 476 +
src/uxa/i965_render.c | 2962 ++++++++++
src/uxa/i965_video.c | 1939 ++++++
src/uxa/intel.h | 688 ++
src/uxa/intel_batchbuffer.c | 314 +
src/uxa/intel_batchbuffer.h | 226
src/uxa/intel_display.c | 2124 +++++++
src/uxa/intel_dri.c | 1639 +++++
src/uxa/intel_driver.c | 1311 ++++
src/uxa/intel_glamor.c | 254
src/uxa/intel_glamor.h | 67
src/uxa/intel_hwmc.c | 260
src/uxa/intel_memory.c | 286
src/uxa/intel_uxa.c | 1420 ++++
src/uxa/intel_video.c | 1776 +++++
src/uxa/intel_video.h | 95
src/uxa/uxa-accel.c | 1296 ++++
src/uxa/uxa-glamor.h | 65
src/uxa/uxa-glyphs.c | 1053 +++
src/uxa/uxa-priv.h | 440 +
src/uxa/uxa-render.c | 2074 +++++++
src/uxa/uxa-unaccel.c | 454 +
src/uxa/uxa.c | 590 +
src/uxa/uxa.h | 599 ++
src/uxa/uxa_module.h | 6
src/xvmc/Makefile.am | 24
src/xvmc/i915_program.h | 274
src/xvmc/i915_structs.h | 926 ---
src/xvmc/i915_xvmc.c | 1225 ----
src/xvmc/i915_xvmc.h | 83
src/xvmc/i965_xvmc.c | 882 --
src/xvmc/intel_batchbuffer.c | 139
src/xvmc/intel_batchbuffer.h | 57
src/xvmc/intel_xvmc.c | 1075 ---
src/xvmc/intel_xvmc.h | 263
src/xvmc/intel_xvmc_dump.c | 158
src/xvmc/shader/Makefile.am | 1
src/xvmc/shader/mc/Makefile.am | 121
src/xvmc/shader/mc/addidct.g4i | 152
src/xvmc/shader/mc/addidct_igd.g4i | 117
src/xvmc/shader/mc/block_clear.g4i | 140
src/xvmc/shader/mc/dual_prime.g4a | 223
src/xvmc/shader/mc/dual_prime.g4b | 2486 --------
src/xvmc/shader/mc/dual_prime.g4b.gen5 | 2486 --------
src/xvmc/shader/mc/dual_prime_igd.g4a | 223
src/xvmc/shader/mc/dual_prime_igd.g4b | 1234 ----
src/xvmc/shader/mc/dual_prime_igd.g4b.gen5 | 1234 ----
src/xvmc/shader/mc/field_backward.g4a | 124
src/xvmc/shader/mc/field_backward.g4b | 1341 ----
src/xvmc/shader/mc/field_backward.g4b.gen5 | 1341 ----
src/xvmc/shader/mc/field_backward_igd.g4a | 86
src/xvmc/shader/mc/field_backward_igd.g4b | 62
src/xvmc/shader/mc/field_backward_igd.g4b.gen5 | 62
src/xvmc/shader/mc/field_f_b.g4a | 223
src/xvmc/shader/mc/field_f_b.g4b | 2486 --------
src/xvmc/shader/mc/field_f_b.g4b.gen5 | 2486 --------
src/xvmc/shader/mc/field_f_b_igd.g4a | 159
src/xvmc/shader/mc/field_f_b_igd.g4b | 121
src/xvmc/shader/mc/field_f_b_igd.g4b.gen5 | 121
src/xvmc/shader/mc/field_forward.g4a | 121
src/xvmc/shader/mc/field_forward.g4b | 1340 ----
src/xvmc/shader/mc/field_forward.g4b.gen5 | 1340 ----
src/xvmc/shader/mc/field_forward_igd.g4a | 86
src/xvmc/shader/mc/field_forward_igd.g4b | 62
src/xvmc/shader/mc/field_forward_igd.g4b.gen5 | 62
src/xvmc/shader/mc/frame_backward.g4a | 69
src/xvmc/shader/mc/frame_backward.g4b | 716 --
src/xvmc/shader/mc/frame_backward.g4b.gen5 | 716 --
src/xvmc/shader/mc/frame_backward_igd.g4a | 50
src/xvmc/shader/mc/frame_backward_igd.g4b | 15
src/xvmc/shader/mc/frame_backward_igd.g4b.gen5 | 15
src/xvmc/shader/mc/frame_f_b.g4a | 131
src/xvmc/shader/mc/frame_f_b.g4b | 1257 ----
src/xvmc/shader/mc/frame_f_b.g4b.gen5 | 1257 ----
src/xvmc/shader/mc/frame_f_b_igd.g4a | 96
src/xvmc/shader/mc/frame_f_b_igd.g4b | 51
src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5 | 51
src/xvmc/shader/mc/frame_forward.g4a | 65
src/xvmc/shader/mc/frame_forward.g4b | 715 --
src/xvmc/shader/mc/frame_forward.g4b.gen5 | 715 --
src/xvmc/shader/mc/frame_forward_igd.g4a | 30
src/xvmc/shader/mc/frame_forward_igd.g4b | 15
src/xvmc/shader/mc/frame_forward_igd.g4b.gen5 | 15
src/xvmc/shader/mc/ipicture.g4a | 166
src/xvmc/shader/mc/ipicture.g4b | 125
src/xvmc/shader/mc/ipicture.g4b.gen5 | 125
src/xvmc/shader/mc/ipicture_igd.g4a | 105
src/xvmc/shader/mc/ipicture_igd.g4b | 75
src/xvmc/shader/mc/ipicture_igd.g4b.gen5 | 75
src/xvmc/shader/mc/lib_igd.g4a | 133
src/xvmc/shader/mc/lib_igd.g4b | 558 -
src/xvmc/shader/mc/lib_igd.g4b.gen5 | 558 -
src/xvmc/shader/mc/motion_field_uv.g4i | 46
src/xvmc/shader/mc/motion_field_uv_igd.g4i | 46
src/xvmc/shader/mc/motion_field_y.g4i | 45
src/xvmc/shader/mc/motion_field_y_igd.g4i | 45
src/xvmc/shader/mc/motion_frame_uv.g4i | 29
src/xvmc/shader/mc/motion_frame_uv_igd.g4i | 30
src/xvmc/shader/mc/motion_frame_y.g4i | 57
src/xvmc/shader/mc/motion_frame_y_igd.g4i | 58
src/xvmc/shader/mc/null.g4a | 57
src/xvmc/shader/mc/null.g4b | 17
src/xvmc/shader/mc/null.g4b.gen5 | 17
src/xvmc/shader/mc/read_field_x0y0_uv.g4i | 74
src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i | 30
src/xvmc/shader/mc/read_field_x0y0_y.g4i | 83
src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i | 35
src/xvmc/shader/mc/read_field_x0y1_uv.g4i | 78
src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i | 42
src/xvmc/shader/mc/read_field_x0y1_y.g4i | 86
src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i | 42
src/xvmc/shader/mc/read_field_x1y0_uv.g4i | 75
src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i | 33
src/xvmc/shader/mc/read_field_x1y0_y.g4i | 83
src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i | 35
src/xvmc/shader/mc/read_field_x1y1_uv.g4i | 172
src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i | 66
src/xvmc/shader/mc/read_field_x1y1_y.g4i | 166
src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i | 64
src/xvmc/shader/mc/read_frame_x0y0_uv.g4i | 73
src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i | 28
src/xvmc/shader/mc/read_frame_x0y0_y.g4i | 109
src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i | 35
src/xvmc/shader/mc/read_frame_x0y1_uv.g4i | 79
src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i | 44
src/xvmc/shader/mc/read_frame_x0y1_y.g4i | 113
src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i | 49
src/xvmc/shader/mc/read_frame_x1y0_uv.g4i | 75
src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i | 41
src/xvmc/shader/mc/read_frame_x1y0_y.g4i | 110
src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i | 43
src/xvmc/shader/mc/read_frame_x1y1_uv.g4i | 159
src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i | 71
src/xvmc/shader/mc/read_frame_x1y1_y.g4i | 264
src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i | 92
src/xvmc/shader/vld/Makefile.am | 74
src/xvmc/shader/vld/addidct.g4i | 152
src/xvmc/shader/vld/do_iq_intra.g4i | 64
src/xvmc/shader/vld/do_iq_non_intra.g4i | 59
src/xvmc/shader/vld/field_backward.g4a | 126
src/xvmc/shader/vld/field_backward.g4b | 553 -
src/xvmc/shader/vld/field_backward.g4b.gen5 | 553 -
src/xvmc/shader/vld/field_f_b.g4a | 213
src/xvmc/shader/vld/field_f_b.g4b | 1007 ---
src/xvmc/shader/vld/field_f_b.g4b.gen5 | 1007 ---
src/xvmc/shader/vld/field_forward.g4a | 130
src/xvmc/shader/vld/field_forward.g4b | 555 -
src/xvmc/shader/vld/field_forward.g4b.gen5 | 555 -
src/xvmc/shader/vld/frame_backward.g4a | 61
src/xvmc/shader/vld/frame_backward.g4b | 369 -
src/xvmc/shader/vld/frame_backward.g4b.gen5 | 369 -
src/xvmc/shader/vld/frame_f_b.g4a | 120
src/xvmc/shader/vld/frame_f_b.g4b | 675 --
src/xvmc/shader/vld/frame_f_b.g4b.gen5 | 675 --
src/xvmc/shader/vld/frame_forward.g4a | 61
src/xvmc/shader/vld/frame_forward.g4b | 369 -
src/xvmc/shader/vld/frame_forward.g4b.gen5 | 369 -
src/xvmc/shader/vld/idct.g4i | 147
src/xvmc/shader/vld/ipicture.g4a | 209
src/xvmc/shader/vld/ipicture.g4b | 313 -
src/xvmc/shader/vld/ipicture.g4b.gen5 | 313 -
src/xvmc/shader/vld/iq_intra.g4i | 131
src/xvmc/shader/vld/iq_non_intra.g4i | 150
src/xvmc/shader/vld/lib.g4a | 190
src/xvmc/shader/vld/lib.g4b | 307 -
src/xvmc/shader/vld/lib.g4b.gen5 | 307 -
src/xvmc/shader/vld/motion_field_uv.g4i | 46
src/xvmc/shader/vld/motion_field_y.g4i | 45
src/xvmc/shader/vld/motion_frame_uv.g4i | 45
src/xvmc/shader/vld/motion_frame_y.g4i | 57
src/xvmc/shader/vld/read_field_x0y0_uv.g4i | 50
src/xvmc/shader/vld/read_field_x0y0_y.g4i | 57
src/xvmc/shader/vld/read_field_x0y1_uv.g4i | 28
src/xvmc/shader/vld/read_field_x0y1_y.g4i | 60
src/xvmc/shader/vld/read_field_x1y0_uv.g4i | 24
src/xvmc/shader/vld/read_field_x1y0_y.g4i | 57
src/xvmc/shader/vld/read_field_x1y1_uv.g4i | 53
src/xvmc/shader/vld/read_field_x1y1_y.g4i | 87
src/xvmc/shader/vld/read_frame_x0y0_uv.g4i | 49
src/xvmc/shader/vld/read_frame_x0y0_y.g4i | 58
src/xvmc/shader/vld/read_frame_x0y1_uv.g4i | 56
src/xvmc/shader/vld/read_frame_x0y1_y.g4i | 61
src/xvmc/shader/vld/read_frame_x1y0_uv.g4i | 42
src/xvmc/shader/vld/read_frame_x1y0_y.g4i | 58
src/xvmc/shader/vld/read_frame_x1y1_uv.g4i | 74
src/xvmc/shader/vld/read_frame_x1y1_y.g4i | 112
src/xvmc/xvmc_vld.c | 1225 ----
test/dri2.c | 3
uxa/Makefile.am | 23
uxa/uxa-accel.c | 1296 ----
uxa/uxa-glamor.h | 65
uxa/uxa-glyphs.c | 1053 ---
uxa/uxa-priv.h | 440 -
uxa/uxa-render.c | 2074 -------
uxa/uxa-unaccel.c | 454 -
uxa/uxa.c | 590 -
uxa/uxa.h | 599 --
xvmc/Makefile.am | 32
xvmc/brw_defines.h | 881 ++
xvmc/brw_structs.h | 1723 +++++
xvmc/i830_reg.h | 805 ++
xvmc/i915_program.h | 274
xvmc/i915_reg.h | 844 ++
xvmc/i915_structs.h | 926 +++
xvmc/i915_xvmc.c | 1225 ++++
xvmc/i915_xvmc.h | 82
xvmc/i965_reg.h | 476 +
xvmc/i965_xvmc.c | 880 ++
xvmc/intel_batchbuffer.c | 139
xvmc/intel_batchbuffer.h | 57
xvmc/intel_xvmc.c | 1075 +++
xvmc/intel_xvmc.h | 75
xvmc/intel_xvmc_dump.c | 158
xvmc/intel_xvmc_private.h | 264
xvmc/shader/Makefile.am | 1
xvmc/shader/mc/Makefile.am | 121
xvmc/shader/mc/addidct.g4i | 152
xvmc/shader/mc/addidct_igd.g4i | 117
xvmc/shader/mc/block_clear.g4i | 140
xvmc/shader/mc/dual_prime.g4a | 223
xvmc/shader/mc/dual_prime.g4b | 2486 ++++++++
xvmc/shader/mc/dual_prime.g4b.gen5 | 2486 ++++++++
xvmc/shader/mc/dual_prime_igd.g4a | 223
xvmc/shader/mc/dual_prime_igd.g4b | 1234 ++++
xvmc/shader/mc/dual_prime_igd.g4b.gen5 | 1234 ++++
xvmc/shader/mc/field_backward.g4a | 124
xvmc/shader/mc/field_backward.g4b | 1341 ++++
xvmc/shader/mc/field_backward.g4b.gen5 | 1341 ++++
xvmc/shader/mc/field_backward_igd.g4a | 86
xvmc/shader/mc/field_backward_igd.g4b | 62
xvmc/shader/mc/field_backward_igd.g4b.gen5 | 62
xvmc/shader/mc/field_f_b.g4a | 223
xvmc/shader/mc/field_f_b.g4b | 2486 ++++++++
xvmc/shader/mc/field_f_b.g4b.gen5 | 2486 ++++++++
xvmc/shader/mc/field_f_b_igd.g4a | 159
xvmc/shader/mc/field_f_b_igd.g4b | 121
xvmc/shader/mc/field_f_b_igd.g4b.gen5 | 121
xvmc/shader/mc/field_forward.g4a | 121
xvmc/shader/mc/field_forward.g4b | 1340 ++++
xvmc/shader/mc/field_forward.g4b.gen5 | 1340 ++++
xvmc/shader/mc/field_forward_igd.g4a | 86
xvmc/shader/mc/field_forward_igd.g4b | 62
xvmc/shader/mc/field_forward_igd.g4b.gen5 | 62
xvmc/shader/mc/frame_backward.g4a | 69
xvmc/shader/mc/frame_backward.g4b | 716 ++
xvmc/shader/mc/frame_backward.g4b.gen5 | 716 ++
xvmc/shader/mc/frame_backward_igd.g4a | 50
xvmc/shader/mc/frame_backward_igd.g4b | 15
xvmc/shader/mc/frame_backward_igd.g4b.gen5 | 15
xvmc/shader/mc/frame_f_b.g4a | 131
xvmc/shader/mc/frame_f_b.g4b | 1257 ++++
xvmc/shader/mc/frame_f_b.g4b.gen5 | 1257 ++++
xvmc/shader/mc/frame_f_b_igd.g4a | 96
xvmc/shader/mc/frame_f_b_igd.g4b | 51
xvmc/shader/mc/frame_f_b_igd.g4b.gen5 | 51
xvmc/shader/mc/frame_forward.g4a | 65
xvmc/shader/mc/frame_forward.g4b | 715 ++
xvmc/shader/mc/frame_forward.g4b.gen5 | 715 ++
xvmc/shader/mc/frame_forward_igd.g4a | 30
xvmc/shader/mc/frame_forward_igd.g4b | 15
xvmc/shader/mc/frame_forward_igd.g4b.gen5 | 15
xvmc/shader/mc/ipicture.g4a | 166
xvmc/shader/mc/ipicture.g4b | 125
xvmc/shader/mc/ipicture.g4b.gen5 | 125
xvmc/shader/mc/ipicture_igd.g4a | 105
xvmc/shader/mc/ipicture_igd.g4b | 75
xvmc/shader/mc/ipicture_igd.g4b.gen5 | 75
xvmc/shader/mc/lib_igd.g4a | 133
xvmc/shader/mc/lib_igd.g4b | 558 +
xvmc/shader/mc/lib_igd.g4b.gen5 | 558 +
xvmc/shader/mc/motion_field_uv.g4i | 46
xvmc/shader/mc/motion_field_uv_igd.g4i | 46
xvmc/shader/mc/motion_field_y.g4i | 45
xvmc/shader/mc/motion_field_y_igd.g4i | 45
xvmc/shader/mc/motion_frame_uv.g4i | 29
xvmc/shader/mc/motion_frame_uv_igd.g4i | 30
xvmc/shader/mc/motion_frame_y.g4i | 57
xvmc/shader/mc/motion_frame_y_igd.g4i | 58
xvmc/shader/mc/null.g4a | 57
xvmc/shader/mc/null.g4b | 17
xvmc/shader/mc/null.g4b.gen5 | 17
xvmc/shader/mc/read_field_x0y0_uv.g4i | 74
xvmc/shader/mc/read_field_x0y0_uv_igd.g4i | 30
xvmc/shader/mc/read_field_x0y0_y.g4i | 83
xvmc/shader/mc/read_field_x0y0_y_igd.g4i | 35
xvmc/shader/mc/read_field_x0y1_uv.g4i | 78
xvmc/shader/mc/read_field_x0y1_uv_igd.g4i | 42
xvmc/shader/mc/read_field_x0y1_y.g4i | 86
xvmc/shader/mc/read_field_x0y1_y_igd.g4i | 42
xvmc/shader/mc/read_field_x1y0_uv.g4i | 75
xvmc/shader/mc/read_field_x1y0_uv_igd.g4i | 33
xvmc/shader/mc/read_field_x1y0_y.g4i | 83
xvmc/shader/mc/read_field_x1y0_y_igd.g4i | 35
xvmc/shader/mc/read_field_x1y1_uv.g4i | 172
xvmc/shader/mc/read_field_x1y1_uv_igd.g4i | 66
xvmc/shader/mc/read_field_x1y1_y.g4i | 166
xvmc/shader/mc/read_field_x1y1_y_igd.g4i | 64
xvmc/shader/mc/read_frame_x0y0_uv.g4i | 73
xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i | 28
xvmc/shader/mc/read_frame_x0y0_y.g4i | 109
xvmc/shader/mc/read_frame_x0y0_y_igd.g4i | 35
xvmc/shader/mc/read_frame_x0y1_uv.g4i | 79
xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i | 44
xvmc/shader/mc/read_frame_x0y1_y.g4i | 113
xvmc/shader/mc/read_frame_x0y1_y_igd.g4i | 49
xvmc/shader/mc/read_frame_x1y0_uv.g4i | 75
xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i | 41
xvmc/shader/mc/read_frame_x1y0_y.g4i | 110
xvmc/shader/mc/read_frame_x1y0_y_igd.g4i | 43
xvmc/shader/mc/read_frame_x1y1_uv.g4i | 159
xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i | 71
xvmc/shader/mc/read_frame_x1y1_y.g4i | 264
xvmc/shader/mc/read_frame_x1y1_y_igd.g4i | 92
xvmc/shader/vld/Makefile.am | 74
xvmc/shader/vld/addidct.g4i | 152
xvmc/shader/vld/do_iq_intra.g4i | 64
xvmc/shader/vld/do_iq_non_intra.g4i | 59
xvmc/shader/vld/field_backward.g4a | 126
xvmc/shader/vld/field_backward.g4b | 553 +
xvmc/shader/vld/field_backward.g4b.gen5 | 553 +
xvmc/shader/vld/field_f_b.g4a | 213
xvmc/shader/vld/field_f_b.g4b | 1007 +++
xvmc/shader/vld/field_f_b.g4b.gen5 | 1007 +++
xvmc/shader/vld/field_forward.g4a | 130
xvmc/shader/vld/field_forward.g4b | 555 +
xvmc/shader/vld/field_forward.g4b.gen5 | 555 +
xvmc/shader/vld/frame_backward.g4a | 61
xvmc/shader/vld/frame_backward.g4b | 369 +
xvmc/shader/vld/frame_backward.g4b.gen5 | 369 +
xvmc/shader/vld/frame_f_b.g4a | 120
xvmc/shader/vld/frame_f_b.g4b | 675 ++
xvmc/shader/vld/frame_f_b.g4b.gen5 | 675 ++
xvmc/shader/vld/frame_forward.g4a | 61
xvmc/shader/vld/frame_forward.g4b | 369 +
xvmc/shader/vld/frame_forward.g4b.gen5 | 369 +
xvmc/shader/vld/idct.g4i | 147
xvmc/shader/vld/ipicture.g4a | 209
xvmc/shader/vld/ipicture.g4b | 313 +
xvmc/shader/vld/ipicture.g4b.gen5 | 313 +
xvmc/shader/vld/iq_intra.g4i | 131
xvmc/shader/vld/iq_non_intra.g4i | 150
xvmc/shader/vld/lib.g4a | 190
xvmc/shader/vld/lib.g4b | 307 +
xvmc/shader/vld/lib.g4b.gen5 | 307 +
xvmc/shader/vld/motion_field_uv.g4i | 46
xvmc/shader/vld/motion_field_y.g4i | 45
xvmc/shader/vld/motion_frame_uv.g4i | 45
xvmc/shader/vld/motion_frame_y.g4i | 57
xvmc/shader/vld/read_field_x0y0_uv.g4i | 50
xvmc/shader/vld/read_field_x0y0_y.g4i | 57
xvmc/shader/vld/read_field_x0y1_uv.g4i | 28
xvmc/shader/vld/read_field_x0y1_y.g4i | 60
xvmc/shader/vld/read_field_x1y0_uv.g4i | 24
xvmc/shader/vld/read_field_x1y0_y.g4i | 57
xvmc/shader/vld/read_field_x1y1_uv.g4i | 53
xvmc/shader/vld/read_field_x1y1_y.g4i | 87
xvmc/shader/vld/read_frame_x0y0_uv.g4i | 49
xvmc/shader/vld/read_frame_x0y0_y.g4i | 58
xvmc/shader/vld/read_frame_x0y1_uv.g4i | 56
xvmc/shader/vld/read_frame_x0y1_y.g4i | 61
xvmc/shader/vld/read_frame_x1y0_uv.g4i | 42
xvmc/shader/vld/read_frame_x1y0_y.g4i | 58
xvmc/shader/vld/read_frame_x1y1_uv.g4i | 74
xvmc/shader/vld/read_frame_x1y1_y.g4i | 112
xvmc/xvmc_vld.c | 1224 ++++
460 files changed, 86974 insertions(+), 80824 deletions(-)
New commits:
commit b230e2c30c4a2ffd98866ba50277053646f5c818
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Aug 15 10:20:40 2013 +0200
Cherry-pick upstream patch to fix a crash when changing resolution. (LP: #1212344)
diff --git a/debian/changelog b/debian/changelog
index 3b5ecc4..54845e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-xserver-xorg-video-intel (2:2.21.14-4ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-4ubuntu1) saucy; urgency=low
+ * New upstream release. (LP: #1204261, #1203273, #1172450)
+ * Cherry-pick upstream patch to fix a crash when changing resolution. (LP: #1212344)
* Merge against released debian-unstable.
* Drop upstreamed patches.
* Remaining changes:
- Use SNA by default.
- Add support for XMIR.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 15 Aug 2013 09:50:35 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 15 Aug 2013 10:07:19 +0200
xserver-xorg-video-intel (2:2.21.14-4) unstable; urgency=low
diff --git a/debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch b/debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch
new file mode 100644
index 0000000..e1443eb
--- /dev/null
+++ b/debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch
@@ -0,0 +1,60 @@
+From 5d29daa7df72d9a96e044d0706f3014811389629 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed, 14 Aug 2013 18:16:22 +0100
+Subject: [PATCH] sna: Make sure the frontbuffer exists before doing pitch
+ checks
+
+An unusual path to be sure, to call sna_crtc_set_mode_major before we
+create a GPU bo for the scanout - but might be possible after a GPU
+hang, or it appears after trying to set a 0x0 mode. At any rate, make
+sure the GPU bo exists before dereferencing.
+
+Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/1212344
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 2a5b4b4..a6a4665 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -1093,7 +1093,7 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
+ PictTransform crtc_to_fb;
+ struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
+ unsigned long pitch_limit;
+- struct kgem_bo *bo;
++ struct sna_pixmap *priv;
+ BoxRec b;
+
+ assert(sna->scrn->virtualX && sna->scrn->virtualY);
+@@ -1118,18 +1118,21 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
+ return true;
+ }
+
+- bo = sna_pixmap_get_bo(sna->front);
++ priv = sna_pixmap_force_to_gpu(sna->front, MOVE_READ | MOVE_WRITE);
++ if (priv == NULL)
++ return true; /* maybe we can create a bo for the scanout? */
++
+ if (sna->kgem.gen == 071)
+- pitch_limit = bo->tiling ? 16 * 1024 : 32 * 1024;
++ pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024;
+ else if ((sna->kgem.gen >> 3) > 4)
+ pitch_limit = 32 * 1024;
+ else if ((sna->kgem.gen >> 3) == 4)
+- pitch_limit = bo->tiling ? 16 * 1024 : 32 * 1024;
++ pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024;
+ else if ((sna->kgem.gen >> 3) == 3)
+- pitch_limit = bo->tiling ? 8 * 1024 : 16 * 1024;
++ pitch_limit = priv->gpu_bo->tiling ? 8 * 1024 : 16 * 1024;
+ else
+ pitch_limit = 8 * 1024;
+- if (bo->pitch > pitch_limit)
++ if (priv->gpu_bo->pitch > pitch_limit)
+ return true;
+
+ transform = NULL;
+--
+1.8.3.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 5a81d16..f8966b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
Link-the-driver-against-pixman.patch
+0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch
xmir.patch
commit 14ad9d765c30b93fbaf706571c1ad32dc25d04a9
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Aug 15 10:00:48 2013 +0200
refresh xmir patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 0ca2bc2..384cd55 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -9,22 +9,18 @@ Date: Wed Jul 24 01:44:30 2013 +0100
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Index: xf86-video-intel/src/Makefile.am
-===================================================================
---- xf86-video-intel.orig/src/Makefile.am 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/Makefile.am 2013-08-01 16:06:54.212945668 +1000
-@@ -46,6 +46,7 @@
- intel_device.c \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -59,6 +59,7 @@
+ intel_driver.h \
intel_options.c \
intel_module.c \
+ intel_xmir.h \
compat-api.h \
$(NULL)
-Index: xf86-video-intel/src/intel_device.c
-===================================================================
---- xf86-video-intel.orig/src/intel_device.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/intel_device.c 2013-08-01 16:06:54.212945668 +1000
+--- a/src/intel_device.c
++++ b/src/intel_device.c
@@ -92,7 +92,7 @@
if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
ret = FALSE;
@@ -115,10 +111,8 @@ Index: xf86-video-intel/src/intel_device.c
intel_set_device(scrn, NULL);
drmClose(dev->fd);
-Index: xf86-video-intel/src/intel_driver.h
-===================================================================
---- xf86-video-intel.orig/src/intel_driver.h 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/intel_driver.h 2013-08-01 16:06:54.212945668 +1000
+--- a/src/intel_driver.h
++++ b/src/intel_driver.h
@@ -1,6 +1,8 @@
#ifndef INTEL_DRIVER_H
#define INTEL_DRIVER_H
@@ -128,11 +122,9 @@ Index: xf86-video-intel/src/intel_driver.h
#define INTEL_VERSION 4000
#define INTEL_NAME "intel"
#define INTEL_DRIVER_NAME "intel"
-Index: xf86-video-intel/src/intel_module.c
-===================================================================
---- xf86-video-intel.orig/src/intel_module.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/intel_module.c 2013-08-01 16:06:54.212945668 +1000
-@@ -422,6 +422,9 @@
+--- a/src/intel_module.c
++++ b/src/intel_module.c
+@@ -382,6 +382,9 @@
#else
(*flag) = HW_IO | HW_MMIO;
#endif
@@ -142,7 +134,7 @@ Index: xf86-video-intel/src/intel_module.c
return TRUE;
default:
/* Unknown or deprecated function */
-@@ -533,7 +536,8 @@
+@@ -493,7 +496,8 @@
case PCI_CHIP_I810_DC100:
case PCI_CHIP_I810_E:
case PCI_CHIP_I815:
@@ -152,10 +144,8 @@ Index: xf86-video-intel/src/intel_module.c
default:
return FALSE;
}
-Index: xf86-video-intel/src/intel_xmir.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xf86-video-intel/src/intel_xmir.h 2013-08-01 16:06:54.212945668 +1000
+--- /dev/null
++++ b/src/intel_xmir.h
@@ -0,0 +1,15 @@
+#ifndef INTEL_XMIR_H
+#define INTEL_XMIR_H
@@ -172,11 +162,9 @@ Index: xf86-video-intel/src/intel_xmir.h
+#endif
+
+#endif /* INTEL_XMIR_H */
-Index: xf86-video-intel/src/sna/Makefile.am
-===================================================================
---- xf86-video-intel.orig/src/sna/Makefile.am 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/Makefile.am 2013-08-01 16:06:54.212945668 +1000
-@@ -73,6 +73,7 @@
+--- a/src/sna/Makefile.am
++++ b/src/sna/Makefile.am
+@@ -75,6 +75,7 @@
sna_video_overlay.c \
sna_video_sprite.c \
sna_video_textured.c \
@@ -184,11 +172,9 @@ Index: xf86-video-intel/src/sna/Makefile.am
gen2_render.c \
gen2_render.h \
gen3_render.c \
-Index: xf86-video-intel/src/sna/sna.h
-===================================================================
---- xf86-video-intel.orig/src/sna/sna.h 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/sna.h 2013-08-01 16:06:54.212945668 +1000
-@@ -218,6 +218,7 @@
+--- a/src/sna/sna.h
++++ b/src/sna/sna.h
+@@ -229,6 +229,7 @@
#define SNA_TEAR_FREE 0x10
#define SNA_FORCE_SHADOW 0x20
#define SNA_FLUSH_GTT 0x40
@@ -196,7 +182,7 @@ Index: xf86-video-intel/src/sna/sna.h
#define SNA_REPROBE 0x80000000
unsigned cpu_features;
-@@ -271,6 +272,7 @@
+@@ -282,6 +283,7 @@
EntityInfoPtr pEnt;
struct pci_device *PciInfo;
const struct intel_device_info *info;
@@ -204,7 +190,7 @@ Index: xf86-video-intel/src/sna/sna.h
ScreenBlockHandlerProcPtr BlockHandler;
ScreenWakeupHandlerProcPtr WakeupHandler;
-@@ -912,4 +914,18 @@
+@@ -924,4 +926,18 @@
uint16_t width,
uint16_t height);
@@ -223,11 +209,9 @@ Index: xf86-video-intel/src/sna/sna.h
+#endif
+
#endif /* _SNA_H */
-Index: xf86-video-intel/src/sna/sna_display.c
-===================================================================
---- xf86-video-intel.orig/src/sna/sna_display.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/sna_display.c 2013-08-01 16:06:54.212945668 +1000
-@@ -3128,11 +3128,22 @@
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -3151,11 +3151,22 @@
sna_mode_update(to_sna_from_screen(screen));
}
@@ -250,7 +234,7 @@ Index: xf86-video-intel/src/sna/sna_display.c
mode->kmode = drmModeGetResources(sna->kgem.fd);
if (mode->kmode) {
xf86CrtcConfigInit(scrn, &sna_mode_funcs);
-@@ -3149,9 +3160,7 @@
+@@ -3172,9 +3183,7 @@
if (!xf86IsEntityShared(scrn->entityList[0]))
sna_mode_compute_possible_clones(scrn);
@@ -261,11 +245,9 @@ Index: xf86-video-intel/src/sna/sna_display.c
} else {
if (!sna_mode_fake_init(sna))
return false;
-Index: xf86-video-intel/src/sna/sna_dri.c
-===================================================================
---- xf86-video-intel.orig/src/sna/sna_dri.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/sna_dri.c 2013-08-01 16:06:54.216945668 +1000
-@@ -2399,6 +2399,13 @@
+--- a/src/sna/sna_dri.c
++++ b/src/sna/sna_dri.c
+@@ -2271,6 +2271,13 @@
}
#endif
@@ -279,7 +261,7 @@ Index: xf86-video-intel/src/sna/sna_dri.c
static bool has_i830_dri(void)
{
return access(DRI_DRIVER_PATH "/i830_dri.so", R_OK) == 0;
-@@ -2474,6 +2481,13 @@
+@@ -2346,6 +2353,13 @@
info.ReuseBufferNotify = NULL;
#endif
@@ -293,11 +275,9 @@ Index: xf86-video-intel/src/sna/sna_dri.c
#if USE_ASYNC_SWAP
info.version = 10;
info.AsyncSwap = sna_dri_async_swap;
-Index: xf86-video-intel/src/sna/sna_driver.c
-===================================================================
---- xf86-video-intel.orig/src/sna/sna_driver.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/sna_driver.c 2013-08-01 16:06:54.216945668 +1000
-@@ -295,7 +295,7 @@
+--- a/src/sna/sna_driver.c
++++ b/src/sna/sna_driver.c
+@@ -287,7 +287,7 @@
drm_i915_getparam_t gp;
int v;
@@ -306,7 +286,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
return false;
v = 0;
-@@ -421,6 +421,7 @@
+@@ -413,6 +413,7 @@
sna = to_sna(scrn);
sna->scrn = scrn;
sna->pEnt = pEnt;
@@ -314,13 +294,13 @@ Index: xf86-video-intel/src/sna/sna_driver.c
scrn->displayWidth = 640; /* default it */
-@@ -433,13 +434,21 @@
+@@ -425,13 +426,21 @@
fd = intel_get_device(scrn);
if (fd == -1) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- "Failed to become DRM master.\n");
+ "Failed to claim DRM device.\n");
- return FALSE;
+ goto cleanup;
}
- preferred_depth = sna->info->gen < 030 ? 15 : 24;
@@ -339,7 +319,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0,
Support32bppFb |
-@@ -475,6 +484,9 @@
+@@ -467,6 +476,9 @@
intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
@@ -349,7 +329,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
kgem_init(&sna->kgem, fd, sna->PciInfo, sna->info->gen);
if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE) ||
!sna_option_cast_to_bool(sna, OPTION_ACCEL_METHOD, TRUE)) {
-@@ -492,7 +504,6 @@
+@@ -484,7 +496,6 @@
if (xf86ReturnOptValBool(sna->Options, OPTION_TILING_FB, FALSE))
sna->tiling &= ~SNA_TILING_FB;
@@ -357,7 +337,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
if (!xf86ReturnOptValBool(sna->Options, OPTION_SWAPBUFFERS_WAIT, TRUE))
sna->flags |= SNA_NO_WAIT;
if (xf86ReturnOptValBool(sna->Options, OPTION_TRIPLE_BUFFER, TRUE))
-@@ -555,6 +566,8 @@
+@@ -551,6 +562,8 @@
if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec))
sna_accel_block_handler(sna, tv);
@@ -366,7 +346,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
}
static void
-@@ -633,6 +646,9 @@
+@@ -629,6 +642,9 @@
Bool hotplug;
MessageType from = X_CONFIG;
@@ -376,7 +356,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
DBG(("%s\n", __FUNCTION__));
/* RandR will be disabled if Xinerama is active, and so generating
-@@ -885,6 +901,8 @@
+@@ -888,6 +904,8 @@
return FALSE;
}
@@ -385,7 +365,7 @@ Index: xf86-video-intel/src/sna/sna_driver.c
xf86SetBlackWhitePixels(screen);
xf86SetBackingStore(screen);
-@@ -892,7 +910,8 @@
+@@ -895,7 +913,8 @@
if (!miDCInitialize(screen, xf86GetPointerScreenFuncs()))
return FALSE;
@@ -395,10 +375,8 @@ Index: xf86-video-intel/src/sna/sna_driver.c
HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
HARDWARE_CURSOR_INVERT_MASK |
-Index: xf86-video-intel/src/sna/sna_video_overlay.c
-===================================================================
---- xf86-video-intel.orig/src/sna/sna_video_overlay.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/sna_video_overlay.c 2013-08-01 16:06:54.216945668 +1000
+--- a/src/sna/sna_video_overlay.c
++++ b/src/sna/sna_video_overlay.c
@@ -683,6 +683,9 @@
struct sna_video *video;
XvPortPtr port;
@@ -409,10 +387,8 @@ Index: xf86-video-intel/src/sna/sna_video_overlay.c
if (!sna_has_overlay(sna))
return;
-Index: xf86-video-intel/src/sna/sna_video_sprite.c
-===================================================================
---- xf86-video-intel.orig/src/sna/sna_video_sprite.c 2013-08-01 16:06:54.220945668 +1000
-+++ xf86-video-intel/src/sna/sna_video_sprite.c 2013-08-01 16:06:54.216945668 +1000
+--- a/src/sna/sna_video_sprite.c
++++ b/src/sna/sna_video_sprite.c
@@ -456,6 +456,9 @@
struct sna_video *video;
XvPortPtr port;
@@ -423,10 +399,8 @@ Index: xf86-video-intel/src/sna/sna_video_sprite.c
memset(&r, 0, sizeof(struct drm_mode_get_plane_res));
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPLANERESOURCES, &r))
return;
-Index: xf86-video-intel/src/sna/sna_xmir.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xf86-video-intel/src/sna/sna_xmir.c 2013-08-01 16:07:47.936945593 +1000
+--- /dev/null
++++ b/src/sna/sna_xmir.c
@@ -0,0 +1,165 @@
+/***************************************************************************
+
commit 6a46c0c6649956565f837a113dbf1daf597f01a8
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Aug 15 09:51:43 2013 +0200
Add changelog entry.
diff --git a/debian/changelog b/debian/changelog
index 1b42de7..3b5ecc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.21.14-4ubuntu1) UNRELEASED; urgency=low
+
+ * Merge against released debian-unstable.
+ * Drop upstreamed patches.
+ * Remaining changes:
+ - Use SNA by default.
+ - Add support for XMIR.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 15 Aug 2013 09:50:35 +0200
+
xserver-xorg-video-intel (2:2.21.14-4) unstable; urgency=low
* Link the driver against pixman to get correct dependency (closes: #719518).
commit 7ec16ddfc59db873f4d5919bf4e300969ef9d89e
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 19:48:48 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 1868d4a..99835f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.21.14-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-4) unstable; urgency=low
* Link the driver against pixman to get correct dependency (closes: #719518).
Thanks to Martin Perazzo for the report!
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 19:36:46 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 19:48:43 +0200
xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
commit 55f8f83a0cb6857b2ed4ca09f63522700ed61cb7
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 19:37:28 2013 +0200
Link the driver against pixman to get correct dependency (closes: #719518).
Thanks to Martin Perazzo for the report!
diff --git a/debian/changelog b/debian/changelog
index dd638b3..1868d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.14-4) UNRELEASED; urgency=low
+
+ * Link the driver against pixman to get correct dependency (closes: #719518).
+ Thanks to Martin Perazzo for the report!
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 19:36:46 +0200
+
xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
* Add patch to deal with missing 'struct sysinfo' in kfreebsd's
diff --git a/debian/patches/Link-the-driver-against-pixman.patch b/debian/patches/Link-the-driver-against-pixman.patch
new file mode 100644
index 0000000..203552f
--- /dev/null
+++ b/debian/patches/Link-the-driver-against-pixman.patch
@@ -0,0 +1,38 @@
+From 666b4e7005b1b538c0320fbf4117e4477a61f951 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 12 Aug 2013 19:31:53 +0200
+Subject: [PATCH 1/2] Link the driver against pixman
+
+---
+ configure.ac | 1 +
+ src/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 104113e..bd5ce9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,6 +392,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.20]) # libdrm_intel is checked separately
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
++PKG_CHECK_MODULES(PIXMAN, [pixman-1])
+
+ LIBS=""
+ AC_SEARCH_LIBS(clock_gettime, rt, [CLOCK_GETTIME_LIBS=$LIBS])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 16b6967..8810b74 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,7 +37,7 @@ AM_CFLAGS = \
+ intel_drv_la_LTLIBRARIES = intel_drv.la
+ intel_drv_la_LDFLAGS = -module -avoid-version
+ intel_drv_ladir = @moduledir@/drivers
+-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
++intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(PIXMAN_LIBS)
+
+ if SNA
+ SUBDIRS += sna
+--
+1.7.10.4
+
Reply to: