| ... |
... |
@@ -18,3 +18,71 @@ |
|
18
|
18
|
const long phys_pages = sysconf(_SC_PHYS_PAGES);
|
|
19
|
19
|
const long page_size = sysconf(_SC_PAGE_SIZE);
|
|
20
|
20
|
|
|
|
21
|
+--- a/src/util/xmlconfig.c
|
|
|
22
|
++++ b/src/util/xmlconfig.c
|
|
|
23
|
+@@ -967,12 +967,18 @@ parseConfigDir(struct OptConfData *data,
|
|
|
24
|
+ return;
|
|
|
25
|
+
|
|
|
26
|
+ for (i = 0; i < count; i++) {
|
|
|
27
|
+- char filename[PATH_MAX];
|
|
|
28
|
++ char *filename;
|
|
|
29
|
+
|
|
|
30
|
+- snprintf(filename, PATH_MAX, "%s/%s", dirname, entries[i]->d_name);
|
|
|
31
|
++ if (asprintf(&filename, "%s/%s", dirname, entries[i]->d_name) == -1) {
|
|
|
32
|
++ __driUtilMessage ("Error constructing config file name: %s.",
|
|
|
33
|
++ strerror (errno));
|
|
|
34
|
++ free(entries[i]);
|
|
|
35
|
++ continue;
|
|
|
36
|
++ }
|
|
|
37
|
+ free(entries[i]);
|
|
|
38
|
+
|
|
|
39
|
+ parseOneConfigFile(data, filename);
|
|
|
40
|
++ free(filename);
|
|
|
41
|
+ }
|
|
|
42
|
+
|
|
|
43
|
+ free(entries);
|
|
|
44
|
+@@ -1006,10 +1012,15 @@ driParseConfigFiles(driOptionCache *cach
|
|
|
45
|
+ parseOneConfigFile(&userData, SYSCONFDIR "/drirc");
|
|
|
46
|
+
|
|
|
47
|
+ if ((home = getenv ("HOME"))) {
|
|
|
48
|
+- char filename[PATH_MAX];
|
|
|
49
|
++ char *filename;
|
|
|
50
|
+
|
|
|
51
|
+- snprintf(filename, PATH_MAX, "%s/.drirc", home);
|
|
|
52
|
+- parseOneConfigFile(&userData, filename);
|
|
|
53
|
++ if (asprintf(&filename, "%s/.drirc", home) == -1) {
|
|
|
54
|
++ __driUtilMessage ("Error constructing config file name: %s.",
|
|
|
55
|
++ strerror (errno));
|
|
|
56
|
++ } else {
|
|
|
57
|
++ parseOneConfigFile(&userData, filename);
|
|
|
58
|
++ free(filename);
|
|
|
59
|
++ }
|
|
|
60
|
+ }
|
|
|
61
|
+ }
|
|
|
62
|
+
|
|
|
63
|
+--- a/src/egl/main/egldevice.c
|
|
|
64
|
++++ b/src/egl/main/egldevice.c
|
|
|
65
|
+@@ -211,7 +211,12 @@ _eglDeviceSupports(_EGLDevice *dev, _EGL
|
|
|
66
|
+ const char *
|
|
|
67
|
+ _eglGetDRMDeviceRenderNode(_EGLDevice *dev)
|
|
|
68
|
+ {
|
|
|
69
|
++#ifdef HAVE_LIBDRM
|
|
|
70
|
+ return dev->device->nodes[DRM_NODE_RENDER];
|
|
|
71
|
++#else
|
|
|
72
|
++ _eglLog(_EGL_FATAL, "Driver bug: Built without libdrm, yet requesting DRM render node");
|
|
|
73
|
++ return NULL;
|
|
|
74
|
++#endif
|
|
|
75
|
+ }
|
|
|
76
|
+
|
|
|
77
|
+ EGLBoolean
|
|
|
78
|
+--- a/src/egl/meson.build
|
|
|
79
|
++++ b/src/egl/meson.build
|
|
|
80
|
+@@ -87,7 +87,7 @@ g_egldispatchstubs_h = custom_target(
|
|
|
81
|
+ capture : true,
|
|
|
82
|
+ )
|
|
|
83
|
+
|
|
|
84
|
+-if with_dri2
|
|
|
85
|
++if with_dri
|
|
|
86
|
+ files_egl += files(
|
|
|
87
|
+ 'drivers/dri2/egl_dri2.c',
|
|
|
88
|
+ 'drivers/dri2/egl_dri2.h',
|