summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2010-12-02 09:12:28 +0000
committerGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2010-12-02 09:12:28 +0000
commit234a2289e14b37c789c8906e6bd6eedfbc7089f3 (patch)
treead57063e38ab004ca2dbeb47269eb33648e62297
parent8e62c3f39453c3bf32f81a110e50b4a1af78016c (diff)
Add pre-versioning support.
-rw-r--r--configure.ac5
-rw-r--r--src/vdpau_driver.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index e3b5a40..f02b6f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,12 @@
m4_define([vdpau_video_major_version], [0])
m4_define([vdpau_video_minor_version], [7])
m4_define([vdpau_video_micro_version], [3])
+m4_define([vdpau_video_pre_version], [1])
m4_define([vdpau_video_version],
[vdpau_video_major_version.vdpau_video_minor_version.vdpau_video_micro_version])
+m4_if(vdpau_video_pre_version, [0], [], [
+m4_append([vdpau_video_version], vdpau_video_pre_version, [.pre])
+])
# libva package version number
m4_define([libva_sds_version_0_29], [8])
@@ -38,6 +42,7 @@ VDPAU_VIDEO_MICRO_VERSION=vdpau_video_micro_version
AC_DEFINE([VDPAU_VIDEO_MAJOR_VERSION], [vdpau_video_major_version], [Major version of the driver])
AC_DEFINE([VDPAU_VIDEO_MINOR_VERSION], [vdpau_video_minor_version], [Minor version of the driver])
AC_DEFINE([VDPAU_VIDEO_MICRO_VERSION], [vdpau_video_micro_version], [Micro version of the driver])
+AC_DEFINE([VDPAU_VIDEO_PRE_VERSION], [vdpau_video_pre_version], [Preversion of the driver])
VDPAU_VIDEO_LT_LDFLAGS="-avoid-version"
AC_SUBST(VDPAU_VIDEO_LT_LDFLAGS)
diff --git a/src/vdpau_driver.c b/src/vdpau_driver.c
index d9e36e0..9c4db6c 100644
--- a/src/vdpau_driver.c
+++ b/src/vdpau_driver.c
@@ -239,6 +239,11 @@ vdpau_common_Initialize(vdpau_driver_data_t *driver_data)
VDPAU_VIDEO_MINOR_VERSION,
VDPAU_VIDEO_MICRO_VERSION);
+ if (VDPAU_VIDEO_PRE_VERSION > 0) {
+ const int len = strlen(driver_data->va_vendor);
+ sprintf(&driver_data->va_vendor[len], ".pre%d", VDPAU_VIDEO_PRE_VERSION);
+ }
+
CREATE_HEAP(config, CONFIG);
CREATE_HEAP(context, CONTEXT);
CREATE_HEAP(surface, SURFACE);