Skip to content

Commit 0340bca

Browse files
committed
va: remove older 0.32 and 0.33 support
libva version 2.x should be compatible with 2.x series , not 1.x series and 0.x series reserve va_compat.h , because maybe some existing usage refer this file Signed-off-by: Carl Zhang <carl.zhang@intel.com>
1 parent 1b7d71f commit 0340bca

File tree

5 files changed

+1
-138
lines changed

5 files changed

+1
-138
lines changed

va/Makefile.am

-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ LDADD = \
3232

3333
libva_source_c = \
3434
va.c \
35-
va_compat.c \
3635
va_str.c \
3736
va_trace.c \
3837
$(NULL)
@@ -75,7 +74,6 @@ libva_source_h_priv = \
7574

7675
libva_ldflags = \
7776
$(LDADD) -no-undefined \
78-
-Wl,-version-script,${srcdir}/libva.syms \
7977
$(NULL)
8078

8179
libva_cflags = \
@@ -91,7 +89,6 @@ noinst_HEADERS = $(libva_source_h_priv)
9189
libva_la_SOURCES = $(libva_source_c)
9290
libva_la_CFLAGS = $(libva_cflags)
9391
libva_la_LDFLAGS = $(libva_ldflags)
94-
libva_la_DEPENDENCIES = libva.syms
9592
libva_la_LIBADD = $(LIBVA_LIBS)
9693

9794
if USE_DRM
@@ -146,7 +143,6 @@ DISTCLEANFILES = \
146143
$(NULL)
147144

148145
EXTRA_DIST = \
149-
libva.syms \
150146
va_version.h.in \
151147
meson.build \
152148
libva.def \

va/libva.syms

-9
This file was deleted.

va/meson.build

-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ version_file = configure_file(
1111

1212
libva_sources = [
1313
'va.c',
14-
'va_compat.c',
1514
'va_str.c',
1615
'va_trace.c',
1716
]
@@ -55,15 +54,8 @@ libva_headers_priv = [
5554
'va_trace.h',
5655
]
5756

58-
libva_sym = 'libva.syms'
59-
libva_sym_arg = '-Wl,-version-script,' + '@0@/@1@'.format(meson.current_source_dir(), libva_sym)
60-
6157
libva_link_args = []
6258
libva_link_depends = []
63-
if cc.links('', name: '-Wl,--version-script', args: ['-shared', libva_sym_arg])
64-
libva_link_args = libva_sym_arg
65-
libva_link_depends = libva_sym
66-
endif
6759

6860
install_headers(libva_headers, subdir : 'va')
6961

va/va_compat.c

-45
This file was deleted.

va/va_compat.h

+1-72
Original file line numberDiff line numberDiff line change
@@ -36,78 +36,7 @@
3636
extern "C" {
3737
#endif
3838

39-
/**
40-
* \defgroup api_compat Compatibility API
41-
*
42-
* The Compatibility API allows older programs that are not ported to
43-
* the current API to still build and run correctly. In particular,
44-
* this exposes older API to allow for backwards source compatibility.
45-
*
46-
* @{
47-
*/
48-
49-
/**
50-
* Makes a string literal out of the macro argument
51-
*/
52-
#define VA_CPP_HELPER_STRINGIFY(x) \
53-
VA_CPP_HELPER_STRINGIFY_(x)
54-
#define VA_CPP_HELPER_STRINGIFY_(x) \
55-
#x
56-
57-
/**
58-
* Concatenates two macro arguments at preprocessing time.
59-
*/
60-
#define VA_CPP_HELPER_CONCAT(a, b) \
61-
VA_CPP_HELPER_CONCAT_(a, b)
62-
#define VA_CPP_HELPER_CONCAT_(a, b) \
63-
a ## b
64-
65-
/**
66-
* Generates the number of macro arguments at preprocessing time.
67-
* <http://groups.google.com/group/comp.std.c/browse_thread/thread/77ee8c8f92e4a3fb/346fc464319b1ee5>
68-
*
69-
* Note: this doesn't work for macros with no arguments
70-
*/
71-
#define VA_CPP_HELPER_N_ARGS(...) \
72-
VA_CPP_HELPER_N_ARGS_(__VA_ARGS__, VA_CPP_HELPER_N_ARGS_LIST_REV())
73-
#define VA_CPP_HELPER_N_ARGS_(...) \
74-
VA_CPP_HELPER_N_ARGS_LIST(__VA_ARGS__)
75-
#define VA_CPP_HELPER_N_ARGS_LIST(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a12, a13, a14, a15, a16, N, ...) N
76-
#define VA_CPP_HELPER_N_ARGS_LIST_REV() \
77-
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
78-
79-
/**
80-
* Generates a versioned function alias.
81-
*
82-
* VA_CPP_HELPER_ALIAS(vaSomeFunction, 0,32,0) will generate
83-
* .symber vaSomeFunction_0_32_0, vaSomeFunction@VA_API_0.32.0
84-
*/
85-
#define VA_CPP_HELPER_ALIAS(func, major, minor, micro) \
86-
VA_CPP_HELPER_ALIAS_(func, major, minor, micro, "@")
87-
#define VA_CPP_HELPER_ALIAS_DEFAULT(func, major, minor, micro) \
88-
VA_CPP_HELPER_ALIAS_(func, major, minor, micro, "@@")
89-
#define VA_CPP_HELPER_ALIAS_(func, major, minor, micro, binding) \
90-
asm(".symver " #func "_" #major "_" #minor "_" #micro ", " \
91-
#func binding "VA_API_" #major "." #minor "." #micro)
92-
93-
/* vaCreateSurfaces() */
94-
95-
#ifndef VA_COMPAT_DISABLED
96-
#define vaCreateSurfaces(dpy, ...) \
97-
VA_CPP_HELPER_CONCAT(vaCreateSurfaces, \
98-
VA_CPP_HELPER_N_ARGS(dpy, __VA_ARGS__)) \
99-
(dpy, __VA_ARGS__)
100-
#endif
101-
102-
#define vaCreateSurfaces6(dpy, width, height, format, num_surfaces, surfaces) \
103-
(vaCreateSurfaces)(dpy, format, width, height, surfaces, num_surfaces, \
104-
NULL, 0)
105-
106-
#define vaCreateSurfaces8(dpy, format, width, height, surfaces, num_surfaces, attribs, num_attribs) \
107-
(vaCreateSurfaces)(dpy, format, width, height, surfaces, num_surfaces, \
108-
attribs, num_attribs)
109-
110-
/*@}*/
39+
#warning deprecated, keep a empty file because some application may include it
11140

11241
#ifdef __cplusplus
11342
}

0 commit comments

Comments
 (0)