Re: [ptxdist] [APPLIED] glmark2: version bump 2020.04 -> 2021.02

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as dfe93758629ffdfd6f4366f5d63ec8b09dca3a1c.

Michael

[sent from post-receive hook]

On Thu, 07 Oct 2021 12:18:28 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Switch to Meson build system and drop merged or obsoleted patches.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210820094646.19930-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch b/patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch
> deleted file mode 100644
> index 88c85406a9af..000000000000
> --- a/patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -From: Marvin Schmidt <marv@exherbo.org>
> -Date: Sun, 3 May 2020 18:20:05 +0200
> -Subject: [PATCH] Build: Fix Python 3 incompatibility
> -
> ----
> - wscript | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/wscript b/wscript
> -index aefde706be0a..e09fa7850e1c 100644
> ---- a/wscript
> -+++ b/wscript
> -@@ -20,7 +20,7 @@ FLAVORS = {
> -     'x11-gl' : 'glmark2',
> -     'x11-glesv2' : 'glmark2-es2',
> - }
> --FLAVORS_STR = ", ".join(sorted(FLAVORS.keys() + ['all-linux', 'all-win32']))
> -+FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32']))
> - 
> - def linux_flavors():
> -     return [f for f in FLAVORS.keys() if not f.startswith('win32')]
> diff --git a/patches/glmark2-2020.04/0002-drm-Don-t-prefer-RGBA-component-widths-larger-than-8.patch b/patches/glmark2-2020.04/0002-drm-Don-t-prefer-RGBA-component-widths-larger-than-8.patch
> deleted file mode 100644
> index 490c4815c6a8..000000000000
> --- a/patches/glmark2-2020.04/0002-drm-Don-t-prefer-RGBA-component-widths-larger-than-8.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
> -Date: Mon, 13 Jul 2020 11:16:28 +0300
> -Subject: [PATCH] drm: Don't prefer RGBA component widths larger than 8
> -
> -Don't prefer RGBA component widths larger than 8, since they are
> -unlikely to be what the users want or properly supported for display.
> -Such widths can still be used, but only if explicitly requested.
> -
> -Fixes #125
> ----
> - src/gl-visual-config.cpp | 8 ++++++++
> - 1 file changed, 8 insertions(+)
> -
> -diff --git a/src/gl-visual-config.cpp b/src/gl-visual-config.cpp
> -index dbd87d2a3c3c..013cc646356b 100644
> ---- a/src/gl-visual-config.cpp
> -+++ b/src/gl-visual-config.cpp
> -@@ -108,6 +108,14 @@ GLVisualConfig::score_component(int component, int target, int scale) const
> -         /* Reward exact matches with the maximum per component score */
> -         score = MAXIMUM_COMPONENT_SCORE;
> -     }
> -+    else if (component > 8 && target <= 8 && scale > 1)
> -+    {
> -+        /* Penalize RGBA component widths larger than 8, since they are
> -+         * unlikely to be what the users want or properly supported for
> -+         * display. Such widths can still be used, but only if explicitly
> -+         * requested. */
> -+        score = UNACCEPTABLE_COMPONENT_PENALTY;
> -+    }
> -     else
> -     {
> -         /* 
> diff --git a/patches/glmark2-2020.04/series b/patches/glmark2-2020.04/series
> deleted file mode 100644
> index 48cf812dbee7..000000000000
> --- a/patches/glmark2-2020.04/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Build-Fix-Python-3-incompatibility.patch
> -0002-drm-Don-t-prefer-RGBA-component-widths-larger-than-8.patch
> -# 1ffb9f179a40f263a2758a123744c53e  - git-ptx-patches magic
> diff --git a/rules/glmark2.in b/rules/glmark2.in
> index af48f91ad695..7974f5bede0c 100644
> --- a/rules/glmark2.in
> +++ b/rules/glmark2.in
> @@ -6,7 +6,7 @@ menuconfig GLMARK2
>  	select MESALIB
>  	select UDEV			if GLMARK2_FLAVOR_DRM_GL || GLMARK2_FLAVOR_DRM_GLES2
>  	select UDEV_LIBUDEV		if GLMARK2_FLAVOR_DRM_GL || GLMARK2_FLAVOR_DRM_GLES2
> -	select HOST_SYSTEM_PYTHON3
> +	select HOST_MESON
>  	select LIBPNG
>  	select LIBJPEG
>  	help
> diff --git a/rules/glmark2.make b/rules/glmark2.make
> index d6b35a3bfca4..1be925289342 100644
> --- a/rules/glmark2.make
> +++ b/rules/glmark2.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLMARK2) += glmark2
>  #
>  # Paths and names
>  #
> -GLMARK2_VERSION	:= 2020.04
> -GLMARK2_MD5	:= a90713700a740180fef3576f7ee3c9db
> +GLMARK2_VERSION	:= 2021.02
> +GLMARK2_MD5	:= b81d52c61ff3ef1fb20f42b3c0faf780
>  GLMARK2		:= glmark2-$(GLMARK2_VERSION)
>  GLMARK2_SUFFIX	:= tar.gz
>  GLMARK2_URL	:= https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)
> @@ -31,9 +31,6 @@ GLMARK2_LICENSE_FILES := \
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -GLMARK2_CONF_ENV	:= \
> -	$(CROSS_ENV)
> -
>  GLMARK2_FLAVORS-y :=
>  GLMARK2_FLAVORS-$(PTXCONF_GLMARK2_FLAVOR_X11_GL)	+= x11-gl
>  GLMARK2_FLAVORS-$(PTXCONF_GLMARK2_FLAVOR_X11_GLES2)	+= x11-glesv2
> @@ -45,37 +42,13 @@ GLMARK2_FLAVORS-$(PTXCONF_GLMARK2_FLAVOR_WAYLAND_GLES2)	+= wayland-glesv2
>  GLMARK2_FLAVORS := $(strip $(GLMARK2_FLAVORS-y))
>  GLMARK2_FLAVORS := $(subst $(ptx/def/space),$(ptx/def/comma),$(GLMARK2_FLAVORS))
>  
> -GLMARK2_CONF_TOOL	:= NO
> +GLMARK2_CONF_TOOL	:= meson
>  GLMARK2_CONF_OPT	:= \
> -	--prefix=/usr \
> -	--with-flavors=$(GLMARK2_FLAVORS)
> -
> -$(STATEDIR)/glmark2.prepare:
> -	@$(call targetinfo)
> -	@cd $(GLMARK2_DIR) && \
> -		$(GLMARK2_CONF_ENV) PATH=$(CROSS_PATH) \
> -		$(SYSTEMPYTHON3) ./waf configure $(GLMARK2_CONF_OPT)
> -	@$(call touch)
> -
> -# ----------------------------------------------------------------------------
> -# Compile
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/glmark2.compile:
> -	@$(call targetinfo)
> -	@cd $(GLMARK2_DIR) && $(SYSTEMPYTHON3) ./waf build -j 1
> -	@$(call touch)
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/glmark2.install:
> -	@$(call targetinfo)
> -	@rm -rf "$(GLMARK2_PKGDIR)"
> -	@mkdir -p "$(GLMARK2_PKGDIR)"
> -	@cd "$(GLMARK2_DIR)" && $(SYSTEMPYTHON3) ./waf --destdir=$(GLMARK2_PKGDIR) install
> -	@$(call touch)
> +	$(CROSS_MESON_USR) \
> +	-Dflavors=$(GLMARK2_FLAVORS) \
> +	-Ddata-path='' \
> +	-Dextras-path='' \
> +	-Dversion-suffix=''
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de