From owner-freebsd-x11@FreeBSD.ORG Tue Feb 7 23:17:44 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 0DDC4106566B for ; Tue, 7 Feb 2012 23:17:44 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (wonkity.com [67.158.26.137]) by mx1.freebsd.org (Postfix) with ESMTP id A5D3A8FC17 for ; Tue, 7 Feb 2012 23:17:43 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.5/8.14.5) with ESMTP id q17NHgrC091932; Tue, 7 Feb 2012 16:17:42 -0700 (MST) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id q17NHgcw091929; Tue, 7 Feb 2012 16:17:42 -0700 (MST) (envelope-from wblock@wonkity.com) Date: Tue, 7 Feb 2012 16:17:42 -0700 (MST) From: Warren Block To: Meowthink In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (wonkity.com [127.0.0.1]); Tue, 07 Feb 2012 16:17:42 -0700 (MST) 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: Tue, 07 Feb 2012 23:17:44 -0000 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? > > 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 And now it's really unhappy about duplicate definitions. This is from a buildkernel: Warning: Object directory not changed from original /usr/src/sys/modules/drm/drm /usr/local/libexec/ccache/world/cc -O2 -pipe -march=prescott -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse -mno-mmx -msoft-float -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3343: error: redefinition of 'struct drm_prop_enum_list' /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3363: error: redefinition of 'drm_dpms_enum_list' /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:59: error: previous definition of 'drm_dpms_enum_list' was here ...(about 1900 lines) /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3230: error: previous definition of 'drm_mode_destroy_dumb_ioctl' was here /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:36285: error: redefinition of 'drm_fb_get_bpp_depth' /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3245: error: previous definition of 'drm_fb_get_bpp_depth' was here *** Error code 1 Stop in /usr/src/sys/modules/drm/drm.