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>
intel · May 31, 2024 · 0340bca · 0340bca
1 parent 1b7d71f
commit 0340bca
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 138 deletions.
diff --git a/va/Makefile.am b/va/Makefile.am
@@ -32,7 +32,6 @@ LDADD = \
 
 libva_source_c = \
 	va.c			\
-	va_compat.c		\
 	va_str.c		\
 	va_trace.c		\
 	$(NULL)
@@ -75,7 +74,6 @@ libva_source_h_priv = \
 
 libva_ldflags = \
 	$(LDADD) -no-undefined	\
-	-Wl,-version-script,${srcdir}/libva.syms \
 	$(NULL)
 
 libva_cflags = \
@@ -91,7 +89,6 @@ noinst_HEADERS			= $(libva_source_h_priv)
 libva_la_SOURCES		= $(libva_source_c)
 libva_la_CFLAGS			= $(libva_cflags)
 libva_la_LDFLAGS		= $(libva_ldflags)
-libva_la_DEPENDENCIES		= libva.syms
 libva_la_LIBADD			= $(LIBVA_LIBS)
 
 if USE_DRM
@@ -146,7 +143,6 @@ DISTCLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	libva.syms		\
 	va_version.h.in		\
 	meson.build		\
         libva.def               \

diff --git a/va/libva.syms b/va/libva.syms
diff --git a/va/meson.build b/va/meson.build
@@ -11,7 +11,6 @@ version_file = configure_file(
 
 libva_sources = [
   'va.c',
-  'va_compat.c',
   'va_str.c',
   'va_trace.c',
 ]
@@ -55,15 +54,8 @@ libva_headers_priv = [
   'va_trace.h',
 ]
 
-libva_sym = 'libva.syms'
-libva_sym_arg = '-Wl,-version-script,' + '@0@/@1@'.format(meson.current_source_dir(), libva_sym)
-
 libva_link_args = []
 libva_link_depends = []
-if cc.links('', name: '-Wl,--version-script', args: ['-shared', libva_sym_arg])
-  libva_link_args = libva_sym_arg
-  libva_link_depends = libva_sym
-endif
 
 install_headers(libva_headers, subdir : 'va')
 

diff --git a/va/va_compat.c b/va/va_compat.c
diff --git a/va/va_compat.h b/va/va_compat.h
@@ -36,78 +36,7 @@
 extern "C" {
 #endif
 
-/**
- * \defgroup api_compat Compatibility API
- *
- * The Compatibility API allows older programs that are not ported to
- * the current API to still build and run correctly. In particular,
- * this exposes older API to allow for backwards source compatibility.
- *
- * @{
- */
-
-/**
- * Makes a string literal out of the macro argument
- */
-#define VA_CPP_HELPER_STRINGIFY(x) \
-    VA_CPP_HELPER_STRINGIFY_(x)
-#define VA_CPP_HELPER_STRINGIFY_(x) \
-    #x
-
-/**
- * Concatenates two macro arguments at preprocessing time.
- */
-#define VA_CPP_HELPER_CONCAT(a, b) \
-    VA_CPP_HELPER_CONCAT_(a, b)
-#define VA_CPP_HELPER_CONCAT_(a, b) \
-    a ## b
-
-/**
- * Generates the number of macro arguments at preprocessing time.
- * <http://groups.google.com/group/comp.std.c/browse_thread/thread/77ee8c8f92e4a3fb/346fc464319b1ee5>
- *
- * Note: this doesn't work for macros with no arguments
- */
-#define VA_CPP_HELPER_N_ARGS(...) \
-    VA_CPP_HELPER_N_ARGS_(__VA_ARGS__, VA_CPP_HELPER_N_ARGS_LIST_REV())
-#define VA_CPP_HELPER_N_ARGS_(...) \
-    VA_CPP_HELPER_N_ARGS_LIST(__VA_ARGS__)
-#define VA_CPP_HELPER_N_ARGS_LIST(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a12, a13, a14, a15, a16, N, ...) N
-#define VA_CPP_HELPER_N_ARGS_LIST_REV() \
-    15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-
-/**
- * Generates a versioned function alias.
- *
- * VA_CPP_HELPER_ALIAS(vaSomeFunction, 0,32,0) will generate
- *   .symber vaSomeFunction_0_32_0, vaSomeFunction@VA_API_0.32.0
- */
-#define VA_CPP_HELPER_ALIAS(func, major, minor, micro) \
-    VA_CPP_HELPER_ALIAS_(func, major, minor, micro, "@")
-#define VA_CPP_HELPER_ALIAS_DEFAULT(func, major, minor, micro) \
-    VA_CPP_HELPER_ALIAS_(func, major, minor, micro, "@@")
-#define VA_CPP_HELPER_ALIAS_(func, major, minor, micro, binding)        \
-    asm(".symver " #func "_" #major "_" #minor "_" #micro ", "          \
-        #func binding "VA_API_" #major "." #minor "." #micro)
-
-/* vaCreateSurfaces() */
-
-#ifndef VA_COMPAT_DISABLED
-#define vaCreateSurfaces(dpy, ...)                                      \
-    VA_CPP_HELPER_CONCAT(vaCreateSurfaces,                              \
-                         VA_CPP_HELPER_N_ARGS(dpy, __VA_ARGS__))        \
-    (dpy, __VA_ARGS__)
-#endif
-
-#define vaCreateSurfaces6(dpy, width, height, format, num_surfaces, surfaces) \
-    (vaCreateSurfaces)(dpy, format, width, height, surfaces, num_surfaces, \
-                       NULL, 0)
-
-#define vaCreateSurfaces8(dpy, format, width, height, surfaces, num_surfaces, attribs, num_attribs) \
-    (vaCreateSurfaces)(dpy, format, width, height, surfaces, num_surfaces, \
-                       attribs, num_attribs)
-
-/*@}*/
+#warning deprecated, keep a empty file because some application may include it
 
 #ifdef __cplusplus
 }