forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

temp/mesa-git: apply more patches to build on 32-bit arm

Browse source 
Apply the rest of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4279
to fix the build for real. I've verified that this builds for armv7 on
edge.
This commit is contained in:
Oliver Smith 2020-07-30 12:11:07 +02:00
parent fcb300ebc5
commit 983bc8318b
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 77 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
temp/mesa-git/0001-v3d_bufmgr-fix-time_t-printf.patch
View file

@ -1,7 +1,7 @@
From b3beb6207f16ac55e3934b4d4d1f178adb4f4cad Mon Sep 17 00:00:00 2001
From f540062fc911817907d9a4ddcd518fc939f4ea29 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 22 Mar 2020 13:03:00 +0100
Subject: [PATCH] v3d_bufmgr: fix time_t printf
Subject: [PATCH 1/3] v3d_bufmgr: fix time_t printf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

34
temp/mesa-git/0002-pan_bo.h-add-time.h-include-for-time_t.patch Normal file
View file

@ -0,0 +1,34 @@
From 554c392ff077405e740dd9a3b79012d83701db82 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 22 Mar 2020 11:48:31 +0100
Subject: [PATCH 2/3] pan_bo.h: add time.h include for time_t
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes:
../src/gallium/drivers/panfrost/pan_bo.h:93:9: error: unknown type name ‘time_t’
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4279>
---
src/panfrost/encoder/pan_bo.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/panfrost/encoder/pan_bo.h b/src/panfrost/encoder/pan_bo.h
index fc20ceed1d4..7773b2baaab 100644
--- a/src/panfrost/encoder/pan_bo.h
+++ b/src/panfrost/encoder/pan_bo.h
@@ -29,6 +29,7 @@
#include <panfrost-misc.h>
#include "util/list.h"
#include "pan_device.h"
+#include <time.h>
/* Flags for allocated memory */
--
2.20.1

35
temp/mesa-git/0003-vc4_bufmgr-fix-time_t-printf.patch Normal file
View file

@ -0,0 +1,35 @@
From 6797dd752ea944fccf5d9cc9b72114e2b67e7821 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 22 Mar 2020 11:42:35 +0100
Subject: [PATCH 3/3] vc4_bufmgr: fix time_t printf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes:
error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘time_t’ {aka ‘long long int’}
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4279>
---
src/gallium/drivers/vc4/vc4_bufmgr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c
index f7ac1698ee3..a786e8ee939 100644
--- a/src/gallium/drivers/vc4/vc4_bufmgr.c
+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
@@ -100,7 +100,7 @@ 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);
}
}
--
2.20.1

8
temp/mesa-git/APKBUILD
View file

@ -5,7 +5,7 @@
# new Mesa stable release
pkgname=mesa-git
pkgver=0_git20200510
pkgrel=1
pkgrel=2
_commit="56f955e4850035d915a2a87e2ebea7fa66ab5e19"
pkgdesc="Mesa DRI OpenGL library (Git)"
url="https://www.mesa3d.org"
@ -69,6 +69,8 @@ source="
musl-fix-includes.patch
add-use-elf-tls.patch
0001-v3d_bufmgr-fix-time_t-printf.patch
0002-pan_bo.h-add-time.h-include-for-time_t.patch
0003-vc4_bufmgr-fix-time_t-printf.patch
"
provides="mesa"
replaces="mesa-dricore mesa"
@ -365,4 +367,6 @@ sha512sums="5b45320884e6828256eb0de90ed87fce71c86213f1fed952dac83b923947cc56794f
cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc adjust-cache-deflate-buffer.patch
cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7 musl-fix-includes.patch
9aa207a38d538abbd8e7a7210e3081508563e85e8c27b2269b8f40fd62d9fc6fee0cb2f573a0e62c42f8ba0fb85740459b761f009d5991cfd9813d7614541908 add-use-elf-tls.patch
25d253e91a7ea00355d830803fbf932c5fff44c174b61d7bb85391f3878efa1ca93fbdbd50a2f6939d229f135d3ee4ab76fad8f7439c4982f4ea71bc4693e215 0001-v3d_bufmgr-fix-time_t-printf.patch"
a3f2ac467ec587722c772882a87816692873d94e510dfd47ffaf99ae11aaa71b620d5c27f8ff8419730ec634c1b2ba0c50a6bb16fef27dda02900ab43f51f7e0 0001-v3d_bufmgr-fix-time_t-printf.patch
a90bfa9fb86956f24db2082ab3c31ea197b695bdc848060a30f23e8e617e3487d222dcb77a45a7303084ab124e520d6cf07938b642405d7529c10c2e348f9d18 0002-pan_bo.h-add-time.h-include-for-time_t.patch
9f6a859a34a90f1c93db53ee620e7edcc615e80821a5143f87aa7410064b15292bb36a0e5868b36a8a5b823dec61163d1f91a8063c4ea964abc3eeff4318f9cb 0003-vc4_bufmgr-fix-time_t-printf.patch"