From owner-freebsd-x11@freebsd.org Fri Dec 7 13:10:30 2018 Return-Path: Delivered-To: freebsd-x11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B71FC130D34C for ; Fri, 7 Dec 2018 13:10:30 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 564EE8A80E for ; Fri, 7 Dec 2018 13:10:30 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id 14AA2130D349; Fri, 7 Dec 2018 13:10:30 +0000 (UTC) Delivered-To: x11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01954130D348 for ; Fri, 7 Dec 2018 13:10:30 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9851F8A80C; Fri, 7 Dec 2018 13:10:29 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 891AF4E72; Fri, 7 Dec 2018 13:10:29 +0000 (UTC) From: Jan Beich To: Yuri Pankov Cc: x11@FreeBSD.org Subject: Re: [CFT] Mesa 18.3.0 update (mesa-libs, mesa-dri, libosmesa, clover) References: <790ba1cb-7251-e8b3-f7a3-6de3cdee9958@yuripv.net> Date: Fri, 07 Dec 2018 14:10:19 +0100 In-Reply-To: <790ba1cb-7251-e8b3-f7a3-6de3cdee9958@yuripv.net> (Yuri Pankov's message of "Fri, 7 Dec 2018 15:53:24 +0300") Message-ID: <8t11-v5xg-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 564EE8A80E X-Spamd-Result: default: False [-2.87 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.98)[-0.985,0]; NEURAL_HAM_SHORT(-0.92)[-0.918,0]; ASN(0.00)[asn:10310, ipnet:2001:1900:2254::/48, country:US]; NEURAL_HAM_LONG(-0.97)[-0.970,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Dec 2018 13:10:30 -0000 Yuri Pankov writes: > Doesn't seem to apply cleanly: > > $ svn up /usr/ports/ > Updating '/usr/ports': > At revision 486859. > $ svn status /usr/ports/ > $ patch -Efsp0 -i /tmp/mesa-18.2.diff -d /usr/ports > $ patch -Efsp0 -i /tmp/mesa-18.3.diff -d /usr/ports > No file to patch. Skipping... > 1 out of 1 hunks ignored--saving rejects to > graphics/mesa-dri/files/patch-src_intel_tools_aub__mem.c.rej Thanks for reporting. I forgot "Download Raw Diff" is broken with renames. Can you re-download mesa-18.3.diff? Before re-applying do the following: $ rm -rf graphics/mesa-dri/files $ svn revert -R graphics/mesa-* to get rid of orphans and inconsistent state.