diff options
Diffstat (limited to 'meta-emenlow/recipes-graphics/libva/libva-0.31.0/300_sds_version.patch')
-rw-r--r-- | meta-emenlow/recipes-graphics/libva/libva-0.31.0/300_sds_version.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta-emenlow/recipes-graphics/libva/libva-0.31.0/300_sds_version.patch b/meta-emenlow/recipes-graphics/libva/libva-0.31.0/300_sds_version.patch new file mode 100644 index 00000000..07531c90 --- /dev/null +++ b/meta-emenlow/recipes-graphics/libva/libva-0.31.0/300_sds_version.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | commit 890acc1975ed9f6b7173ff6fbf9d689943590913 | ||
2 | Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | ||
3 | Date: Wed Jun 24 11:32:40 2009 +0000 | ||
4 | |||
5 | Explicit API extensions from SDS. | ||
6 | |||
7 | diff --git a/configure.ac b/configure.ac | ||
8 | index 3999dc4..17b0403 100644 | ||
9 | --- a/configure.ac | ||
10 | +++ b/configure.ac | ||
11 | @@ -28,6 +28,9 @@ m4_define([libva_micro_version], [0]) | ||
12 | m4_define([libva_version], | ||
13 | [libva_major_version.libva_minor_version.libva_micro_version]) | ||
14 | |||
15 | +# increase this number for each API change | ||
16 | +m4_define([libva_sds_version], [4]) | ||
17 | + | ||
18 | # if the library source code has changed, increment revision | ||
19 | m4_define([libva_lt_revision], [0]) | ||
20 | # if any interface was added/removed/changed, then inc current, reset revision | ||
21 | @@ -52,11 +55,14 @@ AC_SUBST(LIBVA_MINOR_VERSION) | ||
22 | AC_SUBST(LIBVA_MICRO_VERSION) | ||
23 | AC_SUBST(LIBVA_VERSION) | ||
24 | |||
25 | +LIBVA_SDS_VERSION=libva_sds_version | ||
26 | +AC_SUBST(LIBVA_SDS_VERSION) | ||
27 | + | ||
28 | LIBVA_LT_CURRENT=libva_lt_current | ||
29 | LIBVA_LT_REV=libva_lt_revision | ||
30 | LIBVA_LT_AGE=libva_lt_age | ||
31 | LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE" | ||
32 | -LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION" | ||
33 | +LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION -release $LIBVA_VERSION.$LIBVA_SDS_VERSION" | ||
34 | AC_SUBST(LIBVA_LT_VERSION) | ||
35 | AC_SUBST(LIBVA_LT_LDFLAGS) | ||
36 | |||
37 | diff --git a/src/va.c b/src/va.c | ||
38 | index f9791f8..b60ac12 100644 | ||
39 | --- a/src/va.c | ||
40 | +++ b/src/va.c | ||
41 | @@ -35,6 +35,7 @@ | ||
42 | #include <linux/videodev2.h> | ||
43 | |||
44 | #define DRIVER_INIT_FUNC "__vaDriverInit_0_31" | ||
45 | +#define DRIVER_INIT_FUNC_SDS "__vaDriverInit_0_31_sds" | ||
46 | |||
47 | #define DRIVER_EXTENSION "_drv_video.so" | ||
48 | |||
49 | @@ -160,6 +161,11 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name) | ||
50 | init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC); | ||
51 | if (!init_func) | ||
52 | { | ||
53 | + /* Then try SDS extensions (VDPAU and XvBA backends) */ | ||
54 | + init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC_SDS); | ||
55 | + } | ||
56 | + if (!init_func) | ||
57 | + { | ||
58 | va_errorMessage("%s has no function %s\n", driver_path, DRIVER_INIT_FUNC); | ||
59 | dlclose(handle); | ||
60 | } | ||
61 | diff --git a/src/va_version.h.in b/src/va_version.h.in | ||
62 | index c9ea97a..197c482 100644 | ||
63 | --- a/src/va_version.h.in | ||
64 | +++ b/src/va_version.h.in | ||
65 | @@ -47,6 +47,13 @@ | ||
66 | #define VA_MICRO_VERSION (@LIBVA_MICRO_VERSION@) | ||
67 | |||
68 | /** | ||
69 | + * VA_SDS_VERSION: | ||
70 | + * | ||
71 | + * The version of the SDS API extensions to the VA library | ||
72 | + */ | ||
73 | +#define VA_SDS_VERSION (@LIBVA_SDS_VERSION@) | ||
74 | + | ||
75 | +/** | ||
76 | * VA_VERSION: | ||
77 | * | ||
78 | * The full version of the VA library, like 1.2.3 | ||
79 | @@ -59,7 +66,7 @@ | ||
80 | * The full version of the VA library, in string form (suited for | ||
81 | * string concatenation) | ||
82 | */ | ||
83 | -#define VA_VERSION_S "@LIBVA_VERSION@" | ||
84 | +#define VA_VERSION_S "@LIBVA_VERSION@-sds@LIBVA_SDS_VERSION@" | ||
85 | |||
86 | /** | ||
87 | * VA_VERSION_HEX: | ||