Commit 1746c849 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 1.8.0

parent 683d1fa7
Copyright (C) 2009-2016 Intel Corporation. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
......
[![Stories in Ready](https://badge.waffle.io/01org/libva-utils.png?label=ready&title=Ready)](https://waffle.io/01org/libva-utils)
libva-utils
Collection of tests to exercise VA-API as provided
by the libva project. VA-API requires a driver implementation
to operate.
Copyright (C) 2009-2016 Intel Corporation
License
-------
Please read the COPYING file available in this package.
Overview
--------
libva-utils is a collection of tests to exercise VA-API in accordance
with the libva project. A driver implementation is necessary to properly
operate.
Project is hosted on github:
https://github.com/01org/libva-utils
Codecs
------
H.264 D ILK+
H.264 E SNB+
MPEG-2 D CTG+
VC-1 D SNB+
JPEG D IVB+
JPEG E CHV+/BSW+
VP8 D BDW+
VP8 E CHV+/BSW+
HEVC D CHV+/BSW+
HEVC E SKL+
VP9 D BXT+
HEVC 10bit D BXT+
VP9 10bit D KBL+
Requirements
------------
libva API >= 0.39.4
Google Test Framework Integration
---------------------------------
Google Test recommends it be custom compiled for each project that uses it.
Therefore, the libva-utils project tracks a subset copy of the Google
Test Framework source code at release 1.8.0 (initially) in a test/gtest/
subdirectory of the project source tree. The libva-utils copy of gtest
will only be updated to new upstream releases (or critical upstream fixes) of
gtest, only if it is necessary. As of this writing, the last release (1.8.0)
was August 2016, about three years after its previous release. Thus, there
should be minimal need to update or maintain gtest within the libva-utils
project.
Building Google Test Framework Library
--------------------------------------
The Google Test Framework is compiled as a convenience library (libgtest.la)
within the libva-utils source tree. The rules to build libgtest.la are
maintained in a custom makefile in the libva-intel-driver project tree
(see test/Makefile.am). The libgtest.la library will be automatically compiled
if the tests are enabled by configuration.
Building Driver Tests
---------------------
The --enable-gtests=[yes|no] configuration option is defined in configure.ac to
enable or disable compilation of libgtest.la and the test_va_api test executable.
The default is disabled. When the tests are enabled during configuration, the
make command will compile the VA-API gtests and link to libgtest.la and output/install
a single test/test_va_api or ${prefix}/bin/test_va_api executable. Hence...
"./autogen.sh --enable-gtests && make"
...is a minimal example of how one might build the driver and its tests.
Since all this project contains only tests, it is configurable to compile the GTest
framework and the corresponding tests. Notice the difference when enabling
tests on other related projects, e.g. libva-intel-driver.
On the summary section after configuration something like this should be seen
libva-utils - ${LIBVA_UTILS_VERSION}
Libva VA-API version ............. : ${LIBVA_API_VERSION}
Installation prefix .............. : ${prefix}
Default driver path .............. : ${exec_prefix}/lib/dri
Extra window systems ............. : drm x11
Enable Gtests .................... : yes
Reporting Bugs / Submit change patches
--------------------------------------
See the contributing guide:
https://github.com/01org/libva-utils/blob/master/CONTRIBUTING.md
......@@ -24,7 +24,19 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = foreign
SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
SUBDIRS = common decode encode vainfo
if USE_X11
SUBDIRS += putsurface
else
if USE_WAYLAND
SUBDIRS += putsurface
endif
endif
if ENABLE_TESTS
SUBDIRS += test
endif
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = \
......@@ -32,16 +44,6 @@ MAINTAINERCLEANFILES = \
configure depcomp install-sh ltmain.sh \
Makefile.in missing
DEB_BUILDDIR = debian.build
deb:
@[ -d debian ] || ln -s debian.upstream debian
dpkg-buildpackage -rfakeroot -uc -us
deb.upstream: dist
-mkdir -p $(DEB_BUILDDIR)
cd $(DEB_BUILDDIR) && \
rm -rf $(PACKAGE)-$(VERSION) && \
tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz && \
cd $(PACKAGE)-$(VERSION) && \
$(MAKE) deb -f Makefile.am
EXTRA_DIST = \
autogen.sh \
$(NULL)
......@@ -99,11 +99,14 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@USE_X11_TRUE@am__append_1 = putsurface
@USE_WAYLAND_TRUE@@USE_X11_FALSE@am__append_2 = putsurface
@ENABLE_TESTS_TRUE@am__append_3 = test
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in COPYING NEWS compile config.guess \
config.sub depcomp install-sh missing ltmain.sh
$(srcdir)/config.h.in COPYING INSTALL NEWS compile \
config.guess config.sub depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
......@@ -173,7 +176,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DIST_SUBDIRS = common decode encode vainfo putsurface test
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -237,7 +240,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DRM_CFLAGS = @DRM_CFLAGS@
DRM_LIBS = @DRM_LIBS@
DSYMUTIL = @DSYMUTIL@
......@@ -245,13 +247,9 @@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGL_CFLAGS = @EGL_CFLAGS@
EGL_LIBS = @EGL_LIBS@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLX_CFLAGS = @GLX_CFLAGS@
GLX_LIBS = @GLX_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -264,13 +262,19 @@ LIBDRM_VERSION = @LIBDRM_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
LIBVA_CFLAGS = @LIBVA_CFLAGS@
LIBVA_DRM_CFLAGS = @LIBVA_DRM_CFLAGS@
LIBVA_DRM_LIBS = @LIBVA_DRM_LIBS@
LIBVA_LIBS = @LIBVA_LIBS@
LIBVA_UTILS_MAJOR_VERSION = @LIBVA_UTILS_MAJOR_VERSION@
LIBVA_UTILS_MICRO_VERSION = @LIBVA_UTILS_MICRO_VERSION@
LIBVA_UTILS_MINOR_VERSION = @LIBVA_UTILS_MINOR_VERSION@
LIBVA_UTILS_VERSION = @LIBVA_UTILS_VERSION@
LIBVA_VERSION = @LIBVA_VERSION@
LIBVA_WAYLAND_CFLAGS = @LIBVA_WAYLAND_CFLAGS@
LIBVA_WAYLAND_LIBS = @LIBVA_WAYLAND_LIBS@
LIBVA_X11_CFLAGS = @LIBVA_X11_CFLAGS@
LIBVA_X11_LIBS = @LIBVA_X11_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
......@@ -300,10 +304,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TODAY = @TODAY@
VA_API_MAJOR_VERSION = @VA_API_MAJOR_VERSION@
VA_API_MICRO_VERSION = @VA_API_MICRO_VERSION@
VA_API_MINOR_VERSION = @VA_API_MINOR_VERSION@
VA_API_VERSION = @VA_API_VERSION@
VERSION = @VERSION@
WAYLAND_API_VERSION = @WAYLAND_API_VERSION@
WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
......@@ -371,7 +371,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = foreign
SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
SUBDIRS = common decode encode vainfo $(am__append_1) $(am__append_2) \
$(am__append_3)
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = \
......@@ -379,7 +380,10 @@ MAINTAINERCLEANFILES = \
configure depcomp install-sh ltmain.sh \
Makefile.in missing
DEB_BUILDDIR = debian.build
EXTRA_DIST = \
autogen.sh \
$(NULL)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......@@ -862,18 +866,6 @@ uninstall-am:
uninstall-am
deb:
@[ -d debian ] || ln -s debian.upstream debian
dpkg-buildpackage -rfakeroot -uc -us
deb.upstream: dist
-mkdir -p $(DEB_BUILDDIR)
cd $(DEB_BUILDDIR) && \
rm -rf $(PACKAGE)-$(VERSION) && \
tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz && \
cd $(PACKAGE)-$(VERSION) && \
$(MAKE) deb -f Makefile.am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
libva NEWS -- summary of user visible changes. 2016-11-10
Copyright (C) 2009-2016 Intel Corporation
Version 1.7.3 - 10.Nov.2016
* Bump VA API version to 0.39.4
* API: add support for bitrate control per temporal layer
* API: update the usage for framerate in VAEncMiscParameterFrameRate to support non-integer frame-rate
* Add has_prime_sharing flag in VADriverVTableWayland to indicate if buffer sharing with prime fd can
be used in the backend driver
Version 1.7.2 - 05.Sep.2016
* Bump VA API version to 0.39.3
* API: add support for ROI
* Add support for VP9 encoder in VA tracer
* Refine test cases
* Fix the issue of not properly terminating the parsed environment values with '\0'
https://bugs.freedesktop.org/show_bug.cgi?id=96677
Version 1.7.1 - 21.Jun.2016
* Bump VA API version to 0.39.2
* API: add support for VP9 8bit encode
* API: add support for low power/high performance encode
* API: add support for encoding ROI attribute
* API: add support for macroblock based rate control
* Fix VA tracer to support multiple contexts in one instance
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
* Add new fourcc codes: VA_FOURCC_P010, VA_FOURCC_P016, VA_FOURCC_YV16
* Fix crash if user doesn't have right to access the DRI device
* Fix uninitialized x11_screen driver context member for X11 output
https://bugs.freedesktop.org/show_bug.cgi?id=61603
* Fix the issue of not to use LIBVA_DRIVER_NAME
https://bugs.freedesktop.org/show_bug.cgi?id=72822
* Fix build issue with wayland
https://bugs.freedesktop.org/show_bug.cgi?id=79478
* vainfo: Add option '--display'
Version 1.6.1 - 09.Sep.2015
* Add support for VP9 decode and HEVC encode in VA trace module
* Add VP9 profile to vainfo
* Enhance VA trace to dump VP8 encode parameters
Version 1.6.0 - 01.Jul.2015
* Bump VA API version to 0.38
* Add support for HEVC encode API
* Add support for VP9 decode API
* Add API (vaSetDriverName()) to allow the user to specify the loaded backend driver
* Add VAConfigAttribEncSkipFrame and corresponding structures to support
sending skip frame parameters to the backend driver.
* Add support for querying slice decoding mode supported by the backend driver
* Fix quality issue in the JPEG encode demo
Version 1.5.1 - DD.Mar.2015
* API: correct the comment for num_token_partitions in struct _VAEncPictureParameterBufferVP8
* VA/x11: fix double Unlocks/SyncHandle to avoid segmentation fault
Version 1.5.0 - 28.Dec.2014
* API: add support for HEVC decoding
* API: extend JPEG encoding data structures and add configuration attribute for JPEG encoding
* Add a unit test for JPEG encoding (Sirisha Muppavarapu)
* Add support for HEVC decoding and JPEG encoding in VA trace utility
* Fix out of tree builds (Emil Velikov)
* VA/X11: fix BadDrawable issue when calling vaTerminate() after the pixmaps have been destroyed (Lionel Landwerlin)
Version 1.4.1 - 24.Oct.2014
* Add support for DRM Render-Nodes (Andrey Larionov)
Version 1.4.0 - 30.Sep.2014
* API: add support for VP8 encoding
* API: add H.264 MVC profiles for decoding and encoding
* API: add buffer export interfaces for interop with 3rdparty APIs (EGL, OCL)
* API: add suppor for encoder quality level
* API: add attribute usage hint flag
* Fix build on 64-bit versions of Android (Qiming Shi)
* Assorted fixes to the VA fool and trace modules (Austin Yuan)
Version 1.3.1 - 09.May.2014
* API: fix VA_ENC_PACKED_HEADER_RAW_DATA value
* API: add STE filter to the VPP pipeline
* Update doxygen tags in libva
* Fix doc/Makefile.am
* A workaround for https://bugs.freedesktop.org/show_bug.cgi?id=76755
Version 1.3.0 - 24.Mar.2014
* API: add support for VP8 decoding
* API: drop VAEntrypointMax enumeration
* Enhancement for VA trace utility
Version 1.2.1 - 27.Jun.2013
* Fix https://bugs.freedesktop.org/show_bug.cgi?id=66221
* Add back VA_DRIVER_INIT_FUNC definition for testing
Version 1.2.0 - 25.Jun.2013
* API: new H.264 encoding API for Main and High profiles
* API: add support for MPEG-2 encoding
* API: add video processing interfaces
* API: add vaQuerySurfaceAttributes() to query surface attributes supported by the underlying drivers.
* API: new version of vaCreateSurfaces()
* API: add new surface attributes to enable VA surface creation from external buffer
* API: add new RT formats and fourcc codes
* Refine VA trace utility
* Refine H.264 encoding test cases {avcenc, h264enc}
* A new test case for MPEG-2 encoding
* A lot of bug fixes
Version 1.1.1 - 19.Mar.2013
* Support wayland 1.0 protocol (Rob Bradford)
* Automake 1.13 fixups (Armin K)
Version 1.1.0 - 04.Oct.2012
* API: add Wayland support
* API: add raw DRM support for headless pipelines
* Fix generic VA/GLX implementation for newer cluttersink versions
* Fix threading issues in VA objects reference code (+Krzysztof Kotlenga)
* Fix build on Android Ice Cream Sandwich (+Haitao Huang, Daniel Charles)
Version 1.0.16 - 02.Aug.2012
* API: data structures for JPEG Baseline decoding
* API: clarify the definition of slice_data_bit_offset
* Add a simple test case for JPEG decoding
Version 1.0.15 - 28.Oct.2011
* API: make {Top,Bottom}FieldOrderCnt signed (Yi Wang)
* Add auto-generated Debian packaging
* Refine VA trace & VA fool utilities
* Move i965 driver to a specific repository (vaapi/intel-driver)
* Fix DSO link issue in tests
* Fix fglrx driver name detection
* Fix API vs. DSO vs. package versioning
Version 1.0.14 - 28.Jul.2011
* API: rename VA_DECODE_ERROR_TYPE to VADecodeErrorType
* Fix memory leaks (Edgar Hucek)
* Fix VA trace logs (Alexander Osin)
* Fix vaTerminate() with some applications, e.g. GStreamer
Version 1.0.13 - 30.May.2011
* API: fix VA_ROTATION_270 definition
* Add a simple H.264 encoder "avcenc" (Chang Zhou)
* Fix VA tracer (Alexander Osin)
* Fix vaBufferInfo() interface (Alexander Osin)
Version 1.0.12 - 01.Apr.2011
* API: add VARenderMode interface to select overlay or GPU rendering mode
* API: add VARenderDevice interface to allow rendering to an external device
* API: add VADisplayAttribOverlay{ColorKey,AutoPaintColorKey} interface
* Fix build issues on Android 2.3
Changes for older versions can be found in git log or previously
released packages.
libva-utils NEWS -- summary of changes. 2017-03-31
Copyright (C) 2009-2017 Intel Corporation
Version 1.8.0 - 31.Mar.2017
* First release of libva-utils as a separate project
* Follows libva release versioning
* Contains all the utilities and tests for libva API
* dynamically links to libva
* building system clean ups
* test suite included using GoogleTestFramework
#!/bin/sh
# Copyright (c) 2007 Intel Corporation. All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
......@@ -20,14 +21,31 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AM_CPPFLAGS = -I$(top_srcdir)
if BUILD_DUMMY_DRIVER
dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
dummy_drv_video_ladir = $(LIBVA_DRIVERS_PATH)
dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
dummy_drv_video_la_LIBADD =
dummy_drv_video_la_DEPENDENCIES =
dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
noinst_HEADERS = dummy_drv_video.h object_heap.h
endif
PROJECT="libva-utils"
test -n "$srcdir" || srcdir="`dirname \"$0\"`"
test -n "$srcdir" || srcdir=.
if ! test -f "$srcdir/configure.ac"; then
echo "Failed to find the top-level $PROJECT directory"
exit 1
fi
olddir="`pwd`"
cd "$srcdir"
mkdir -p m4
AUTORECONF=`which autoreconf`
if test -z $AUTORECONF; then
echo "*** No autoreconf found ***"
exit 1
else
autoreconf -v --install || exit $?
fi
cd "$olddir"
if test -z "$NOCONFIGURE"; then
$srcdir/configure "$@" && echo "Now type 'make' to compile $PROJECT."
fi
......@@ -23,35 +23,32 @@
noinst_LTLIBRARIES = libva-display.la
libva_display_cflags = \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
-I$(top_builddir) \
-DIN_LIBVA \
$(LIBVA_CFLAGS) \
$(NULL)
libva_display_libs = \
$(top_builddir)/va/libva.la \
$(LIBVA_LDFLAGS) \
$(NULL)
source_c = va_display.c
source_h = va_display.h
source_h = va_display.h loadsurface.h loadsurface_yuv.h
if USE_X11
source_c += va_display_x11.c
libva_display_cflags += $(X11_CFLAGS)
libva_display_libs += $(top_builddir)/va/libva-x11.la $(X11_LIBS)
libva_display_cflags += $(X11_CFLAGS) $(LIBVA_X11_CFLAGS)
libva_display_libs += $(X11_LIBS) $(LIBVA_X11_LIBS)
endif
if USE_DRM
source_c += va_display_drm.c
libva_display_cflags += $(DRM_CFLAGS)
libva_display_libs += $(top_builddir)/va/libva-drm.la $(DRM_LIBS)
libva_display_cflags += $(DRM_CFLAGS) $(LIBVA_DRM_CFLAGS)
libva_display_libs += $(DRM_LIBS) $(LIBVA_DRM_LIBS)
endif
if USE_WAYLAND
source_c += va_display_wayland.c
libva_display_cflags += $(WAYLAND_CFLAGS)
libva_display_libs += $(top_builddir)/va/libva-wayland.la $(WAYLAND_LIBS)
libva_display_cflags += $(WAYLAND_CFLAGS) $(LIBVA_WAYLAND_CFLAGS)
libva_display_libs += $(WAYLAND_LIBS) $(LIBVA_WAYLAND_LIBS)
endif
libva_display_la_SOURCES= $(source_c)
......@@ -61,3 +58,8 @@ libva_display_la_LIBADD = $(libva_display_libs)
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \
loadsurface.h \
loadsurface_yuv.h \
$(NULL)
......@@ -102,15 +102,15 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@USE_X11_TRUE@am__append_1 = va_display_x11.c
@USE_X11_TRUE@am__append_2 = $(X11_CFLAGS)
@USE_X11_TRUE@am__append_3 = $(top_builddir)/va/libva-x11.la $(X11_LIBS)
@USE_X11_TRUE@am__append_2 = $(X11_CFLAGS) $(LIBVA_X11_CFLAGS)
@USE_X11_TRUE@am__append_3 = $(X11_LIBS) $(LIBVA_X11_LIBS)
@USE_DRM_TRUE@am__append_4 = va_display_drm.c
@USE_DRM_TRUE@am__append_5 = $(DRM_CFLAGS)
@USE_DRM_TRUE@am__append_6 = $(top_builddir)/va/libva-drm.la $(DRM_LIBS)
@USE_DRM_TRUE@am__append_5 = $(DRM_CFLAGS) $(LIBVA_DRM_CFLAGS)
@USE_DRM_TRUE@am__append_6 = $(DRM_LIBS) $(LIBVA_DRM_LIBS)
@USE_WAYLAND_TRUE@am__append_7 = va_display_wayland.c
@USE_WAYLAND_TRUE@am__append_8 = $(WAYLAND_CFLAGS)
@USE_WAYLAND_TRUE@am__append_9 = $(top_builddir)/va/libva-wayland.la $(WAYLAND_LIBS)
subdir = test/common
@USE_WAYLAND_TRUE@am__append_8 = $(WAYLAND_CFLAGS) $(LIBVA_WAYLAND_CFLAGS)
@USE_WAYLAND_TRUE@am__append_9 = $(WAYLAND_LIBS) $(LIBVA_WAYLAND_LIBS)
subdir = common
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -126,15 +126,14 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
@USE_X11_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/va/libva-x11.la \
@USE_X11_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
@USE_X11_TRUE@ $(am__DEPENDENCIES_1)
@USE_DRM_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/va/libva-drm.la \
@USE_DRM_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
@USE_DRM_TRUE@ $(am__DEPENDENCIES_1)
@USE_WAYLAND_TRUE@am__DEPENDENCIES_4 = \
@USE_WAYLAND_TRUE@ $(top_builddir)/va/libva-wayland.la \
@USE_WAYLAND_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \
@USE_WAYLAND_TRUE@ $(am__DEPENDENCIES_1)
am__DEPENDENCIES_5 = $(top_builddir)/va/libva.la $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
am__DEPENDENCIES_5 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_4)
libva_display_la_DEPENDENCIES = $(am__DEPENDENCIES_5)
am__libva_display_la_SOURCES_DIST = va_display.c va_display_x11.c \
va_display_drm.c va_display_wayland.c
......@@ -237,7 +236,6 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DRM_CFLAGS = @DRM_CFLAGS@
DRM_LIBS = @DRM_LIBS@
DSYMUTIL = @DSYMUTIL@
......@@ -245,13 +243,9 @@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGL_CFLAGS = @EGL_CFLAGS@
EGL_LIBS = @EGL_LIBS@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GLX_CFLAGS = @GLX_CFLAGS@
GLX_LIBS = @GLX_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -264,13 +258,19 @@ LIBDRM_VERSION = @LIBDRM_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
LIBVA_CFLAGS = @LIBVA_CFLAGS@
LIBVA_DRM_CFLAGS = @LIBVA_DRM_CFLAGS@
LIBVA_DRM_LIBS = @LIBVA_DRM_LIBS@
LIBVA_LIBS = @LIBVA_LIBS@
LIBVA_UTILS_MAJOR_VERSION = @LIBVA_UTILS_MAJOR_VERSION@
LIBVA_UTILS_MICRO_VERSION = @LIBVA_UTILS_MICRO_VERSION@
LIBVA_UTILS_MINOR_VERSION = @LIBVA_UTILS_MINOR_VERSION@
LIBVA_UTILS_VERSION = @LIBVA_UTILS_VERSION@
LIBVA_VERSION = @LIBVA_VERSION@
LIBVA_WAYLAND_CFLAGS = @LIBVA_WAYLAND_CFLAGS@
LIBVA_WAYLAND_LIBS = @LIBVA_WAYLAND_LIBS@
LIBVA_X11_CFLAGS = @LIBVA_X11_CFLAGS@
LIBVA_X11_LIBS = @LIBVA_X11_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
......@@ -300,10 +300,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TODAY = @TODAY@
VA_API_MAJOR_VERSION = @VA_API_MAJOR_VERSION@
VA_API_MICRO_VERSION = @VA_API_MICRO_VERSION@
VA_API_MINOR_VERSION = @VA_API_MINOR_VERSION@
VA_API_VERSION = @VA_API_VERSION@
VERSION = @VERSION@
WAYLAND_API_VERSION = @WAYLAND_API_VERSION@
WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
......@@ -370,14 +366,13 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libva-display.la
libva_display_cflags = -I$(top_srcdir) -I$(top_srcdir)/va \
-I$(top_builddir) -DIN_LIBVA $(NULL) $(am__append_2) \
libva_display_cflags = $(LIBVA_CFLAGS) $(NULL) $(am__append_2) \
$(am__append_5) $(am__append_8)
libva_display_libs = $(top_builddir)/va/libva.la $(NULL) \
$(am__append_3) $(am__append_6) $(am__append_9)
libva_display_libs = $(LIBVA_LDFLAGS) $(NULL) $(am__append_3) \
$(am__append_6) $(am__append_9)
source_c = va_display.c $(am__append_1) $(am__append_4) \
$(am__append_7)
source_h = va_display.h
source_h = va_display.h loadsurface.h loadsurface_yuv.h
libva_display_la_SOURCES = $(source_c)
noinst_HEADERS = $(source_h)
libva_display_la_CFLAGS = $(libva_display_cflags)
......@@ -385,6 +380,11 @@ libva_display_la_LIBADD = $(libva_display_libs)
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \
loadsurface.h \
loadsurface_yuv.h \