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 <l.stach@pengutronix.de> --- ...bug-parameter-to-properly-handle-dis.patch | 30 ------------------- patches/glu-9.0.1/autogen.sh | 1 - patches/glu-9.0.1/series | 4 --- rules/glu.in | 1 + rules/glu.make | 13 ++++---- 5 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch delete mode 120000 patches/glu-9.0.1/autogen.sh delete mode 100644 patches/glu-9.0.1/series 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 <l.stach@pengutronix.de> -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 -- 2.29.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 4e58764e2acf747af87050b9ef86b38f92a2c713.
Michael
[sent from post-receive hook]
On Tue, 29 Jun 2021 07:09:43 +0200, Lucas Stach <l.stach@pengutronix.de> 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 <l.stach@pengutronix.de>
> Message-Id: <20210625081535.24325-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 <l.stach@pengutronix.de>
> -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