Mesa (master): driconf: avoid Non-ASCII character error in driconf_static.py

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Mar 1 21:10:47 UTC 2021


Module: Mesa
Branch: master
Commit: 38d5dc9400ec5320607bc7960ff513853add37a4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=38d5dc9400ec5320607bc7960ff513853add37a4

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Thu Feb 25 21:55:31 2021 +0100

driconf: avoid Non-ASCII character error in driconf_static.py

MR to move to python3 in Android build gen rules is still pending

The change is to avoid following building error:

FAILED: out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_util_intermediates/driconf_static.h
/bin/bash -c "/usr/bin/python external/mesa/src/util/driconf_static.py external/mesa/src/util/00-mesa-defaults.conf > out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_util_intermediates/driconf_static.h"
  File "external/mesa/src/util/driconf_static.py", line 2
SyntaxError: Non-ASCII character '\xc2' in file external/mesa/src/util/driconf_static.py on line 2, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details

Fixes: a6b0ceb ("driconf: Generate a static table when no xmlconfig")
Acked-by: Rob Clark <robclark at freedesktop.org>
Tested-by: Marijn Suijten <marijn.suijten at somainline.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9294>

---

 src/util/driconf_static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/driconf_static.py b/src/util/driconf_static.py
index febd7ed6067..5a4c6d49adf 100644
--- a/src/util/driconf_static.py
+++ b/src/util/driconf_static.py
@@ -1,5 +1,5 @@
 #
-# Copyright © 2021 Google, Inc.
+# Copyright (C) 2021 Google, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),



More information about the mesa-commit mailing list