From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Thu, 12 Sep 2024 14:15:02 +0200
Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.96)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1soij1-003mqu-07
	for lore@lore.pengutronix.de;
	Thu, 12 Sep 2024 14:15:02 +0200
Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de)
	by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1soij0-0005u3-4h; Thu, 12 Sep 2024 14:15:02 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.whiteo.stw.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1soifr-0001gA-JF; Thu, 12 Sep 2024 14:11:47 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1soifr-007NR8-6a; Thu, 12 Sep 2024 14:11:47 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1soifr-00BGku-0W;
 Thu, 12 Sep 2024 14:11:47 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Thu, 12 Sep 2024 14:11:47 +0200
Message-Id: <20240912121147.2686009-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240815115615.2745801-2-p.zabel@pengutronix.de>
References: <20240815115615.2745801-2-p.zabel@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] migrate: deconflate mesalib
 swrast/softpipe/lavapipe
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <https://metis.pengutronix.de/mailman/options/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <https://metis.pengutronix.de/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <https://metis.pengutronix.de/mailman/listinfo/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as aa353ba7c5264901d7f7eb1dc71f4957b1990318.

Michael

[sent from post-receive hook]

On Thu, 12 Sep 2024 14:11:47 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240815115615.2745801-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index 18f9a46529d5..dae0415cedab 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -493,3 +493,11 @@ s/^\(\(# \)\?PTXCONF_\)ATK_INTROSPECTION/\1AT_SPI2_CORE_INTROSPECTION/
>  # reason : switch to pcre2 in lighttpd
>  #
>  s/^\(\(# \)\?PTXCONF_LIGHTTPD_PCRE\)\>/\12/
> +
> +# from   : ptxdist-2024.08.0
> +# to     : ptxdist-2024.09.0
> +# symbol : MESALIB_DRI_SWRAST -> MESALIB_DRI_SOFTPIPE + MESALIB_DRI_LLVMPIPE
> +# reason : mesalib 24.2 deconflated swrast/softpipe/llvmpipe
> +#
> +/^\(PTXCONF_MESALIB_DRI_\)SWRAST\([^_]*$\)/N
> +s/^\(\(# \)\?PTXCONF_MESALIB_DRI_\)SWRAST\([^\n]*\n\)\(.*\)$/\1SOFTPIPE\3\1LLVMPIPE\3\4/