Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Feb 2012 14:23:42 -0700 (MST)
From:      Warren Block <wblock@wonkity.com>
To:        Meowthink <meowthink@gmail.com>
Cc:        freebsd-x11@freebsd.org
Subject:   Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)
Message-ID:  <alpine.BSF.2.00.1202071413280.88011@wonkity.com>
In-Reply-To: <CABnABobGoLGO200z238o=xNRgrOhA4s2xAnJ-mTiQ%2BvsUKDw=A@mail.gmail.com>
References:  <CABnABobGoLGO200z238o=xNRgrOhA4s2xAnJ-mTiQ%2BvsUKDw=A@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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?

It's the path for the first two Makefiles.  Or something about patch, 
maybe:

   # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/ /usr/src/sys/dev/drm/i915_suspend.c
   # cd /usr/src
   # patch < drm-all.13.1-stable9.1.patch

fails.  But this works:

   # 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1202071413280.88011>