From 50615dd0c9bf0d518327455b2f5cf73ae301f312 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 18 Sep 2014 17:30:32 +0100
Subject: va: hide most private va_Trace* symbols

Hide all but va_TracePutSurface symbols from the user.
The latter one is used internally by va_x11 and va_android.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit ccd93de5a707e92a629cccd595757c8d436fa3cc)
---
 va/va_fool.c  |  1 +
 va/va_trace.c |  6 +++---
 va/va_trace.h | 26 ++++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/va/va_fool.c b/va/va_fool.c
index 9f7a045..8dbe8dd 100644
--- a/va/va_fool.c
+++ b/va/va_fool.c
@@ -23,6 +23,7 @@
  */
 
 #define _GNU_SOURCE 1
+#include "sysdeps.h"
 #include "va.h"
 #include "va_backend.h"
 #include "va_trace.h"
diff --git a/va/va_trace.c b/va/va_trace.c
index 7461467..c6c5b9a 100644
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -24,6 +24,7 @@
  */
 
 #define _GNU_SOURCE 1
+#include "sysdeps.h"
 #include "va.h"
 #include "va_enc_h264.h"
 #include "va_backend.h"
@@ -260,8 +261,7 @@ void va_TraceEnd(VADisplay dpy)
     ((VADisplayContextP)dpy)->vatrace = NULL;
 }
 
-
-void va_TraceMsg(struct trace_context *trace_ctx, const char *msg, ...)
+static void va_TraceMsg(struct trace_context *trace_ctx, const char *msg, ...)
 {
     va_list args;
 
@@ -282,7 +282,7 @@ void va_TraceMsg(struct trace_context *trace_ctx, const char *msg, ...)
 }
 
 
-void va_TraceSurface(VADisplay dpy)
+static void va_TraceSurface(VADisplay dpy)
 {
     unsigned int i, j;
     unsigned int fourcc; /* following are output argument */
diff --git a/va/va_trace.h b/va/va_trace.h
index b2182b0..677234c 100644
--- a/va/va_trace.h
+++ b/va/va_trace.h
@@ -52,19 +52,24 @@ extern int trace_flag;
         trace_func(__VA_ARGS__);                \
     }
 
+DLL_HIDDEN
 void va_TraceInit(VADisplay dpy);
+DLL_HIDDEN
 void va_TraceEnd(VADisplay dpy);
 
+DLL_HIDDEN
 void va_TraceInitialize (
     VADisplay dpy,
     int *major_version,	 /* out */
     int *minor_version 	 /* out */
 );
 
+DLL_HIDDEN
 void va_TraceTerminate (
     VADisplay dpy
 );
 
+DLL_HIDDEN
 void va_TraceCreateConfig(
     VADisplay dpy,
     VAProfile profile, 
@@ -74,6 +79,7 @@ void va_TraceCreateConfig(
     VAConfigID *config_id /* out */
 );
 
+DLL_HIDDEN
 void va_TraceCreateSurfaces(
     VADisplay dpy,
     int width,
@@ -85,12 +91,14 @@ void va_TraceCreateSurfaces(
     unsigned int        num_attribs
 );
 
+DLL_HIDDEN
 void va_TraceDestroySurfaces(
     VADisplay dpy,
     VASurfaceID *surface_list,
     int num_surfaces
 );
-    
+
+DLL_HIDDEN
 void va_TraceCreateContext(
     VADisplay dpy,
     VAConfigID config_id,
@@ -102,6 +110,7 @@ void va_TraceCreateContext(
     VAContextID *context		/* out */
 );
 
+DLL_HIDDEN
 void va_TraceCreateBuffer (
     VADisplay dpy,
     VAContextID context,	/* in */
@@ -111,12 +120,14 @@ void va_TraceCreateBuffer (
     void *data,			/* in */
     VABufferID *buf_id		/* out */
 );
-    
+
+DLL_HIDDEN
 void va_TraceDestroyBuffer (
     VADisplay dpy,
     VABufferID buf_id    /* in */
 );
 
+DLL_HIDDEN
 void va_TraceMapBuffer (
     VADisplay dpy,
     VABufferID buf_id,	/* in */
@@ -124,12 +135,14 @@ void va_TraceMapBuffer (
 );
 
 
+DLL_HIDDEN
 void va_TraceBeginPicture(
     VADisplay dpy,
     VAContextID context,
     VASurfaceID render_target
 );
 
+DLL_HIDDEN
 void va_TraceRenderPicture(
     VADisplay dpy,
     VAContextID context,
@@ -137,17 +150,20 @@ void va_TraceRenderPicture(
     int num_buffers
 );
 
+DLL_HIDDEN
 void va_TraceEndPicture(
     VADisplay dpy,
     VAContextID context,
     int endpic_done
 );
 
+DLL_HIDDEN
 void va_TraceSyncSurface(
     VADisplay dpy,
     VASurfaceID render_target
 );
 
+DLL_HIDDEN
 void va_TraceQuerySurfaceAttributes(
     VADisplay           dpy,
     VAConfigID          config,
@@ -155,12 +171,14 @@ void va_TraceQuerySurfaceAttributes(
     unsigned int       *num_attribs
 );
 
+DLL_HIDDEN
 void va_TraceQuerySurfaceStatus(
     VADisplay dpy,
     VASurfaceID render_target,
     VASurfaceStatus *status	/* out */
 );
 
+DLL_HIDDEN
 void va_TraceQuerySurfaceError(
 	VADisplay dpy,
 	VASurfaceID surface,
@@ -169,23 +187,27 @@ void va_TraceQuerySurfaceError(
 );
 
 
+DLL_HIDDEN
 void va_TraceMaxNumDisplayAttributes (
     VADisplay dpy,
     int number
 );
 
+DLL_HIDDEN
 void va_TraceQueryDisplayAttributes (
     VADisplay dpy,
     VADisplayAttribute *attr_list,	/* out */
     int *num_attributes			/* out */
 );
 
+DLL_HIDDEN
 void va_TraceGetDisplayAttributes (
     VADisplay dpy,
     VADisplayAttribute *attr_list,
     int num_attributes
 );
 
+DLL_HIDDEN
 void va_TraceSetDisplayAttributes (
     VADisplay dpy,
     VADisplayAttribute *attr_list,
-- 
cgit v1.2.1