From owner-freebsd-x11@FreeBSD.ORG Wed Feb 8 13:37:38 2012 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D7A61065670 for ; Wed, 8 Feb 2012 13:37:38 +0000 (UTC) (envelope-from meowthink@gmail.com) Received: from mail-tul01m020-f182.google.com (mail-tul01m020-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id C6C018FC13 for ; Wed, 8 Feb 2012 13:37:37 +0000 (UTC) Received: by obcwo16 with SMTP id wo16so1155159obc.13 for ; Wed, 08 Feb 2012 05:37:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=Xlr6w8xQS/Vqnt+vW9frVkCuc/wQmqTlELKNJVm6RCI=; b=Y6LbUwkwG8T66CsB/aaWR1QFMGDTFYqebrq//t28a0tzp9bjOQohQqkH9H+UHx1nuR wqCEJ8a0g6nrtHchCBg6zB+UEURxmj1AIeSaIxKyJrAW6PSlPxJB17iK5WTaxlWOIXDV GW+pCRpCpj20kSlnDpx/VkjirP9HvRc30JZXY= MIME-Version: 1.0 Received: by 10.182.36.35 with SMTP id n3mr25399274obj.66.1328708257405; Wed, 08 Feb 2012 05:37:37 -0800 (PST) Received: by 10.60.47.135 with HTTP; Wed, 8 Feb 2012 05:37:37 -0800 (PST) In-Reply-To: References: Date: Wed, 8 Feb 2012 21:37:37 +0800 Message-ID: From: Meowthink To: Warren Block Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-x11@freebsd.org Subject: Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2) X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2012 13:37:38 -0000 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 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 > >> =A0# cd /usr/src/sys >> =A0# patch -p1 < drm-all.13.1-stable9.1.patch