Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 4937e0d9d49c5a73a597c517d123d211d740c9c2 / . / meta-raspberrypi / recipes-graphics / raspidmx / raspidmx / 0004-add-libvchostif-to-link.patch
blob: 908be62cffa7b3e04c1477a93f520a9429544c72 [file] [log] [blame]
Andrew Geissler15ad1112021-01-08 16:09:43 -0600[diff] [blame]1From bde71fc22bde61ef8fe319c60f478ec370f5bc5d Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <twoerner@gmail.com>
3Date: Fri, 4 Dec 2020 02:13:39 -0500
4Subject: [PATCH] add libvchostif to link
5
6I end up with link errors of the type:
7
8 libvchostif.so: error adding symbols: DSO missing from command line
9
10Which is caused by not having -lvchostif in the link.
11
12Upstream-status: submitted [https://github.com/AndrewFromMelbourne/raspidmx/pull/29]
13Signed-off-by: Trevor Woerner <twoerner@gmail.com>
14---
15 game/Makefile | 2 +-
16 life/Makefile | 2 +-
17 mandelbrot/Makefile | 2 +-
18 offscreen/Makefile | 2 +-
19 pngview/Makefile | 2 +-
20 radar_sweep/Makefile | 2 +-
21 radar_sweep_alpha/Makefile | 2 +-
22 rgb_triangle/Makefile | 2 +-
23 spriteview/Makefile | 2 +-
24 test_pattern/Makefile | 2 +-
25 worms/Makefile | 2 +-
26 11 files changed, 11 insertions(+), 11 deletions(-)
27
28diff --git a/game/Makefile b/game/Makefile
29index 0a90a38..b756fa2 100644
30--- a/game/Makefile
31+++ b/game/Makefile
32@@ -2,7 +2,7 @@ OBJS=main.o
33 BIN=game
34
35 CFLAGS+=-Wall -g -O3 -I../common $(shell pkg-config --cflags libpng)
36-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
37+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
38
39 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
40
41diff --git a/life/Makefile b/life/Makefile
42index 44f1edb..2addf69 100644
43--- a/life/Makefile
44+++ b/life/Makefile
45@@ -2,7 +2,7 @@ OBJS=main.o life.o info.o
46 BIN=life
47
48 CFLAGS+=-Wall -g -O3 -I../common
49-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -L../lib -lraspidmx
50+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -L../lib -lraspidmx
51
52 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
53
54diff --git a/mandelbrot/Makefile b/mandelbrot/Makefile
55index 82910bb..31097f2 100644
56--- a/mandelbrot/Makefile
57+++ b/mandelbrot/Makefile
58@@ -2,7 +2,7 @@ OBJS=main.o mandelbrot.o info.o
59 BIN=mandelbrot
60
61 CFLAGS+=-Wall -g -O3 -I../common $(shell pkg-config --cflags libpng)
62-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
63+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
64
65 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
66
67diff --git a/offscreen/Makefile b/offscreen/Makefile
68index 0120796..4f13fd0 100644
69--- a/offscreen/Makefile
70+++ b/offscreen/Makefile
71@@ -2,7 +2,7 @@ OBJS=pngresize.o resizeDispmanX.o
72 BIN=pngresize
73
74 CFLAGS+=-Wall -g -O3 -I../common $(shell pkg-config --cflags libpng)
75-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
76+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
77
78 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
79
80diff --git a/pngview/Makefile b/pngview/Makefile
81index 71a5d76..cce8d63 100644
82--- a/pngview/Makefile
83+++ b/pngview/Makefile
84@@ -2,7 +2,7 @@ OBJS=pngview.o
85 BIN=pngview
86
87 CFLAGS+=-Wall -g -O3 -I../common $(shell pkg-config --cflags libpng)
88-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
89+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
90
91 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
92
93diff --git a/radar_sweep/Makefile b/radar_sweep/Makefile
94index 5f814b7..aa1d32c 100644
95--- a/radar_sweep/Makefile
96+++ b/radar_sweep/Makefile
97@@ -2,7 +2,7 @@ OBJS=radar_sweep.o
98 BIN=radar_sweep
99
100 CFLAGS+=-Wall -O3 -g -I../common
101-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm -L../lib -lraspidmx
102+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm -L../lib -lraspidmx
103
104 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
105
106diff --git a/radar_sweep_alpha/Makefile b/radar_sweep_alpha/Makefile
107index f66c338..571d47b 100644
108--- a/radar_sweep_alpha/Makefile
109+++ b/radar_sweep_alpha/Makefile
110@@ -2,7 +2,7 @@ OBJS=radar_sweep_alpha.o
111 BIN=radar_sweep_alpha
112
113 CFLAGS+=-Wall -O3 -g -I../common
114-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm -L../lib -lraspidmx
115+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm -L../lib -lraspidmx
116
117 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
118
119diff --git a/rgb_triangle/Makefile b/rgb_triangle/Makefile
120index 2ce779d..0266715 100644
121--- a/rgb_triangle/Makefile
122+++ b/rgb_triangle/Makefile
123@@ -2,7 +2,7 @@ OBJS=rgb_triangle.o
124 BIN=rgb_triangle
125
126 CFLAGS+=-Wall -O3 -g -I../common
127-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm -L../lib -lraspidmx
128+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm -L../lib -lraspidmx
129
130 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
131
132diff --git a/spriteview/Makefile b/spriteview/Makefile
133index 904c1e8..d2fb3c8 100644
134--- a/spriteview/Makefile
135+++ b/spriteview/Makefile
136@@ -2,7 +2,7 @@ OBJS=spriteview.o
137 BIN=spriteview
138
139 CFLAGS+=-Wall -g -O3 -I../common $(shell pkg-config --cflags libpng)
140-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
141+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm $(shell pkg-config --libs libpng) -L../lib -lraspidmx -lraspidmxPng
142
143 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
144
145diff --git a/test_pattern/Makefile b/test_pattern/Makefile
146index 1e02b0a..c231fb6 100644
147--- a/test_pattern/Makefile
148+++ b/test_pattern/Makefile
149@@ -2,7 +2,7 @@ OBJS=test_pattern.o
150 BIN=test_pattern
151
152 CFLAGS+=-Wall -g -O3 -I../common
153-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm -L../lib -lraspidmx
154+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm -L../lib -lraspidmx
155
156 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
157
158diff --git a/worms/Makefile b/worms/Makefile
159index c249c8c..3b6c830 100644
160--- a/worms/Makefile
161+++ b/worms/Makefile
162@@ -2,7 +2,7 @@ OBJS=main.o worms.o
163 BIN=worms
164
165 CFLAGS+=-Wall -g -O3 -I../common
166-LDFLAGS+=-L/opt/vc/lib/ -lbcm_host -lm -L../lib -lraspidmx
167+LDFLAGS+=-L/opt/vc/lib/ -lvchostif -lbcm_host -lm -L../lib -lraspidmx
168
169 INCLUDES+=-I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
170