[SCM] libva/master: Imported Upstream version 1.7.0
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue Mar 15 23:37:29 UTC 2016
The following commit has been merged in the master branch:
commit 8512eaedf5ecbf47ac765e2d0e10be46e486f2eb
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Wed Mar 16 00:27:04 2016 +0100
Imported Upstream version 1.7.0
diff --git a/NEWS b/NEWS
index c3752de..d6179fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
-libva NEWS -- summary of user visible changes. 2015-12-15
+libva NEWS -- summary of user visible changes. 2016-03-15
Copyright (C) 2009-2015 Intel Corporation
+Version 1.7.0 - 15.Mar.2016
+* Bump VA API version to 0.39
+* Add support for VP9 10bit decode API
+* Allow libva to load the vaapi driver provided by Mesa Gallium for nouveau and radeon
+* Fix libva-glx against OpenGL 3.1 or above
+
Version 1.6.2 - 15.Dec.2015
* Bump VA API version to 0.38.1
* Add new RT format for 16 bits per channel memory layout(P010,P016): VA_RT_FORMAT_YUV420_10BPP
diff --git a/configure b/configure
index d846722..b9f246b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libva 1.6.2.
+# Generated by GNU Autoconf 2.69 for libva 1.7.0.
#
# Report bugs to <waldo.bastian at intel.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libva'
PACKAGE_TARNAME='libva'
-PACKAGE_VERSION='1.6.2'
-PACKAGE_STRING='libva 1.6.2'
+PACKAGE_VERSION='1.7.0'
+PACKAGE_STRING='libva 1.7.0'
PACKAGE_BUGREPORT='waldo.bastian at intel.com'
PACKAGE_URL=''
@@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libva 1.6.2 to adapt to many kinds of systems.
+\`configure' configures libva 1.7.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1465,7 +1465,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libva 1.6.2:";;
+ short | recursive ) echo "Configuration of libva 1.7.0:";;
esac
cat <<\_ACEOF
@@ -1605,7 +1605,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libva configure 1.6.2
+libva configure 1.7.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2095,7 +2095,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libva $as_me 1.6.2, which was
+It was created by libva $as_me 1.7.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2960,7 +2960,7 @@ fi
# Define the identity of the package.
PACKAGE='libva'
- VERSION='1.6.2'
+ VERSION='1.7.0'
cat >>confdefs.h <<_ACEOF
@@ -3099,26 +3099,26 @@ TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
VA_API_MAJOR_VERSION=0
-VA_API_MINOR_VERSION=38
-VA_API_MICRO_VERSION=1
-VA_API_VERSION=0.38.1
+VA_API_MINOR_VERSION=39
+VA_API_MICRO_VERSION=0
+VA_API_VERSION=0.39.0
LIBVA_MAJOR_VERSION=1
-LIBVA_MINOR_VERSION=6
-LIBVA_MICRO_VERSION=2
-LIBVA_VERSION=1.6.2
+LIBVA_MINOR_VERSION=7
+LIBVA_MICRO_VERSION=0
+LIBVA_VERSION=1.7.0
-LIBVA_LT_CURRENT=3802
+LIBVA_LT_CURRENT=3901
LIBVA_LT_REV=0
-LIBVA_LT_AGE=3801
+LIBVA_LT_AGE=3900
LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION"
@@ -18079,7 +18079,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libva $as_me 1.6.2, which was
+This file was extended by libva $as_me 1.7.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18145,7 +18145,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libva config.status 1.6.2
+libva config.status 1.7.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 7c88751..0cc7f56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,8 @@
# - reset micro version to zero when minor version is incremented
# - reset minor version to zero when major version is incremented
m4_define([va_api_major_version], [0])
-m4_define([va_api_minor_version], [38])
-m4_define([va_api_micro_version], [1])
+m4_define([va_api_minor_version], [39])
+m4_define([va_api_micro_version], [0])
m4_define([va_api_version],
[va_api_major_version.va_api_minor_version.va_api_micro_version])
@@ -42,7 +42,7 @@ m4_define([va_api_version],
# - reset micro version to zero when VA-API major or minor version is changed
m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
-m4_define([libva_micro_version], [2])
+m4_define([libva_micro_version], [0])
m4_define([libva_pre_version], [0])
m4_define([libva_version],
diff --git a/debian.upstream/Makefile.in b/debian.upstream/Makefile.in
index 57a8ff5..ed01b87 100644
--- a/debian.upstream/Makefile.in
+++ b/debian.upstream/Makefile.in
@@ -314,9 +314,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian.upstream/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian.upstream/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu debian.upstream/Makefile
+ $(AUTOMAKE) --foreign debian.upstream/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/debian.upstream/changelog b/debian.upstream/changelog
index 91c0f6f..76c30ad 100644
--- a/debian.upstream/changelog
+++ b/debian.upstream/changelog
@@ -1,5 +1,5 @@
-libva (1.6.2-1) unstable; urgency=low
+libva (1.7.0-1) unstable; urgency=low
* Autogenerated package, see NEWS file for ChangeLog.
- -- Gwenole Beauchesne <gwenole.beauchesne at intel.com> Tue, 15 Dec 2015 14:17:03 +0800
+ -- Gwenole Beauchesne <gwenole.beauchesne at intel.com> Tue, 15 Mar 2016 15:05:31 +0800
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e511057..59351a1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -311,9 +311,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ $(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/dummy_drv_video/Makefile.in b/dummy_drv_video/Makefile.in
index a11ec62..9746fba 100644
--- a/dummy_drv_video/Makefile.in
+++ b/dummy_drv_video/Makefile.in
@@ -393,9 +393,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dummy_drv_video/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dummy_drv_video/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu dummy_drv_video/Makefile
+ $(AUTOMAKE) --foreign dummy_drv_video/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in
index 3483414..938b140 100644
--- a/pkgconfig/Makefile.in
+++ b/pkgconfig/Makefile.in
@@ -346,9 +346,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pkgconfig/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pkgconfig/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu pkgconfig/Makefile
+ $(AUTOMAKE) --foreign pkgconfig/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/Makefile.in b/test/Makefile.in
index 03d3f9a..039d607 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -358,9 +358,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/Makefile
+ $(AUTOMAKE) --foreign test/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/basic/Makefile.in b/test/basic/Makefile.in
index c8358b2..ec4ac7b 100644
--- a/test/basic/Makefile.in
+++ b/test/basic/Makefile.in
@@ -424,9 +424,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/basic/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/basic/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/basic/Makefile
+ $(AUTOMAKE) --foreign test/basic/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/common/Makefile.in b/test/common/Makefile.in
index 8943314..d4811f3 100644
--- a/test/common/Makefile.in
+++ b/test/common/Makefile.in
@@ -395,9 +395,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/common/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/common/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/common/Makefile
+ $(AUTOMAKE) --foreign test/common/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/decode/Makefile.in b/test/decode/Makefile.in
index e170afc..bacf1b7 100644
--- a/test/decode/Makefile.in
+++ b/test/decode/Makefile.in
@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/decode/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/decode/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/decode/Makefile
+ $(AUTOMAKE) --foreign test/decode/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/encode/Makefile.in b/test/encode/Makefile.in
index 90337e3..1292f82 100644
--- a/test/encode/Makefile.in
+++ b/test/encode/Makefile.in
@@ -414,9 +414,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/encode/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/encode/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/encode/Makefile
+ $(AUTOMAKE) --foreign test/encode/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/encode/jpegenc.c b/test/encode/jpegenc.c
index 56fa2f1..b68bb2e 100644
--- a/test/encode/jpegenc.c
+++ b/test/encode/jpegenc.c
@@ -968,7 +968,7 @@ int main(int argc, char *argv[])
default: {
printf("Unsupported format:\n");
show_help();
- break;
+ return -1;
}
}
diff --git a/test/putsurface/Makefile.in b/test/putsurface/Makefile.in
index 5e63687..6ecf4cc 100644
--- a/test/putsurface/Makefile.in
+++ b/test/putsurface/Makefile.in
@@ -394,9 +394,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/putsurface/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/putsurface/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/putsurface/Makefile
+ $(AUTOMAKE) --foreign test/putsurface/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/vainfo/Makefile.in b/test/vainfo/Makefile.in
index 2c064e2..55ca69b 100644
--- a/test/vainfo/Makefile.in
+++ b/test/vainfo/Makefile.in
@@ -372,9 +372,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/vainfo/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/vainfo/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu test/vainfo/Makefile
+ $(AUTOMAKE) --foreign test/vainfo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c
index 0605d8c..7259596 100644
--- a/test/vainfo/vainfo.c
+++ b/test/vainfo/vainfo.c
@@ -61,6 +61,9 @@ static char * profile_string(VAProfile profile)
case VAProfileHEVCMain: return "VAProfileHEVCMain";
case VAProfileHEVCMain10: return "VAProfileHEVCMain10";
case VAProfileVP9Profile0: return "VAProfileVP9Profile0";
+ case VAProfileVP9Profile1: return "VAProfileVP9Profile1";
+ case VAProfileVP9Profile2: return "VAProfileVP9Profile2";
+ case VAProfileVP9Profile3: return "VAProfileVP9Profile3";
default:
break;
diff --git a/va/Makefile.in b/va/Makefile.in
index 1dfe2c8..8a0c2b8 100644
--- a/va/Makefile.in
+++ b/va/Makefile.in
@@ -566,9 +566,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu va/Makefile
+ $(AUTOMAKE) --foreign va/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/va/drm/Makefile.in b/va/drm/Makefile.in
index 76fb9f7..6586949 100644
--- a/va/drm/Makefile.in
+++ b/va/drm/Makefile.in
@@ -406,9 +406,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/drm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/drm/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu va/drm/Makefile
+ $(AUTOMAKE) --foreign va/drm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/va/drm/va_drm_utils.c b/va/drm/va_drm_utils.c
index 71091fd..041be79 100644
--- a/va/drm/va_drm_utils.c
+++ b/va/drm/va_drm_utils.c
@@ -41,6 +41,8 @@ static const struct driver_name_map g_driver_name_map[] = {
{ "pvrsrvkm", 8, "pvr" }, // Intel UMG PVR driver
{ "emgd", 4, "emgd" }, // Intel ECG PVR driver
{ "hybrid", 6, "hybrid" }, // Intel OTC Hybrid driver
+ { "nouveau", 7, "gallium" }, // Mesa Gallium driver
+ { "radeon", 6, "gallium" }, // Mesa Gallium driver
{ NULL, }
};
diff --git a/va/egl/Makefile.in b/va/egl/Makefile.in
index 1309895..1dbce35 100644
--- a/va/egl/Makefile.in
+++ b/va/egl/Makefile.in
@@ -398,9 +398,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/egl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/egl/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu va/egl/Makefile
+ $(AUTOMAKE) --foreign va/egl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/va/glx/Makefile.in b/va/glx/Makefile.in
index 22eb665..4c5e346 100644
--- a/va/glx/Makefile.in
+++ b/va/glx/Makefile.in
@@ -407,9 +407,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/glx/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/glx/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu va/glx/Makefile
+ $(AUTOMAKE) --foreign va/glx/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/va/glx/va_glx_impl.c b/va/glx/va_glx_impl.c
index c066582..621f6c1 100644
--- a/va/glx/va_glx_impl.c
+++ b/va/glx/va_glx_impl.c
@@ -191,18 +191,40 @@ static int check_extension(const char *name, const char *ext)
return 0;
}
+static int check_extension3(const char *name)
+{
+ int nbExtensions, i;
+ PFNGLGETSTRINGIPROC glGetStringi = 0;
+
+ glGetStringi = (PFNGLGETSTRINGIPROC) get_proc_address("glGetStringi");
+ if(!glGetStringi)
+ return 0;
+
+
+ glGetIntegerv(GL_NUM_EXTENSIONS, &nbExtensions);
+ for(i = 0; i < nbExtensions; i++)
+ {
+ const GLubyte *strExtension = glGetStringi(GL_EXTENSIONS, i);
+ if(strcmp(strExtension, (const GLubyte *)name) == 0)
+ return 1;
+ }
+
+ return 0;
+}
+
static int check_tfp_extensions(VADriverContextP ctx)
{
const char *gl_extensions;
const char *glx_extensions;
gl_extensions = (const char *)glGetString(GL_EXTENSIONS);
- if (!check_extension("GL_ARB_texture_non_power_of_two", gl_extensions))
+ if (!check_extension("GL_ARB_texture_non_power_of_two", gl_extensions) && !check_extension3("GL_ARB_texture_non_power_of_two"))
return 0;
glx_extensions = glXQueryExtensionsString(ctx->native_dpy, ctx->x11_screen);
if (!check_extension("GLX_EXT_texture_from_pixmap", glx_extensions))
return 0;
+
return 1;
}
@@ -211,10 +233,11 @@ static int check_fbo_extensions(VADriverContextP ctx)
const char *gl_extensions;
gl_extensions = (const char *)glGetString(GL_EXTENSIONS);
- if (check_extension("GL_ARB_framebuffer_object", gl_extensions))
+ if (check_extension("GL_ARB_framebuffer_object", gl_extensions) || check_extension3("GL_ARB_framebuffer_object"))
return 1;
- if (check_extension("GL_EXT_framebuffer_object", gl_extensions))
+ if (check_extension("GL_EXT_framebuffer_object", gl_extensions) || check_extension3("GL_EXT_framebuffer_object"))
return 1;
+
return 0;
}
diff --git a/va/va.c b/va/va.c
index 2ce61b0..9bdb041 100644
--- a/va/va.c
+++ b/va/va.c
@@ -246,6 +246,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
int minor;
} compatible_versions[] = {
{ VA_MAJOR_VERSION, VA_MINOR_VERSION },
+ { 0, 38 },
{ 0, 37 },
{ 0, 36 },
{ 0, 35 },
diff --git a/va/va.h b/va/va.h
index fb3066f..5dcc34e 100644
--- a/va/va.h
+++ b/va/va.h
@@ -303,7 +303,10 @@ typedef enum
VAProfileH264StereoHigh = 16,
VAProfileHEVCMain = 17,
VAProfileHEVCMain10 = 18,
- VAProfileVP9Profile0 = 19
+ VAProfileVP9Profile0 = 19,
+ VAProfileVP9Profile1 = 20,
+ VAProfileVP9Profile2 = 21,
+ VAProfileVP9Profile3 = 22
} VAProfile;
/**
diff --git a/va/va_dec_vp9.h b/va/va_dec_vp9.h
index 2deddb0..37252be 100644
--- a/va/va_dec_vp9.h
+++ b/va/va_dec_vp9.h
@@ -182,10 +182,15 @@ typedef struct _VADecPictureParameterBufferVP9
uint8_t segment_pred_probs[3];
/** \brief VP9 Profile definition
- * value can be 0 or 1.
- */
+ * value range [0..3].
+ */
uint8_t profile;
+ /** \brief VP9 bit depth per sample
+ * same for both luma and chroma samples.
+ */
+ uint8_t bit_depth;
+
/**@}*/
} VADecPictureParameterBufferVP9;
diff --git a/va/va_version.h b/va/va_version.h
index cb88e26..5088c22 100644
--- a/va/va_version.h
+++ b/va/va_version.h
@@ -37,21 +37,21 @@
*
* The minor version of VA-API (2, if %VA_VERSION is 1.2.3)
*/
-#define VA_MINOR_VERSION 38
+#define VA_MINOR_VERSION 39
/**
* VA_MICRO_VERSION:
*
* The micro version of VA-API (3, if %VA_VERSION is 1.2.3)
*/
-#define VA_MICRO_VERSION 1
+#define VA_MICRO_VERSION 0
/**
* VA_VERSION:
*
* The full version of VA-API, like 1.2.3
*/
-#define VA_VERSION 0.38.1
+#define VA_VERSION 0.39.0
/**
* VA_VERSION_S:
@@ -59,7 +59,7 @@
* The full version of VA-API, in string form (suited for string
* concatenation)
*/
-#define VA_VERSION_S "0.38.1"
+#define VA_VERSION_S "0.39.0"
/**
* VA_VERSION_HEX:
diff --git a/va/wayland/Makefile.in b/va/wayland/Makefile.in
index 07b8b39..834a3c5 100644
--- a/va/wayland/Makefile.in
+++ b/va/wayland/Makefile.in
@@ -422,9 +422,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/wayland/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/wayland/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu va/wayland/Makefile
+ $(AUTOMAKE) --foreign va/wayland/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/va/wayland/wayland-drm-client-protocol.h b/va/wayland/wayland-drm-client-protocol.h
index a215c6b..cba188e 100644
--- a/va/wayland/wayland-drm-client-protocol.h
+++ b/va/wayland/wayland-drm-client-protocol.h
@@ -117,21 +117,21 @@ enum wl_drm_format {
struct wl_drm_listener {
/**
- * device - (none)
- * @name: (none)
+ * device - device
+ * @name: name
*/
void (*device)(void *data,
struct wl_drm *wl_drm,
const char *name);
/**
- * format - (none)
- * @format: (none)
+ * format - format
+ * @format: format
*/
void (*format)(void *data,
struct wl_drm *wl_drm,
uint32_t format);
/**
- * authenticated - (none)
+ * authenticated - authenticated
*/
void (*authenticated)(void *data,
struct wl_drm *wl_drm);
@@ -179,8 +179,13 @@ wl_drm_create_buffer(struct wl_drm *wl_drm, uint32_t name, int32_t width, int32_
{
struct wl_proxy *id;
- id = wl_proxy_marshal_constructor((struct wl_proxy *) wl_drm,
- WL_DRM_CREATE_BUFFER, &wl_buffer_interface, NULL, name, width, height, stride, format);
+ id = wl_proxy_create((struct wl_proxy *) wl_drm,
+ &wl_buffer_interface);
+ if (!id)
+ return NULL;
+
+ wl_proxy_marshal((struct wl_proxy *) wl_drm,
+ WL_DRM_CREATE_BUFFER, id, name, width, height, stride, format);
return (struct wl_buffer *) id;
}
@@ -190,8 +195,13 @@ wl_drm_create_planar_buffer(struct wl_drm *wl_drm, uint32_t name, int32_t width,
{
struct wl_proxy *id;
- id = wl_proxy_marshal_constructor((struct wl_proxy *) wl_drm,
- WL_DRM_CREATE_PLANAR_BUFFER, &wl_buffer_interface, NULL, name, width, height, format, offset0, stride0, offset1, stride1, offset2, stride2);
+ id = wl_proxy_create((struct wl_proxy *) wl_drm,
+ &wl_buffer_interface);
+ if (!id)
+ return NULL;
+
+ wl_proxy_marshal((struct wl_proxy *) wl_drm,
+ WL_DRM_CREATE_PLANAR_BUFFER, id, name, width, height, format, offset0, stride0, offset1, stride1, offset2, stride2);
return (struct wl_buffer *) id;
}
diff --git a/va/x11/Makefile.in b/va/x11/Makefile.in
index 08143e8..43fcbc6 100644
--- a/va/x11/Makefile.in
+++ b/va/x11/Makefile.in
@@ -415,9 +415,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/x11/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/x11/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu va/x11/Makefile
+ $(AUTOMAKE) --foreign va/x11/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
--
libva packaging
More information about the pkg-multimedia-commits
mailing list