Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libva
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
libva
Commits
2162a793
Commit
2162a793
authored
Jul 08, 2009
by
Gwenole Beauchesne
Committed by
Austin Yuan
Aug 14, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explicit API extensions versioning from SDS.
Signed-off-by:
Austin Yuan
<
shengquan.yuan@intel.com
>
parent
a2523fec
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
configure.ac
configure.ac
+7
-1
src/va.c
src/va.c
+6
-0
src/va_version.h.in
src/va_version.h.in
+8
-1
No files found.
configure.ac
View file @
2162a793
...
@@ -28,6 +28,9 @@ m4_define([libva_micro_version], [4])
...
@@ -28,6 +28,9 @@ m4_define([libva_micro_version], [4])
m4_define([libva_version],
m4_define([libva_version],
[libva_major_version.libva_minor_version.libva_micro_version])
[libva_major_version.libva_minor_version.libva_micro_version])
# increase this number for each API change
m4_define([libva_sds_version], [2])
# if the library source code has changed, increment revision
# if the library source code has changed, increment revision
m4_define([libva_lt_revision], [0])
m4_define([libva_lt_revision], [0])
# if any interface was added/removed/changed, then inc current, reset revision
# if any interface was added/removed/changed, then inc current, reset revision
...
@@ -52,11 +55,14 @@ AC_SUBST(LIBVA_MINOR_VERSION)
...
@@ -52,11 +55,14 @@ AC_SUBST(LIBVA_MINOR_VERSION)
AC_SUBST(LIBVA_MICRO_VERSION)
AC_SUBST(LIBVA_MICRO_VERSION)
AC_SUBST(LIBVA_VERSION)
AC_SUBST(LIBVA_VERSION)
LIBVA_SDS_VERSION=libva_sds_version
AC_SUBST(LIBVA_SDS_VERSION)
LIBVA_LT_CURRENT=libva_lt_current
LIBVA_LT_CURRENT=libva_lt_current
LIBVA_LT_REV=libva_lt_revision
LIBVA_LT_REV=libva_lt_revision
LIBVA_LT_AGE=libva_lt_age
LIBVA_LT_AGE=libva_lt_age
LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION -release $LIBVA_VERSION"
LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION -release $LIBVA_VERSION
.$LIBVA_SDS_VERSION
"
AC_SUBST(LIBVA_LT_VERSION)
AC_SUBST(LIBVA_LT_VERSION)
AC_SUBST(LIBVA_LT_LDFLAGS)
AC_SUBST(LIBVA_LT_LDFLAGS)
...
...
src/va.c
View file @
2162a793
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
#define DRIVER_INIT_FUNC "__vaDriverInit_0_30"
#define DRIVER_INIT_FUNC "__vaDriverInit_0_30"
#define DRIVER_INIT_FUNC_SDS "__vaDriverInit_0_30_sds"
#define DRIVER_EXTENSION "_drv_video.so"
#define DRIVER_EXTENSION "_drv_video.so"
...
@@ -165,6 +166,11 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
...
@@ -165,6 +166,11 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
VADriverInit
init_func
;
VADriverInit
init_func
;
init_func
=
(
VADriverInit
)
dlsym
(
handle
,
DRIVER_INIT_FUNC
);
init_func
=
(
VADriverInit
)
dlsym
(
handle
,
DRIVER_INIT_FUNC
);
if
(
!
init_func
)
if
(
!
init_func
)
{
/* Then try SDS extensions (VDPAU and XvBA backends) */
init_func
=
(
VADriverInit
)
dlsym
(
handle
,
DRIVER_INIT_FUNC_SDS
);
}
if
(
!
init_func
)
{
{
va_errorMessage
(
"%s has no function %s
\n
"
,
driver_path
,
DRIVER_INIT_FUNC
);
va_errorMessage
(
"%s has no function %s
\n
"
,
driver_path
,
DRIVER_INIT_FUNC
);
dlclose
(
handle
);
dlclose
(
handle
);
...
...
src/va_version.h.in
View file @
2162a793
...
@@ -46,6 +46,13 @@
...
@@ -46,6 +46,13 @@
*/
*/
#define VA_MICRO_VERSION (@LIBVA_MICRO_VERSION@)
#define VA_MICRO_VERSION (@LIBVA_MICRO_VERSION@)
/**
* VA_SDS_VERSION:
*
* The version of the SDS API extensions to the VA library
*/
#define VA_SDS_VERSION (@LIBVA_SDS_VERSION@)
/**
/**
* VA_VERSION:
* VA_VERSION:
*
*
...
@@ -59,7 +66,7 @@
...
@@ -59,7 +66,7 @@
* The full version of the VA library, in string form (suited for
* The full version of the VA library, in string form (suited for
* string concatenation)
* string concatenation)
*/
*/
#define VA_VERSION_S "@LIBVA_VERSION@"
#define VA_VERSION_S "@LIBVA_VERSION@
-sds@LIBVA_SDS_VERSION@
"
/**
/**
* VA_VERSION_HEX:
* VA_VERSION_HEX:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment