--- libva-1.0.1.orig/debian/copyright +++ libva-1.0.1/debian/copyright @@ -0,0 +1,74 @@ +This package was debianized by Waldo Bastian on +Mon, 18 Jun 2007 21:35:31 -0700. +This package was redebianized by Andres Mejia on +Fri, 12 Feb 2010 13:03:16 -0500 + +It was downloaded from + +Upstream Author(s): + + Waldo Bastian + Jonathan Bian + +Copyright: + + Copyright © 1998-1999 Precision Insight, Inc., Cedar Park, Texas. + Copyright © 2000 VA Linux Systems, Inc. + Copyright © IBM Corporation 2004 + Copyright © 2006-2009 Intel Corportation. + Copyright © 2006 Tungsten Graphics, Inc., Cedar Park, Texas. + Copyright © 2008 NVIDIA, Corporation + Copyright © 2009 Splitted-Desktop Systems. + All Rights Reserved + +License: + + 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 + without limitation the rights to use, copy, modify, merge, publish, + distribute, sub license, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial portions + of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR + ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Additional Copyright: + + src/x11/va_dri2* + Copyright © 2007,2008 Red Hat, Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Soft- + ware"), to deal in the Software without restriction, including without + limitation the rights to use, copy, modify, merge, publish, distribute, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, provided that the above copyright + notice(s) and this permission notice appear in all copies of the Soft- + ware and that both the above copyright notice(s) and this permission + notice appear in supporting documentation. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- + ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY + RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN + THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- + QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR- + MANCE OF THIS SOFTWARE. + + Except as contained in this notice, the name of a copyright holder shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization of + the copyright holder. --- libva-1.0.1.orig/debian/i965-va-driver.install +++ libva-1.0.1/debian/i965-va-driver.install @@ -0,0 +1 @@ +usr/lib/dri/i965_drv_video.so --- libva-1.0.1.orig/debian/vainfo.install +++ libva-1.0.1/debian/vainfo.install @@ -0,0 +1 @@ +usr/bin/vainfo --- libva-1.0.1.orig/debian/README.Debian +++ libva-1.0.1/debian/README.Debian @@ -0,0 +1,7 @@ +libva for Debian +---------------- + +This library implements the Video Acceleration (VA) API for Linux. +It will load a hardware dependendent video acceleration driver. + + -- Waldo Bastian Mon, 18 Jun 2007 21:35:31 -0700 --- libva-1.0.1.orig/debian/changelog +++ libva-1.0.1/debian/changelog @@ -0,0 +1,66 @@ +libva (1.0.1-3~ppa1~lucid2) lucid; urgency=low + + * Backport to Lucid. + + -- Nicola Ferralis Sat, 17 Jul 2010 13:06:44 -0700 + +libva (1.0.1-3) unstable; urgency=low + + * Don't build i965 driver on non-i386 or non-amd64 architectures. + * Fix warnings produced during build. + * Remove useless dependency for dummy driver, fixing circular + dependency. (Closes: #583884) + * Remove unnecessary dependency on libva for libva-x11. + * Refresh all patches. + + -- Andres Mejia Wed, 02 Jun 2010 19:02:50 -0400 + +libva (1.0.1-2) unstable; urgency=low + + * Fix copyright issues. + * Added 'DM-Upload-Allowed: yes' entry. + + -- Andres Mejia Sat, 29 May 2010 12:18:20 -0400 + +libva (1.0.1-1) unstable; urgency=low + + * New upstream release. (Closes: #569635) + * Rework debianization. + + -- Andres Mejia Fri, 12 Feb 2010 18:55:19 -0500 + +libva (0.24-1) unstable; urgency=low + + * Updated to v0.24 + * Display attributes added + * H264 parameter fixes + * Swapped vaGetConfigAttributes and vaQueryConfigAttributes + + -- Waldo Bastian Thu, 20 Sep 2007 15:08:04 -0700 + +libva (0.22-1) unstable; urgency=low + + * Updated to v0.22 + * VAImage and VASubpicture added + + -- Waldo Bastian Fri, 07 Sep 2007 04:32:28 -0700 + +libva (0.20-1) unstable; urgency=low + + * Updated to v0.20 + * Clean up & exporting DRI interface + + -- Waldo Bastian Thu, 09 Aug 2007 11:49:43 -0700 + +libva (0.20~-1) unstable; urgency=low + + * Add VA_INVALID_SURFACE + + -- Waldo Bastian Wed, 11 Jul 2007 17:24:10 -0700 + +libva (0.20~~-1) unstable; urgency=low + + * Initial release of libva + + -- Waldo Bastian Mon, 18 Jun 2007 21:35:31 -0700 + --- libva-1.0.1.orig/debian/control +++ libva-1.0.1/debian/control @@ -0,0 +1,99 @@ +Source: libva +Priority: optional +Maintainer: Debian Multimedia Maintainers +Uploaders: Andres Mejia +Build-Depends: debhelper (>= 7.0.50), + quilt (>= 0.46-7), + pkg-config, + libdrm-dev (>= 2.3.0), + libxext-dev, + libxfixes-dev, + libx11-dev, +Standards-Version: 3.8.4 +Section: libs +Homepage: http://www.freedesktop.org/wiki/Software/vaapi +Vcs-Git: git://git.debian.org/git/pkg-multimedia/libva.git +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libva.git;a=summary +DM-Upload-Allowed: yes + +Package: libva-dev +Section: libdevel +Architecture: all +Depends: libva1 (>= ${source:Upstream-Version}), + libva1 (<< ${source:Upstream-Version}+1~), + libva-x11-1 (>= ${source:Upstream-Version}), + libva-x11-1 (<< ${source:Upstream-Version}+1~), + ${shlibs:Depends}, + ${misc:Depends} +Description: Video Acceleration (VA) API for Linux -- development files + Video Acceleration API (VA API) is a library ("libVA") and API specification + which enables and provides access to graphics hardware (GPU) acceleration for + video processing on Linux and UNIX based operating systems. Accelerated + processing includes video decoding, video encoding, subpicture blending and + rendering. The specification was originally designed by Intel for its GMA + (Graphics Media Accelerator) series of GPU hardware, the API is however not + limited to GPUs or Intel specific hardware, as other hardware and manufacturers + can also freely use this API for hardware accelerated video decoding. + . + This package provides the development environment for libva. + +Package: libva1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Video Acceleration (VA) API for Linux -- runtime + Video Acceleration API (VA API) is a library ("libVA") and API specification + which enables and provides access to graphics hardware (GPU) acceleration for + video processing on Linux and UNIX based operating systems. Accelerated + processing includes video decoding, video encoding, subpicture blending and + rendering. The specification was originally designed by Intel for its GMA + (Graphics Media Accelerator) series of GPU hardware, the API is however not + limited to GPUs or Intel specific hardware, as other hardware and manufacturers + can also freely use this API for hardware accelerated video decoding. + . + This package provides the main libva library. + +Package: libva-x11-1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Video Acceleration (VA) API for Linux -- X11 runtime + Video Acceleration API (VA API) is a library ("libVA") and API specification + which enables and provides access to graphics hardware (GPU) acceleration for + video processing on Linux and UNIX based operating systems. Accelerated + processing includes video decoding, video encoding, subpicture blending and + rendering. The specification was originally designed by Intel for its GMA + (Graphics Media Accelerator) series of GPU hardware, the API is however not + limited to GPUs or Intel specific hardware, as other hardware and manufacturers + can also freely use this API for hardware accelerated video decoding. + . + This package provides the libva-x11 library. + +Package: i965-va-driver +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 +Provides: va-driver +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Video Acceleration (VA) API for Linux -- i965 VA driver + Video Acceleration API (VA API) is a library ("libVA") and API specification + which enables and provides access to graphics hardware (GPU) acceleration for + video processing on Linux and UNIX based operating systems. Accelerated + processing includes video decoding, video encoding, subpicture blending and + rendering. The specification was originally designed by Intel for its GMA + (Graphics Media Accelerator) series of GPU hardware, the API is however not + limited to GPUs or Intel specific hardware, as other hardware and manufacturers + can also freely use this API for hardware accelerated video decoding. + . + This package provides the Intel i965 VA backend driver. + +Package: vainfo +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Video Acceleration (VA) API for Linux -- info program + Video Acceleration API (VA API) is a library ("libVA") and API specification + which enables and provides access to graphics hardware (GPU) acceleration for + video processing on Linux and UNIX based operating systems. Accelerated + processing includes video decoding, video encoding, subpicture blending and + rendering. The specification was originally designed by Intel for its GMA + (Graphics Media Accelerator) series of GPU hardware, the API is however not + limited to GPUs or Intel specific hardware, as other hardware and manufacturers + can also freely use this API for hardware accelerated video decoding. + . + This package provides the vainfo program. --- libva-1.0.1.orig/debian/README.source +++ libva-1.0.1/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for it's patch system. Please refer to +/usr/share/doc/quilt/README.source for more information. --- libva-1.0.1.orig/debian/watch +++ libva-1.0.1/debian/watch @@ -0,0 +1,5 @@ +#version=3 +#opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$//i,dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg)(.*)$//i,pasv \ +#http://cgit.freedesktop.org/libva/snapshot/libva-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian uupdate + +# uscan can't properly scan http://cgit.freedesktop.org/libva/snapshot --- libva-1.0.1.orig/debian/compat +++ libva-1.0.1/debian/compat @@ -0,0 +1 @@ +7 --- libva-1.0.1.orig/debian/libva1.install +++ libva-1.0.1/debian/libva1.install @@ -0,0 +1,2 @@ +usr/lib/libva.so.* +usr/lib/dri/dummy_drv_video.so --- libva-1.0.1.orig/debian/vainfo.manpages +++ libva-1.0.1/debian/vainfo.manpages @@ -0,0 +1 @@ +debian/vainfo.1 --- libva-1.0.1.orig/debian/libva-x11-1.install +++ libva-1.0.1/debian/libva-x11-1.install @@ -0,0 +1 @@ +usr/lib/libva-x11.so.* --- libva-1.0.1.orig/debian/vainfo.1 +++ libva-1.0.1/debian/vainfo.1 @@ -0,0 +1,6 @@ +.TH VAINFO "1" "February 2010" "vainfo" "User Commands" +.SH NAME +vainfo \- display information from VA API driver +.SH DESCRIPTION +This program displays information from about the VA API driver installed in the +system. --- libva-1.0.1.orig/debian/libva-dev.install +++ libva-1.0.1/debian/libva-dev.install @@ -0,0 +1,4 @@ +usr/include +usr/lib/libva.so +usr/lib/libva-x11.so +usr/lib/pkgconfig --- libva-1.0.1.orig/debian/rules +++ libva-1.0.1/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +I965_DRIVER=$(shell dpkg-architecture -a$(DEB_HOST_ARCH) -iany-amd64 || \ + dpkg-architecture -a$(DEB_HOST_ARCH) -iany-i386 && \ + echo '--enable-i965-driver') + +CONFIGURE_OPTIONS ?= --prefix=/usr $(I965_DRIVER) + +%: + dh --with quilt $@ + +override_dh_auto_configure: + dh_testdir + ./configure $(CONFIGURE_OPTIONS) --- libva-1.0.1.orig/debian/patches/autoreconf.patch +++ libva-1.0.1/debian/patches/autoreconf.patch @@ -0,0 +1,1381 @@ +Patch that applies modifications after running 'autoreconf -vif' +========================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -217,6 +217,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -7986,6 +7986,7 @@ + m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) + + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# serial 1 (pkg-config-0.24) + # + # Copyright © 2004 Scott James Remnant . + # +@@ -8013,7 +8014,10 @@ + AC_DEFUN([PKG_PROG_PKG_CONFIG], + [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) + m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) ++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) ++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) ++ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + fi +@@ -8026,7 +8030,6 @@ + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +- + fi[]dnl + ])# PKG_PROG_PKG_CONFIG + +@@ -8035,34 +8038,31 @@ + # Check to see whether a particular set of modules exists. Similar + # to PKG_CHECK_MODULES(), but does not set variables or print errors. + # +-# +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually ++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++# only at the first occurence in configure.ac, so if the first place ++# it's called might be skipped (such as if it is within an "if", you ++# have to call PKG_CHECK_EXISTS manually + # -------------------------------------------------------------- + AC_DEFUN([PKG_CHECK_EXISTS], + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) ++ m4_default([$2], [:]) + m4_ifvaln([$3], [else + $3])dnl + fi]) + +- + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -8104,16 +8104,17 @@ + See the pkg-config man page for more details.]) + + if test $pkg_failed = yes; then ++ AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +- ifelse([$4], , [AC_MSG_ERROR(dnl ++ m4_default([$4], [AC_MSG_ERROR( + [Package requirements ($2) were not met: + + $$1_PKG_ERRORS +@@ -8121,25 +8122,24 @@ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT +-])], +- [AC_MSG_RESULT([no]) +- $4]) ++_PKG_TEXT])dnl ++ ]) + elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl ++ AC_MSG_RESULT([no]) ++ m4_default([$4], [AC_MSG_FAILURE( + [The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + + _PKG_TEXT + +-To get pkg-config, see .])], +- [$4]) ++To get pkg-config, see .])dnl ++ ]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) ++ $3 + fi[]dnl + ])# PKG_CHECK_MODULES + +--- a/config.guess ++++ b/config.guess +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + # Free Software Foundation, Inc. + +-timestamp='2009-06-10' ++timestamp='2009-12-30' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -27,16 +27,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +56,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ++Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -333,6 +334,9 @@ + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" +@@ -807,12 +811,12 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) ++ *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd | genuineintel) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -854,6 +858,20 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -876,6 +894,17 @@ + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +@@ -901,39 +930,18 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -942,8 +950,11 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +@@ -966,58 +977,6 @@ + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1247,6 +1206,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +--- a/config.sub ++++ b/config.sub +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + # Free Software Foundation, Inc. + +-timestamp='2009-06-11' ++timestamp='2010-01-22' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -32,13 +32,16 @@ + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +75,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ++Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -149,7 +153,7 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; +@@ -284,6 +288,7 @@ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ ++ | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +@@ -291,13 +296,14 @@ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none +@@ -340,7 +346,7 @@ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -368,15 +374,17 @@ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ ++ | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ +@@ -726,6 +734,9 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -1076,6 +1087,11 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu ++ ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu +@@ -1247,6 +1263,9 @@ + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1268,8 +1287,8 @@ + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -kopensolaris* \ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +@@ -1290,7 +1309,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1423,6 +1442,8 @@ + -dicos*) + os=-dicos + ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +--- a/configure ++++ b/configure +@@ -766,6 +766,8 @@ + XEXT_CFLAGS + X11_LIBS + X11_CFLAGS ++PKG_CONFIG_LIBDIR ++PKG_CONFIG_PATH + PKG_CONFIG + CPP + OTOOL64 +@@ -906,6 +908,8 @@ + CPPFLAGS + CPP + PKG_CONFIG ++PKG_CONFIG_PATH ++PKG_CONFIG_LIBDIR + X11_CFLAGS + X11_LIBS + XEXT_CFLAGS +@@ -1565,6 +1569,10 @@ + you have headers in a nonstandard directory + CPP C preprocessor + PKG_CONFIG path to pkg-config utility ++ PKG_CONFIG_PATH ++ directories to add to pkg-config's search path ++ PKG_CONFIG_LIBDIR ++ path overriding pkg-config's built-in search path + X11_CFLAGS C compiler flags for X11, overriding pkg-config + X11_LIBS linker flags for X11, overriding pkg-config + XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config +@@ -4520,13 +4528,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4523: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:4531: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4526: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:4534: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4529: output\"" >&5) ++ (eval echo "\"\$as_me:4537: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -5732,7 +5740,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5735 "configure"' > conftest.$ac_ext ++ echo '#line 5743 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7228,11 +7236,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7231: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7239: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7235: \$? = $ac_status" >&5 ++ echo "$as_me:7243: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7567,11 +7575,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7570: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7578: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7574: \$? = $ac_status" >&5 ++ echo "$as_me:7582: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7672,11 +7680,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7675: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7683: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7679: \$? = $ac_status" >&5 ++ echo "$as_me:7687: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -7727,11 +7735,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7738: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7734: \$? = $ac_status" >&5 ++ echo "$as_me:7742: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10111,7 +10119,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10114 "configure" ++#line 10122 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10207,7 +10215,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10210 "configure" ++#line 10218 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11415,6 +11423,10 @@ + + + ++ ++ ++ ++ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +@@ -11527,18 +11539,16 @@ + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +- + fi + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 + $as_echo_n "checking for X11... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$X11_CFLAGS"; then +- pkg_cv_X11_CFLAGS="$X11_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$X11_CFLAGS"; then ++ pkg_cv_X11_CFLAGS="$X11_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? +@@ -11548,15 +11558,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$X11_LIBS"; then +- pkg_cv_X11_LIBS="$X11_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$X11_LIBS"; then ++ pkg_cv_X11_LIBS="$X11_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? +@@ -11566,14 +11574,15 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -11581,9 +11590,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` ++ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1` + else +- X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` ++ X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$X11_PKG_ERRORS" >&5 +@@ -11597,9 +11606,10 @@ + + Alternatively, you may set the environment variables X11_CFLAGS + and X11_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "The pkg-config script could not be found or is too old. Make sure it +@@ -11617,18 +11627,17 @@ + X11_LIBS=$pkg_cv_X11_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- : ++ + fi + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5 + $as_echo_n "checking for XEXT... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XEXT_CFLAGS"; then +- pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XEXT_CFLAGS"; then ++ pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xext") 2>&5 + ac_status=$? +@@ -11638,15 +11647,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XEXT_LIBS"; then +- pkg_cv_XEXT_LIBS="$XEXT_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XEXT_LIBS"; then ++ pkg_cv_XEXT_LIBS="$XEXT_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xext") 2>&5 + ac_status=$? +@@ -11656,14 +11663,15 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -11671,9 +11679,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xext"` ++ XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xext" 2>&1` + else +- XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"` ++ XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xext" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XEXT_PKG_ERRORS" >&5 +@@ -11687,9 +11695,10 @@ + + Alternatively, you may set the environment variables XEXT_CFLAGS + and XEXT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "The pkg-config script could not be found or is too old. Make sure it +@@ -11707,18 +11716,17 @@ + XEXT_LIBS=$pkg_cv_XEXT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- : ++ + fi + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFIXES" >&5 + $as_echo_n "checking for XFIXES... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XFIXES_CFLAGS"; then +- pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XFIXES_CFLAGS"; then ++ pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfixes\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xfixes") 2>&5 + ac_status=$? +@@ -11728,15 +11736,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XFIXES_LIBS"; then +- pkg_cv_XFIXES_LIBS="$XFIXES_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XFIXES_LIBS"; then ++ pkg_cv_XFIXES_LIBS="$XFIXES_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfixes\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xfixes") 2>&5 + ac_status=$? +@@ -11746,14 +11752,15 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -11761,9 +11768,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfixes"` ++ XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfixes" 2>&1` + else +- XFIXES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfixes"` ++ XFIXES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfixes" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XFIXES_PKG_ERRORS" >&5 +@@ -11777,9 +11784,10 @@ + + Alternatively, you may set the environment variables XFIXES_CFLAGS + and XFIXES_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "The pkg-config script could not be found or is too old. Make sure it +@@ -11797,18 +11805,17 @@ + XFIXES_LIBS=$pkg_cv_XFIXES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- : ++ + fi + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRM" >&5 + $as_echo_n "checking for DRM... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRM_CFLAGS"; then +- pkg_cv_DRM_CFLAGS="$DRM_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRM_CFLAGS"; then ++ pkg_cv_DRM_CFLAGS="$DRM_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 + ac_status=$? +@@ -11818,15 +11825,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRM_LIBS"; then +- pkg_cv_DRM_LIBS="$DRM_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRM_LIBS"; then ++ pkg_cv_DRM_LIBS="$DRM_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 + ac_status=$? +@@ -11836,14 +11841,15 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -11851,9 +11857,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm"` ++ DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm" 2>&1` + else +- DRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm"` ++ DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DRM_PKG_ERRORS" >&5 +@@ -11867,9 +11873,10 @@ + + Alternatively, you may set the environment variables DRM_CFLAGS + and DRM_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "The pkg-config script could not be found or is too old. Make sure it +@@ -11887,7 +11894,7 @@ + DRM_LIBS=$pkg_cv_DRM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- : ++ + fi + + +@@ -11895,11 +11902,10 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEN4ASM" >&5 + $as_echo_n "checking for GEN4ASM... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GEN4ASM_CFLAGS"; then +- pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GEN4ASM_CFLAGS"; then ++ pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5 + ac_status=$? +@@ -11909,15 +11915,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GEN4ASM_LIBS"; then +- pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GEN4ASM_LIBS"; then ++ pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5 + ac_status=$? +@@ -11927,14 +11931,15 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -11942,17 +11947,17 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"` ++ GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "intel-gen4asm >= 1.0" 2>&1` + else +- GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"` ++ GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --print-errors "intel-gen4asm >= 1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GEN4ASM_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- gen4asm=no ++ gen4asm=no + elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + gen4asm=no + else + GEN4ASM_CFLAGS=$pkg_cv_GEN4ASM_CFLAGS +--- a/dummy_drv_video/Makefile.in ++++ b/dummy_drv_video/Makefile.in +@@ -91,6 +91,7 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(dummy_drv_video_ladir)" + LTLIBRARIES = $(dummy_drv_video_la_LTLIBRARIES) ++dummy_drv_video_la_LIBADD = + am_dummy_drv_video_la_OBJECTS = dummy_drv_video.lo object_heap.lo + dummy_drv_video_la_OBJECTS = $(am_dummy_drv_video_la_OBJECTS) + dummy_drv_video_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -182,6 +183,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -252,8 +255,6 @@ + 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 = $(top_srcdir)/src/$(libvabackendlib) +-dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA + dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c + noinst_HEADERS = dummy_drv_video.h object_heap.h +--- a/i965_drv_video/Makefile.in ++++ b/i965_drv_video/Makefile.in +@@ -223,6 +223,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/i965_drv_video/shaders/Makefile.in ++++ b/i965_drv_video/shaders/Makefile.in +@@ -153,6 +153,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/i965_drv_video/shaders/mpeg2/Makefile.in ++++ b/i965_drv_video/shaders/mpeg2/Makefile.in +@@ -153,6 +153,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/i965_drv_video/shaders/mpeg2/vld/Makefile.in ++++ b/i965_drv_video/shaders/mpeg2/vld/Makefile.in +@@ -113,6 +113,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/i965_drv_video/shaders/render/Makefile.in ++++ b/i965_drv_video/shaders/render/Makefile.in +@@ -113,6 +113,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -227,6 +227,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -310,9 +312,9 @@ + libva_la_LDFLAGS = $(LDADD) -no-undefined + libva_la_LIBADD = $(LIBVA_LIBS) -ldl + libva_x11_la_SOURCES = +-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) ++libva_x11_la_LIBADD = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) + libva_x11_la_LDFLAGS = $(LDADD) +-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la ++libva_x11_la_DEPENDENCIES = x11/libva_x11.la + SUBDIRS = x11 + libva_la_SOURCES = va.c + libvaincludedir = ${includedir}/va +--- a/src/x11/Makefile.in ++++ b/src/x11/Makefile.in +@@ -179,6 +179,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -194,6 +194,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -262,8 +264,12 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA +-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) +-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) ++vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++ ++vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++ + vainfo_SOURCES = vainfo.c + SUBDIRS = basic decode encode putsurface + all: all-recursive +--- a/test/basic/Makefile.in ++++ b/test/basic/Makefile.in +@@ -196,6 +196,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -264,7 +266,9 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++ + test_01_LDADD = $(TEST_LIBS) + test_01_SOURCES = test_01.c + test_02_LDADD = $(TEST_LIBS) +--- a/test/decode/Makefile.in ++++ b/test/decode/Makefile.in +@@ -157,6 +157,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -225,7 +227,9 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++ + mpeg2vldemo_LDADD = $(TEST_LIBS) + mpeg2vldemo_SOURCES = mpeg2vldemo.c + all: all-am +--- a/test/encode/Makefile.in ++++ b/test/encode/Makefile.in +@@ -157,6 +157,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -225,7 +227,9 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++ + h264encode_LDADD = $(TEST_LIBS) + h264encode_SOURCES = h264encode.c + all: all-am +--- a/test/putsurface/Makefile.in ++++ b/test/putsurface/Makefile.in +@@ -157,6 +157,8 @@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -225,7 +227,9 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++ + putsurface_LDADD = $(TEST_LIBS) + putsurface_SOURCES = putsurface.c + all: all-am --- libva-1.0.1.orig/debian/patches/fix-warnings.patch +++ libva-1.0.1/debian/patches/fix-warnings.patch @@ -0,0 +1,27 @@ +Patch to fix a few warnings. +Fix for strtok_r is for "expected ‘char * __restrict__’ but argument is of type +‘const char *’" warning. +Second is to fix "cast to pointer from integer of different size" warning. +========================================================================== +--- a/src/va.c ++++ b/src/va.c +@@ -141,7 +141,7 @@ + } + + search_path = strdup((const char *)search_path); +- driver_dir = strtok_r((const char *)search_path, ":", &saveptr); ++ driver_dir = strtok_r(search_path, ":", &saveptr); + while(driver_dir) + { + void *handle = NULL; +--- a/test/putsurface/putsurface.c ++++ b/test/putsurface/putsurface.c +@@ -241,7 +241,7 @@ + while (surface_id == VA_INVALID_SURFACE) + surface_id = get_next_free_surface(&index); + +- if (verbose) printf("Thread %x Display surface 0x%p,\n", (unsigned int)win, (void *)surface_id); ++ if (verbose) printf("Thread %x Display surface 0x%p,\n", (unsigned int)win, &surface_id); + + upload_surface(va_dpy, surface_id, box_width, row_shift, display_field); + --- libva-1.0.1.orig/debian/patches/remove-unneeded-dep2.patch +++ libva-1.0.1/debian/patches/remove-unneeded-dep2.patch @@ -0,0 +1,80 @@ +Patch to remove unnecessary dependency on libva for libva-x11. libva-x11 uses +none of libva's symbols. +========================================================================== +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -37,9 +37,9 @@ + libva_la_LIBADD = $(LIBVA_LIBS) -ldl + + libva_x11_la_SOURCES = +-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) ++libva_x11_la_LIBADD = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) + libva_x11_la_LDFLAGS = $(LDADD) +-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la ++libva_x11_la_DEPENDENCIES = x11/libva_x11.la + + SUBDIRS = x11 + +--- a/test/basic/Makefile.am ++++ b/test/basic/Makefile.am +@@ -25,7 +25,8 @@ + + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) + + test_01_LDADD = $(TEST_LIBS) + test_01_SOURCES = test_01.c +--- a/test/decode/Makefile.am ++++ b/test/decode/Makefile.am +@@ -24,7 +24,8 @@ + + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) + + mpeg2vldemo_LDADD = $(TEST_LIBS) + mpeg2vldemo_SOURCES = mpeg2vldemo.c +--- a/test/encode/Makefile.am ++++ b/test/encode/Makefile.am +@@ -24,7 +24,8 @@ + + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) + + h264encode_LDADD = $(TEST_LIBS) + h264encode_SOURCES = h264encode.c +--- a/test/putsurface/Makefile.am ++++ b/test/putsurface/Makefile.am +@@ -24,7 +24,8 @@ + + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + +-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) ++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) + + putsurface_LDADD = $(TEST_LIBS) + putsurface_SOURCES = putsurface.c +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -26,8 +26,10 @@ + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA + + +-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) +-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) ++vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) ++vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) \ ++ $(top_srcdir)/src/$(libvacorelib) + vainfo_SOURCES = vainfo.c + + SUBDIRS = basic decode encode putsurface --- libva-1.0.1.orig/debian/patches/remove-unneeded-dep.patch +++ libva-1.0.1/debian/patches/remove-unneeded-dep.patch @@ -0,0 +1,13 @@ +Patch to remove unnecessary dependency to libva-x11 for dummy driver +========================================================================== +--- a/dummy_drv_video/Makefile.am ++++ b/dummy_drv_video/Makefile.am +@@ -23,8 +23,6 @@ + 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 = $(top_srcdir)/src/$(libvabackendlib) +-dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) + + AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA + dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c --- libva-1.0.1.orig/debian/patches/series +++ libva-1.0.1/debian/patches/series @@ -0,0 +1,4 @@ +fix-warnings.patch +remove-unneeded-dep.patch +remove-unneeded-dep2.patch +autoreconf.patch