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
|
From 5993a7710cc8fd9a392d5015be5109987a42b498 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Thu, 23 Feb 2017 16:10:09 +0200
Subject: [PATCH] wayland: Don't commit and ship generated files
I believe shipping wayland-drm-client-protocol.h is wrong: The header
should always be generated by the wayland-scanner that matches the
runtime wayland version. Currently when someone clones the repo and
builds, the shipped version is used.
Upstream-Status: Submitted [https://github.com/01org/libva/pull/33]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
va/wayland/Makefile.am | 5 +-
va/wayland/wayland-drm-client-protocol.h | 290 -------------------------------
2 files changed, 4 insertions(+), 291 deletions(-)
delete mode 100644 va/wayland/wayland-drm-client-protocol.h
diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
index 4f8262c..4ab8d07 100644
--- a/va/wayland/Makefile.am
+++ b/va/wayland/Makefile.am
@@ -53,7 +53,7 @@ protocol_source_h = \
noinst_LTLIBRARIES = libva_wayland.la
libva_waylandincludedir = ${includedir}/va
libva_waylandinclude_HEADERS = $(source_h)
-libva_wayland_la_SOURCES = $(source_c) $(protocol_source_h)
+libva_wayland_la_SOURCES = $(source_c)
noinst_HEADERS = $(source_h_priv)
# Wayland protocol
@@ -65,5 +65,8 @@ EXTRA_DIST = \
wayland-drm.xml \
$(NULL)
+BUILT_SOURCES = $(protocol_source_h)
+CLEANFILES = $(BUILT_SOURCES)
+
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = Makefile.in
diff --git a/va/wayland/wayland-drm-client-protocol.h b/va/wayland/wayland-drm-client-protocol.h
deleted file mode 100644
index da267e8..0000000
--- a/va/wayland/wayland-drm-client-protocol.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Generated by wayland-scanner 1.11.90 */
-
-#ifndef DRM_CLIENT_PROTOCOL_H
-#define DRM_CLIENT_PROTOCOL_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @page page_drm The drm protocol
- * @section page_ifaces_drm Interfaces
- * - @subpage page_iface_wl_drm -
- * @section page_copyright_drm Copyright
- * <pre>
- *
- * Copyright © 2008-2011 Kristian Høgsberg
- * Copyright © 2010-2011 Intel Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that\n the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied
- * warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- * </pre>
- */
-struct wl_buffer;
-struct wl_drm;
-
-/**
- * @page page_iface_wl_drm wl_drm
- * @section page_iface_wl_drm_api API
- * See @ref iface_wl_drm.
- */
-/**
- * @defgroup iface_wl_drm The wl_drm interface
- */
-extern const struct wl_interface wl_drm_interface;
-
-#ifndef WL_DRM_ERROR_ENUM
-#define WL_DRM_ERROR_ENUM
-enum wl_drm_error {
- WL_DRM_ERROR_AUTHENTICATE_FAIL = 0,
- WL_DRM_ERROR_INVALID_FORMAT = 1,
- WL_DRM_ERROR_INVALID_NAME = 2,
-};
-#endif /* WL_DRM_ERROR_ENUM */
-
-#ifndef WL_DRM_FORMAT_ENUM
-#define WL_DRM_FORMAT_ENUM
-enum wl_drm_format {
- WL_DRM_FORMAT_C8 = 0x20203843,
- WL_DRM_FORMAT_RGB332 = 0x38424752,
- WL_DRM_FORMAT_BGR233 = 0x38524742,
- WL_DRM_FORMAT_XRGB4444 = 0x32315258,
- WL_DRM_FORMAT_XBGR4444 = 0x32314258,
- WL_DRM_FORMAT_RGBX4444 = 0x32315852,
- WL_DRM_FORMAT_BGRX4444 = 0x32315842,
- WL_DRM_FORMAT_ARGB4444 = 0x32315241,
- WL_DRM_FORMAT_ABGR4444 = 0x32314241,
- WL_DRM_FORMAT_RGBA4444 = 0x32314152,
- WL_DRM_FORMAT_BGRA4444 = 0x32314142,
- WL_DRM_FORMAT_XRGB1555 = 0x35315258,
- WL_DRM_FORMAT_XBGR1555 = 0x35314258,
- WL_DRM_FORMAT_RGBX5551 = 0x35315852,
- WL_DRM_FORMAT_BGRX5551 = 0x35315842,
- WL_DRM_FORMAT_ARGB1555 = 0x35315241,
- WL_DRM_FORMAT_ABGR1555 = 0x35314241,
- WL_DRM_FORMAT_RGBA5551 = 0x35314152,
- WL_DRM_FORMAT_BGRA5551 = 0x35314142,
- WL_DRM_FORMAT_RGB565 = 0x36314752,
- WL_DRM_FORMAT_BGR565 = 0x36314742,
- WL_DRM_FORMAT_RGB888 = 0x34324752,
- WL_DRM_FORMAT_BGR888 = 0x34324742,
- WL_DRM_FORMAT_XRGB8888 = 0x34325258,
- WL_DRM_FORMAT_XBGR8888 = 0x34324258,
- WL_DRM_FORMAT_RGBX8888 = 0x34325852,
- WL_DRM_FORMAT_BGRX8888 = 0x34325842,
- WL_DRM_FORMAT_ARGB8888 = 0x34325241,
- WL_DRM_FORMAT_ABGR8888 = 0x34324241,
- WL_DRM_FORMAT_RGBA8888 = 0x34324152,
- WL_DRM_FORMAT_BGRA8888 = 0x34324142,
- WL_DRM_FORMAT_XRGB2101010 = 0x30335258,
- WL_DRM_FORMAT_XBGR2101010 = 0x30334258,
- WL_DRM_FORMAT_RGBX1010102 = 0x30335852,
- WL_DRM_FORMAT_BGRX1010102 = 0x30335842,
- WL_DRM_FORMAT_ARGB2101010 = 0x30335241,
- WL_DRM_FORMAT_ABGR2101010 = 0x30334241,
- WL_DRM_FORMAT_RGBA1010102 = 0x30334152,
- WL_DRM_FORMAT_BGRA1010102 = 0x30334142,
- WL_DRM_FORMAT_YUYV = 0x56595559,
- WL_DRM_FORMAT_YVYU = 0x55595659,
- WL_DRM_FORMAT_UYVY = 0x59565955,
- WL_DRM_FORMAT_VYUY = 0x59555956,
- WL_DRM_FORMAT_AYUV = 0x56555941,
- WL_DRM_FORMAT_NV12 = 0x3231564e,
- WL_DRM_FORMAT_NV21 = 0x3132564e,
- WL_DRM_FORMAT_NV16 = 0x3631564e,
- WL_DRM_FORMAT_NV61 = 0x3136564e,
- WL_DRM_FORMAT_YUV410 = 0x39565559,
- WL_DRM_FORMAT_YVU410 = 0x39555659,
- WL_DRM_FORMAT_YUV411 = 0x31315559,
- WL_DRM_FORMAT_YVU411 = 0x31315659,
- WL_DRM_FORMAT_YUV420 = 0x32315559,
- WL_DRM_FORMAT_YVU420 = 0x32315659,
- WL_DRM_FORMAT_YUV422 = 0x36315559,
- WL_DRM_FORMAT_YVU422 = 0x36315659,
- WL_DRM_FORMAT_YUV444 = 0x34325559,
- WL_DRM_FORMAT_YVU444 = 0x34325659,
-};
-#endif /* WL_DRM_FORMAT_ENUM */
-
-#ifndef WL_DRM_CAPABILITY_ENUM
-#define WL_DRM_CAPABILITY_ENUM
-/**
- * @ingroup iface_wl_drm
- * wl_drm capability bitmask
- *
- * Bitmask of capabilities.
- */
-enum wl_drm_capability {
- /**
- * wl_drm prime available
- */
- WL_DRM_CAPABILITY_PRIME = 1,
-};
-#endif /* WL_DRM_CAPABILITY_ENUM */
-
-/**
- * @ingroup iface_wl_drm
- * @struct wl_drm_listener
- */
-struct wl_drm_listener {
- /**
- */
- void (*device)(void *data,
- struct wl_drm *wl_drm,
- const char *name);
- /**
- */
- void (*format)(void *data,
- struct wl_drm *wl_drm,
- uint32_t format);
- /**
- */
- void (*authenticated)(void *data,
- struct wl_drm *wl_drm);
- /**
- */
- void (*capabilities)(void *data,
- struct wl_drm *wl_drm,
- uint32_t value);
-};
-
-/**
- * @ingroup wl_drm_iface
- */
-static inline int
-wl_drm_add_listener(struct wl_drm *wl_drm,
- const struct wl_drm_listener *listener, void *data)
-{
- return wl_proxy_add_listener((struct wl_proxy *) wl_drm,
- (void (**)(void)) listener, data);
-}
-
-#define WL_DRM_AUTHENTICATE 0
-#define WL_DRM_CREATE_BUFFER 1
-#define WL_DRM_CREATE_PLANAR_BUFFER 2
-#define WL_DRM_CREATE_PRIME_BUFFER 3
-
-/**
- * @ingroup iface_wl_drm
- */
-#define WL_DRM_AUTHENTICATE_SINCE_VERSION 1
-/**
- * @ingroup iface_wl_drm
- */
-#define WL_DRM_CREATE_BUFFER_SINCE_VERSION 1
-/**
- * @ingroup iface_wl_drm
- */
-#define WL_DRM_CREATE_PLANAR_BUFFER_SINCE_VERSION 1
-/**
- * @ingroup iface_wl_drm
- */
-#define WL_DRM_CREATE_PRIME_BUFFER_SINCE_VERSION 2
-
-/** @ingroup iface_wl_drm */
-static inline void
-wl_drm_set_user_data(struct wl_drm *wl_drm, void *user_data)
-{
- wl_proxy_set_user_data((struct wl_proxy *) wl_drm, user_data);
-}
-
-/** @ingroup iface_wl_drm */
-static inline void *
-wl_drm_get_user_data(struct wl_drm *wl_drm)
-{
- return wl_proxy_get_user_data((struct wl_proxy *) wl_drm);
-}
-
-static inline uint32_t
-wl_drm_get_version(struct wl_drm *wl_drm)
-{
- return wl_proxy_get_version((struct wl_proxy *) wl_drm);
-}
-
-/** @ingroup iface_wl_drm */
-static inline void
-wl_drm_destroy(struct wl_drm *wl_drm)
-{
- wl_proxy_destroy((struct wl_proxy *) wl_drm);
-}
-
-/**
- * @ingroup iface_wl_drm
- */
-static inline void
-wl_drm_authenticate(struct wl_drm *wl_drm, uint32_t id)
-{
- wl_proxy_marshal((struct wl_proxy *) wl_drm,
- WL_DRM_AUTHENTICATE, id);
-}
-
-/**
- * @ingroup iface_wl_drm
- */
-static inline struct wl_buffer *
-wl_drm_create_buffer(struct wl_drm *wl_drm, uint32_t name, int32_t width, int32_t height, uint32_t stride, uint32_t format)
-{
- struct wl_proxy *id;
-
- id = wl_proxy_marshal_constructor((struct wl_proxy *) wl_drm,
- WL_DRM_CREATE_BUFFER, &wl_buffer_interface, NULL, name, width, height, stride, format);
-
- return (struct wl_buffer *) id;
-}
-
-/**
- * @ingroup iface_wl_drm
- */
-static inline struct wl_buffer *
-wl_drm_create_planar_buffer(struct wl_drm *wl_drm, uint32_t name, int32_t width, int32_t height, uint32_t format, int32_t offset0, int32_t stride0, int32_t offset1, int32_t stride1, int32_t offset2, int32_t stride2)
-{
- struct wl_proxy *id;
-
- id = wl_proxy_marshal_constructor((struct wl_proxy *) wl_drm,
- WL_DRM_CREATE_PLANAR_BUFFER, &wl_buffer_interface, NULL, name, width, height, format, offset0, stride0, offset1, stride1, offset2, stride2);
-
- return (struct wl_buffer *) id;
-}
-
-/**
- * @ingroup iface_wl_drm
- */
-static inline struct wl_buffer *
-wl_drm_create_prime_buffer(struct wl_drm *wl_drm, int32_t name, int32_t width, int32_t height, uint32_t format, int32_t offset0, int32_t stride0, int32_t offset1, int32_t stride1, int32_t offset2, int32_t stride2)
-{
- struct wl_proxy *id;
-
- id = wl_proxy_marshal_constructor((struct wl_proxy *) wl_drm,
- WL_DRM_CREATE_PRIME_BUFFER, &wl_buffer_interface, NULL, name, width, height, format, offset0, stride0, offset1, stride1, offset2, stride2);
-
- return (struct wl_buffer *) id;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--
2.1.4
|
