Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

[Meowthink]

Hello Warren,

It seems that your problem came from command line. Seems I chose a
style that not so friendly? Try patch by this way:

cd /path/of/src/
patch -p3 < /path/to/drm-all.13.1-stable9.1.patch

Or, my preferred way:

cd /path/of/src/
svn patch --strip 2 /path/to/drm-all.13.1-stable9.1.patch

The reason is that the working directory of my patch is set to svn
base, but typically we checkout svn /stable/9/ to /usr/src/, so
there's 2 levels of path to be stripped out. Unfortunately, this style
also differs from kib's. I'll try to match his next time.

Cheers,
Meowthink
On Wed, Feb 8, 2012 at 11:32 AM, Warren Block <wblock at wonkity.com> wrote:
> On Tue, 7 Feb 2012, Warren Block wrote:
>
>> On Tue, 7 Feb 2012, Meowthink wrote:
>>
>>> to Warren,
>>> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
>>> patch(or try to deal with svn:keywords).
>>> And ... I don't know why you got those Makefiles rejected, as they
>>> were there, not modified in the official repository, for quite a long
>>> time. Any detail?
>>
>>
>> But this works:
>>
>
> Erred pasting that:
>
>
> # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/'
> /usr/src/sys/dev/drm/i915_suspend.c
>
>>  # cd /usr/src/sys
>>  # patch -p1 < drm-all.13.1-stable9.1.patch