diff -Nru xserver-xorg-video-intel-2.4.1/debian/changelog xserver-xorg-video-intel-2.4.1/debian/changelog --- xserver-xorg-video-intel-2.4.1/debian/changelog 2008-11-12 14:45:16.000000000 -0800 +++ xserver-xorg-video-intel-2.4.1/debian/changelog 2008-11-12 14:45:17.000000000 -0800 @@ -1,3 +1,11 @@ +xserver-xorg-video-intel (2:2.4.1-1ubuntu10.1) intrepid-proposed; urgency=low + + * Re-enable 11_textured_video_option.patch, but change logic so it is + enabled by default. This allows people seeing issues with it to + turn it off if they wish. (LP: #278318) + + -- Bryce Harrington Wed, 12 Nov 2008 14:39:03 -0800 + xserver-xorg-video-intel (2:2.4.1-1ubuntu10) intrepid; urgency=low * 28_stolen_memory_counting_g4x.patch: diff -Nru /tmp/AUuUWqnbqF/xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch /tmp/oahiR2glVH/xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch --- xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch 2008-11-12 14:45:16.000000000 -0800 +++ xserver-xorg-video-intel-2.4.1/debian/patches/11_textured_video_option.patch 2008-11-12 14:45:17.000000000 -0800 @@ -21,7 +21,9 @@ src/i830_video.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) -[Updated to apply to the 2.3.1 driver -- bryce 6/12/08] +[Updated to apply to the 2.3.1 driver -- bryce Jun 12, 2008] +[Altered to default to 'true' so "TexturedVideo" is on by default, but can + be disabled if desired -- bryce Nov 12, 2008] diff -Nurp xserver-xorg-video-intel-2.3.1-1ubuntu1~bwh3-patched/src/i830.h xserver-xorg-video-intel-2.3.1-1ubuntu1~bwh3-working/src/i830.h --- xserver-xorg-video-intel-2.3.1-1ubuntu1~bwh3-patched/src/i830.h 2008-06-12 16:03:38.000000000 -0700 @@ -49,7 +51,7 @@ {OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_TRIPLEBUFFER, "TripleBuffer", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_FORCEENABLEPIPEA, "ForceEnablePipeA", OPTV_BOOLEAN, {0}, FALSE}, -+ {OPTION_TEXTURED_VIDEO, "TexturedVideo", OPTV_BOOLEAN, {0}, FALSE}, ++ {OPTION_TEXTURED_VIDEO, "TexturedVideo", OPTV_BOOLEAN, {0}, TRUE}, #ifdef INTEL_XVMC {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, TRUE}, #endif @@ -57,7 +59,7 @@ pI830->XvDisabled = !xf86ReturnOptValBool(pI830->Options, OPTION_XVIDEO, TRUE); -+ pI830->TexturedXvEnabled = OVERLAY_NOEXIST(pI830) || xf86ReturnOptValBool(pI830->Options, OPTION_TEXTURED_VIDEO, FALSE); ++ pI830->TexturedXvEnabled = OVERLAY_NOEXIST(pI830) || xf86ReturnOptValBool(pI830->Options, OPTION_TEXTURED_VIDEO, TRUE); + #ifdef I830_XV if (xf86GetOptValInteger(pI830->Options, OPTION_VIDEO_KEY, diff -Nru /tmp/AUuUWqnbqF/xserver-xorg-video-intel-2.4.1/debian/patches/series /tmp/oahiR2glVH/xserver-xorg-video-intel-2.4.1/debian/patches/series --- xserver-xorg-video-intel-2.4.1/debian/patches/series 2008-11-12 14:45:16.000000000 -0800 +++ xserver-xorg-video-intel-2.4.1/debian/patches/series 2008-11-12 14:45:17.000000000 -0800 @@ -1,6 +1,6 @@ #01_fix_compiz_video.diff 01_gen_pci_ids.diff -#11_textured_video_option.patch +11_textured_video_option.patch 20_thinkpad_g40_quirk.patch 21_quirk_lenovo.patch 22_no_pipe_for_hotplug_detection.patch