From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:14:49 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly65B-0007Kp-6K for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:14:49 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly65A-00034P-R6; Tue, 29 Jun 2021 07:14:48 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly60F-0005oy-TV; Tue, 29 Jun 2021 07:09:43 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly60F-0005e6-CY; Tue, 29 Jun 2021 07:09:43 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly60F-00AazT-Bt; Tue, 29 Jun 2021 07:09:43 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:43 +0200 Message-Id: <20210629050943.2525428-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210625081535.24325-1-l.stach@pengutronix.de> References: <20210625081535.24325-1-l.stach@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] glu: version bump 9.0.1 -> 9.0.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" 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.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 4e58764e2acf747af87050b9ef86b38f92a2c713. Michael [sent from post-receive hook] On Tue, 29 Jun 2021 07:09:43 +0200, Lucas Stach wrote: > Drop the local build fix, which is both upstream and obsolete as > we can switch to the meson build system now. > > Signed-off-by: Lucas Stach > Message-Id: <20210625081535.24325-1-l.stach@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch b/patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > deleted file mode 100644 > index c1bb17c632dd..000000000000 > --- a/patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From: Lucas Stach > -Date: Mon, 5 Oct 2020 16:45:11 +0200 > -Subject: [PATCH] build: fix the debug parameter to properly handle > - --disable-debug > - > -Right now the the enableval isn't checked, so the debug options are added > -for --enable-debug and --disable-debug, which is quite surprising for a > -user. Fix this to peroply handle the disable case. > ---- > - configure.ac | 7 +++++-- > - 1 file changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index 6d9b04b45cb2..f1bb7b14eae4 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -42,8 +42,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) > - AC_ARG_ENABLE(debug, > - AS_HELP_STRING([--enable-debug], > - [Enable debugging information]), > -- [CFLAGS="$CFLAGS -g -O0 -DDEBUG" > -- CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"], > -+ [if test x$enableval = xyes; then > -+ CFLAGS="$CFLAGS -g -O0 -DDEBUG" > -+ CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"; else > -+ CFLAGS="$CFLAGS -DNDEBUG" > -+ CXXFLAGS="$CXXFLAGS -DNDEBUG"; fi], > - [CFLAGS="$CFLAGS -DNDEBUG" > - CXXFLAGS="$CXXFLAGS -DNDEBUG"]) > - > diff --git a/patches/glu-9.0.1/autogen.sh b/patches/glu-9.0.1/autogen.sh > deleted file mode 120000 > index 9f8a4cb7ddcb..000000000000 > --- a/patches/glu-9.0.1/autogen.sh > +++ /dev/null > @@ -1 +0,0 @@ > -../autogen.sh > \ No newline at end of file > diff --git a/patches/glu-9.0.1/series b/patches/glu-9.0.1/series > deleted file mode 100644 > index 1ad43d010e0f..000000000000 > --- a/patches/glu-9.0.1/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > -# d78721868a7016e340f9e3fe654aa62e - git-ptx-patches magic > diff --git a/rules/glu.in b/rules/glu.in > index 2cc2f223b17b..8cd31475886e 100644 > --- a/rules/glu.in > +++ b/rules/glu.in > @@ -3,6 +3,7 @@ > config GLU > tristate > prompt "glu" > + select HOST_MESON > select MESALIB > select MESALIB_GLX > help > diff --git a/rules/glu.make b/rules/glu.make > index 1769da4f9b08..6eab71036597 100644 > --- a/rules/glu.make > +++ b/rules/glu.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLU) += glu > # > # Paths and names > # > -GLU_VERSION := 9.0.1 > -GLU_MD5 := 151aef599b8259efe9acd599c96ea2a3 > +GLU_VERSION := 9.0.2 > +GLU_MD5 := 2b0f13fa5b949bfb3a995927c6e35125 > GLU := glu-$(GLU_VERSION) > GLU_SUFFIX := tar.xz > GLU_URL := ftp://ftp.freedesktop.org/pub/mesa/glu/$(GLU).$(GLU_SUFFIX) > @@ -33,12 +33,11 @@ GLU_LICENSE_FILES := \ > # > # autoconf > # > -GLU_CONF_TOOL := autoconf > +GLU_CONF_TOOL := meson > GLU_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-static \ > - --disable-debug \ > - --disable-osmesa > + $(CROSS_MESON_USR) \ > + -Ddefault_library=shared \ > + -Dgl_provider=gl > > # ---------------------------------------------------------------------------- > # Target-Install _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de