1 files changed, 7 insertions, 9 deletions

diff --git a/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch b/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
index 901feca556..dacb1ea1c8 100644
--- a/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
+++ b/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
@@ -1,4 +1,4 @@
-From 38a313474e127d61e749866423e708fc86ed9ec5 Mon Sep 17 00:00:00 2001
+From 281a636353666bfdd373c62591e744087e750e89 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 4 Dec 2019 14:15:28 -0800
 Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members
@@ -13,13 +13,14 @@ error: format specifies type 'long' but the argument has type 'time_t' (aka 'lon
 
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++--
  src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c
-index b3e4d053cc0..c514bf00bf0 100644
+index 31a0803..cc2e2af 100644
 --- a/src/gallium/drivers/v3d/v3d_bufmgr.c
 +++ b/src/gallium/drivers/v3d/v3d_bufmgr.c
 @@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen)
@@ -27,27 +28,24 @@ index b3e4d053cc0..c514bf00bf0 100644
                  struct timespec time;
                  clock_gettime(CLOCK_MONOTONIC, &time);
 -                fprintf(stderr, "  now:               %ld\n",
--                        time.tv_sec);
+-                        (long)time.tv_sec);
 +                fprintf(stderr, "  now:               %jd\n",
 +                        (intmax_t)time.tv_sec);
          }
  }
  
 diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c
-index 5ec360934c0..bf05f6cadd6 100644
+index a786e8e..975d49e 100644
 --- a/src/gallium/drivers/vc4/vc4_bufmgr.c
 +++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
-@@ -107,8 +107,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen)
+@@ -99,8 +99,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen)
  
                  struct timespec time;
                  clock_gettime(CLOCK_MONOTONIC, &time);
 -                fprintf(stderr, "  now:               %ld\n",
--                        time.tv_sec);
+-                        (long)time.tv_sec);
 +                fprintf(stderr, "  now:               %jd\n",
 +                        (intmax_t)time.tv_sec);
          }
  }
  
--- 
-2.24.0
-