-
Notifications
You must be signed in to change notification settings - Fork 2
/
raspberrypi-vc-demo-source-path-fixup.patch
389 lines (329 loc) · 15.6 KB
/
raspberrypi-vc-demo-source-path-fixup.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
From 76acdbdac610018c9f3aa4383966e234e94e7cc8 Mon Sep 17 00:00:00 2001
From: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
Date: Fri, 27 Dec 2019 16:00:23 +0100
Subject: [PATCH] Fix compilation outside of "/opt" path
---
.../linux/apps/hello_pi/Makefile.include | 4 ++--
.../linux/apps/hello_pi/hello_audio/audio.c | 2 +-
.../linux/apps/hello_pi/hello_dispmanx/dispmanx.c | 2 +-
.../linux/apps/hello_pi/hello_encode/encode.c | 2 +-
.../linux/apps/hello_pi/hello_font/main.c | 2 +-
.../linux/apps/hello_pi/hello_jpeg/jpeg.h | 2 +-
.../linux/apps/hello_pi/hello_teapot/models.c | 6 +++---
.../linux/apps/hello_pi/hello_teapot/triangle.c | 8 ++++----
.../linux/apps/hello_pi/hello_teapot/video.c | 2 +-
.../linux/apps/hello_pi/hello_tiger/main.c | 14 +++++++-------
.../linux/apps/hello_pi/hello_triangle/triangle.c | 8 ++++----
.../apps/hello_pi/hello_triangle2/triangle2.c | 8 ++++----
.../linux/apps/hello_pi/hello_video/video.c | 2 +-
.../linux/apps/hello_pi/hello_videocube/triangle.c | 8 ++++----
.../linux/apps/hello_pi/hello_videocube/video.c | 2 +-
.../linux/apps/hello_pi/libs/ilclient/ilclient.c | 8 ++++----
.../linux/apps/hello_pi/libs/ilclient/ilclient.h | 4 ++--
.../linux/apps/hello_pi/libs/ilclient/ilcore.c | 10 +++++-----
.../apps/hello_pi/libs/vgfont/graphics_x_private.h | 10 +++++-----
.../linux/apps/hello_pi/libs/vgfont/vgfont.h | 6 +++---
.../linux/apps/hello_pi/libs/vgfont/vgft.h | 2 +-
21 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/host_applications/linux/apps/hello_pi/Makefile.include b/host_applications/linux/apps/hello_pi/Makefile.include
index d7ad1802..af0c291f 100755
--- a/host_applications/linux/apps/hello_pi/Makefile.include
+++ b/host_applications/linux/apps/hello_pi/Makefile.include
@@ -1,9 +1,9 @@
CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -g -DHAVE_LIBOPENMAX=2 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM -Wno-psabi
-LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/revision
+LDFLAGS+=-L$(SDKSTAGE)/usr/lib/vc -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L../libs/ilclient -L../libs/vgfont -L../libs/revision
-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/revision
+INCLUDES+=-I$(SDKSTAGE)/usr/include/vc -I$(SDKSTAGE)/usr/include/vc/interface/vcos/pthreads -I$(SDKSTAGE)/usr/include/vc/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont -I../libs/revision
all: $(BIN) $(LIB)
diff --git a/host_applications/linux/apps/hello_pi/hello_audio/audio.c b/host_applications/linux/apps/hello_pi/hello_audio/audio.c
index ebbcbce1..12673f8e 100755
--- a/host_applications/linux/apps/hello_pi/hello_audio/audio.c
+++ b/host_applications/linux/apps/hello_pi/hello_audio/audio.c
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <unistd.h>
#include <semaphore.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "ilclient.h"
#define N_WAVE 1024 /* dimension of Sinewave[] */
diff --git a/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c b/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c
index 1f23b324..1bd16708 100755
--- a/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c
+++ b/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <unistd.h>
#include <sys/time.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#define WIDTH 200
#define HEIGHT 200
diff --git a/host_applications/linux/apps/hello_pi/hello_encode/encode.c b/host_applications/linux/apps/hello_pi/hello_encode/encode.c
index 0f2a95a5..4524003e 100644
--- a/host_applications/linux/apps/hello_pi/hello_encode/encode.c
+++ b/host_applications/linux/apps/hello_pi/hello_encode/encode.c
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "ilclient.h"
#define NUMFRAMES 300
diff --git a/host_applications/linux/apps/hello_pi/hello_font/main.c b/host_applications/linux/apps/hello_pi/hello_font/main.c
index 4c04cd6b..038c5eb7 100644
--- a/host_applications/linux/apps/hello_pi/hello_font/main.c
+++ b/host_applications/linux/apps/hello_pi/hello_font/main.c
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h>
#include <unistd.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "vgfont.h"
#include "revision.h"
diff --git a/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h b/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h
index f525dab1..dce99b15 100644
--- a/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h
+++ b/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h
@@ -40,7 +40,7 @@ jpeg images from the camera
#include <string.h>
#include <errno.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "ilclient.h"
#define OMXJPEG_OK 0
diff --git a/host_applications/linux/apps/hello_pi/hello_teapot/models.c b/host_applications/linux/apps/hello_pi/hello_teapot/models.c
index a5af1413..210ecc3d 100644
--- a/host_applications/linux/apps/hello_pi/hello_teapot/models.c
+++ b/host_applications/linux/apps/hello_pi/hello_teapot/models.c
@@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h>
#include <stdint.h>
-#include "GLES/gl.h"
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
+#include <GLES/gl.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
#include "models.h"
#define VMCS_RESOURCE(a,b) (b)
diff --git a/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c b/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c
index 959651b9..4c0954e7 100644
--- a/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c
+++ b/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c
@@ -35,11 +35,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h>
#include <unistd.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
-#include "GLES/gl.h"
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
+#include <GLES/gl.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
#include "cube_texture_and_coords.h"
#include "models.h"
diff --git a/host_applications/linux/apps/hello_pi/hello_teapot/video.c b/host_applications/linux/apps/hello_pi/hello_teapot/video.c
index fe170331..b1844518 100644
--- a/host_applications/linux/apps/hello_pi/hello_teapot/video.c
+++ b/host_applications/linux/apps/hello_pi/hello_teapot/video.c
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "ilclient.h"
static OMX_BUFFERHEADERTYPE* eglBuffer = NULL;
diff --git a/host_applications/linux/apps/hello_pi/hello_tiger/main.c b/host_applications/linux/apps/hello_pi/hello_tiger/main.c
index 9b6b1ac2..92dbb8d4 100644
--- a/host_applications/linux/apps/hello_pi/hello_tiger/main.c
+++ b/host_applications/linux/apps/hello_pi/hello_tiger/main.c
@@ -41,13 +41,13 @@
#define UNREF(X) ((void)(X))
#ifdef HG_FLAT_INCLUDES
-# include "openvg.h"
-# include "vgu.h"
-# include "egl.h"
+# include <openvg.h>
+# include <vgu.h>
+# include <egl.h>
#else
-# include "VG/openvg.h"
-# include "VG/vgu.h"
-# include "EGL/egl.h"
+# include <VG/openvg.h>
+# include <VG/vgu.h>
+# include <EGL/egl.h>
#endif
#include "revision.h"
@@ -481,7 +481,7 @@ int main(void)
//TODO
#elif defined __RASPBERRYPI__
-#include "bcm_host.h"
+#include <bcm_host.h>
int main(void)
{
uint32_t width, height;
diff --git a/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c b/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c
index 2c36bbc0..ae8391ee 100755
--- a/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c
+++ b/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c
@@ -34,11 +34,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h>
#include <unistd.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
-#include "GLES/gl.h"
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
+#include <GLES/gl.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
#include "cube_texture_and_coords.h"
diff --git a/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c b/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c
index b1b89123..ccb4b849 100644
--- a/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c
+++ b/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c
@@ -36,11 +36,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h>
#include <unistd.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
-#include "GLES2/gl2.h"
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
+#include <GLES2/gl2.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
#include "revision.h"
diff --git a/host_applications/linux/apps/hello_pi/hello_video/video.c b/host_applications/linux/apps/hello_pi/hello_video/video.c
index 2edf44cf..1422023a 100755
--- a/host_applications/linux/apps/hello_pi/hello_video/video.c
+++ b/host_applications/linux/apps/hello_pi/hello_video/video.c
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "ilclient.h"
static int video_decode_test(char *filename)
diff --git a/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c b/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c
index e38a0643..fdd93964 100644
--- a/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c
+++ b/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c
@@ -35,11 +35,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h>
#include <unistd.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
-#include "GLES/gl.h"
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
+#include <GLES/gl.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
#include "cube_texture_and_coords.h"
diff --git a/host_applications/linux/apps/hello_pi/hello_videocube/video.c b/host_applications/linux/apps/hello_pi/hello_videocube/video.c
index fe170331..b1844518 100644
--- a/host_applications/linux/apps/hello_pi/hello_videocube/video.c
+++ b/host_applications/linux/apps/hello_pi/hello_videocube/video.c
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
-#include "bcm_host.h"
+#include <bcm_host.h>
#include "ilclient.h"
static OMX_BUFFERHEADERTYPE* eglBuffer = NULL;
diff --git a/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c b/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c
index da08ad06..dd23754c 100644
--- a/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c
+++ b/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c
@@ -47,11 +47,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <ctype.h>
#include <assert.h>
-#include "interface/vcos/vcos.h"
-#include "interface/vcos/vcos_logging.h"
-#include "interface/vmcs_host/vchost.h"
+#include <interface/vcos/vcos.h>
+#include <interface/vcos/vcos_logging.h>
+#include <interface/vmcs_host/vchost.h>
-#include "IL/OMX_Broadcom.h"
+#include <IL/OMX_Broadcom.h>
#include "ilclient.h"
#define VCOS_LOG_CATEGORY (&ilclient_log_category)
diff --git a/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h b/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h
index 5e1b10dc..3bf94446 100644
--- a/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h
+++ b/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h
@@ -43,8 +43,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _IL_CLIENT_H
#define _IL_CLIENT_H
-#include "IL/OMX_Broadcom.h"
-#include "interface/vcos/vcos.h"
+#include <IL/OMX_Broadcom.h>
+#include <interface/vcos/vcos.h>
/**
* The <DFN>ILCLIENT_T</DFN> structure encapsulates the state needed for the IL
diff --git a/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c b/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c
index 356733d6..fe404252 100644
--- a/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c
+++ b/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c
@@ -40,12 +40,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
-#include "IL/OMX_Component.h"
-#include "interface/vcos/vcos.h"
+#include <IL/OMX_Component.h>
+#include <interface/vcos/vcos.h>
-#include "interface/vmcs_host/vcilcs.h"
-#include "interface/vmcs_host/vchost.h"
-#include "interface/vmcs_host/vcilcs_common.h"
+#include <interface/vmcs_host/vcilcs.h>
+#include <interface/vmcs_host/vchost.h>
+#include <interface/vmcs_host/vcilcs_common.h>
static int coreInit = 0;
static int nActiveHandles = 0;
diff --git a/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h b/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h
index 05d94b71..b29e2cf2 100644
--- a/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h
+++ b/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h
@@ -32,13 +32,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define VCOS_LOG_CATEGORY (&gx_log_cat)
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
-#include "VG/openvg.h"
-#include "VG/vgu.h"
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <VG/openvg.h>
+#include <VG/vgu.h>
#include "vgfont.h"
-#include "bcm_host.h"
+#include <bcm_host.h>
extern VCOS_LOG_CAT_T gx_log_cat;
diff --git a/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h b/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h
index b20bb559..38e3abfb 100644
--- a/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h
+++ b/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h
@@ -31,9 +31,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define VCFTLIB_H
#include <stdint.h>
-#include "interface/vmcs_host/vc_dispservice_x_defs.h"
-#include "interface/vctypes/vc_image_types.h"
-#include "interface/vcos/vcos.h"
+#include <interface/vmcs_host/vc_dispservice_x_defs.h>
+#include <interface/vctypes/vc_image_types.h>
+#include <interface/vcos/vcos.h>
//Definitions which in certain functions can be used to mean the actual width and height of a resource, without
//having to know the data implicitly.
diff --git a/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.h b/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.h
index 4fe548d5..3169bbf4 100644
--- a/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.h
+++ b/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.h
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VGFT_H
#define VGFT_H
-#include "interface/vcos/vcos.h"
+#include <interface/vcos/vcos.h>
#include <VG/openvg.h>
#include <ft2build.h>