Commit 3cfad072 authored by Andres Mejia's avatar Andres Mejia

Imported Upstream version 0.4.1

parent 341eb374
commit 76fdf83a7690ce366edbd4816b3c4b6728eeb9ee
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jan 28 15:01:25 2010 -0800
Bump version to 0.4
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 341c7e49b8c98f1a7b1a3ae719f15acd694719ca
Author: Stephen Warren <swarren@nvidia.com>
Date: Thu Jan 28 15:00:32 2010 -0800
trace: Fix a picture info bracket mismatch.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit f3bbd295d310d6ea44f00fa6c787a7427f01cd05
Author: Stephen Warren <swarren@nvidia.com>
Date: Thu Jan 28 14:58:40 2010 -0800
YV12 documentation fix.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 4e2b6f38f640f341ec49336aaaccfb136decbdff
Author: Stephen Warren <swarren@nvidia.com>
Date: Thu Jan 28 14:56:59 2010 -0800
Documentation enhancements for Uoti from ffmpeg.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 97331f1c8ee7c83f0dd6dff0ecc5bc51bf78022b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 27 18:17:23 2010 -0800
Update the COPYING copyright date to include recent changes
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 3c02e5c68ef9480a0f9e5c3af5b09e6b3dcd981d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 27 18:16:41 2010 -0800
Query DRI2 for the driver name.
If the VDPAU_DRIVER environment variable is not set, use DRI2Connect to query
the VDPAU driver name from the X server.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
commit a9c69d294ae41fffadb432caa66917a4e7d107a8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Dec 14 10:52:41 2009 -0800
$(docdir) apparently requires autoconf 2.60
commit 72c3ea0d5705ac5b21e5096742d9ec57573e543d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Nov 20 11:54:36 2009 -0800
Bump version to 0.3
commit e864d59682b91bf9d596c2dadc657c932fae32e1
Author: Stephen Warren <swarren@nvidia.com>
Date: Tue Nov 17 14:04:33 2009 -0800
Update VDPAU_VERSION and add VDPAU_INTERFACE_VERSION
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 0537b13e292bc772e984872a3986e41fb51f9258
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Nov 17 00:18:05 2009 -0800
Move VDPAU drivers into their own module directory.
* Add a --with-module-dir configure parameter.
* Pass the moduledir into the wrapper. Use it to construct the path to search
for drivers. Require drivers to end in a ".1" version, in case we ever want
to rev. the interface between the wrapper and the drivers.
* If no driver is found in the new module dir, look for one in the default
search paths. This is intended to find libvdpau_nvidia.so for drivers that
predate the change to move it, and can be removed in the future.
* Stash the moduledir into vdpau.pc. Drivers can find this with
`pkg-config --variable=moduledir vdpau`.
* Add a version to libvdpau_trace.so in case the interface between it and
libvdpau.so ever changes.
* Install libvdpau_trace.so.1 to moduledir instead of libdir.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
commit f1f2b25e39b7092a94067f1c787a9b5c5c58bb5d
Author: Stephen Warren <swarren@nvidia.com>
Date: Fri Oct 23 15:47:32 2009 -0700
Documentation updates.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit cf794deacff4e9cec47d539a717d12c8865543ea
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 23 14:55:17 2009 -0700
Fix distcheck.
* Uninstall the docs if they were installed.
* Remember to distribute Doxyfile and vdpau_data_flow.png in the
tarball.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
commit fceec0aa07e4acb471e80c0ecb7a1d5724025874
Author: Aaron Plattner <aaron@weasel.nvidia.com>
Date: Fri Sep 25 17:24:01 2009 -0700
Build documentation.
Detect when doxygen, dot, and pdflatex are installed. When they are, enable
documentation. Add --enable-documentation and --disable-documentation to
override the autodetection. Install the docs to the configured docdir (usually
$prefix/share/doc/libvdpau).
commit 2af62b19ede3365a437225ae71a2d5ee203e7b47
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 17 11:33:00 2009 -0700
Use XORG_CHANGELOG to generate the changelog.
Steal the XORG_CHANGELOG macro from X.Org and stash it in acinclude.m4.
commit f13dd1050569359016a925dfd7a4af234ce68668
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Sep 14 14:01:05 2009 -0700
Bump version to 0.2 for new features
commit 46e791147ac43ecd2fbfbc6bdf3bebda9030b51e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Sep 4 12:27:12 2009 -0700
Updates for the NVIDIA 190.32 driver release.
Add profiles for MPEG-4 part 2, DivX 4, and DivX 5. Also add new high quality
scaling options.
commit 50925e6b95aa9eaebd26c35f1f8f6af7acec4814
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Aug 17 17:25:43 2009 -0700
Add a check for -ldl, stolen from xorg-server's configure.ac.
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
commit 7fa59a29b65da47cbee52d92280306edda5ae317
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jul 8 16:16:48 2009 -0700
libvdpau_trace cleanups
commit 240441a8a26cad8319170edd0d0d163bb6d6c3ff
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Mar 25 10:08:11 2009 -0700
vdpau.h typo fix: "thread_1" should have been "thread_2"
commit 48baffd9a00a02f3e4e3971133989127aeb9ce15
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Mar 15 12:01:04 2009 -0700
VDPAU trace: Dump picture info for H.264 and VC-1
commit 2fe18543d702b6be96fc547e286af0edce542fc6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Mar 15 12:00:22 2009 -0700
vdpau{,_x11}.h: Trailing whitespace removal
commit 2fe9e460ee0e48101df5d50ab768b8c9225587e0
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Mar 15 11:58:32 2009 -0700
vdpau.h: Document exact bitstream data requirements
commit 9f2ccd388312649942c6b1f56b497b039541ceb2
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Mar 15 11:52:26 2009 -0700
Trace VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE
I forgot to include this change in commit
1290f7c190e38f483b0203e932715a68b899e35c.
commit 1290f7c190e38f483b0203e932715a68b899e35c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Mar 5 17:15:47 2009 -0800
Docs: Fix some VdpDecoderRender references that should have been VdpVideoMixerRender.
commit 84eda285a526d31a81e7e082da0fde566c9353e0
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 18 09:13:35 2009 -0800
Add a "Skip chroma deinterlace" feature, improve VdpVideoMixer documentation.
commit 1f9395341d09886a95a0d4fdad6c2a359c0d636d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sat Feb 14 15:16:29 2009 -0800
Print dlerror() when various libdl calls fail.
Without printouts, it's impossible to tell why VDPAU initialization fails when
it can't open the backend or trace libraries or can't find various symbols.
commit 3bd1c7efd002973e673fd88ef37c15ddd6e028ae
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Feb 13 13:37:27 2009 -0800
Update VC-1 SP/MP range reduction documentation.
commit 15cab0dd011633105cafa150366a4ef8e6dc8a1f
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Feb 6 12:27:56 2009 -0800
Fix a typo in the VdpOutputSurfaceRenderBitmapSurface documentation.
commit b9cf19db769d80652e57f7c6173e692e374942b0
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 14 10:46:35 2009 -0800
Add some authors
commit d3906368d902d19acd8827d0e6b1b97c42be20ff
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 14 10:32:56 2009 -0800
Disable static libraries by default and remove version info from libvdpau_trace.
commit d2e66e58f6588a90f3ea4c4e95a861704d640965
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 14 10:06:56 2009 -0800
Add a .gitignore.
commit 094f3ab6be32623dd36356027ac067d5607a4d80
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jan 13 17:25:04 2009 -0800
Include the right headers.
commit ae7d5d2425137cd3e7da338a80bdcad3f50f4ce7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jan 13 16:58:45 2009 -0800
Add autoconf stuff.
commit b11a35a13b478615d60fe1908665b8f4349aa780
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jan 13 16:18:44 2009 -0800
Initial commit.
# Makefile.in generated by automake 1.11 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -190,6 +190,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDFTEX = @PDFTEX@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
......@@ -355,7 +357,7 @@ uninstall-pkgconfigDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -380,7 +382,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -547,7 +549,8 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
......@@ -591,17 +594,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
# generated automatically by aclocal 1.11 -*- Autoconf -*-
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
[m4_warning([this file was generated for autoconf 2.64.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......@@ -2460,7 +2460,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
linux* | k*bsd*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
......@@ -3099,7 +3099,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
linux* | k*bsd*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
......@@ -3720,7 +3720,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
linux* | k*bsd*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
......@@ -4004,7 +4004,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
linux* | k*bsd*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
......@@ -4300,6 +4300,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
......@@ -4391,7 +4392,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu)
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
......@@ -5871,7 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
linux* | k*bsd*-gnu)
linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
......@@ -7878,15 +7879,15 @@ m4_define([lt_dict_filter],
# Generated from ltversion.in.
# serial 3012 ltversion.m4
# serial 3017 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.2.6])
m4_define([LT_PACKAGE_REVISION], [1.3012])
m4_define([LT_PACKAGE_VERSION], [2.2.6b])
m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.6'
macro_revision='1.3012'
[macro_version='2.2.6b'
macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
......@@ -7985,6 +7986,7 @@ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
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 <scott@netsplit.com>.
#
......@@ -8012,7 +8014,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
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
......@@ -8025,7 +8030,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
......@@ -8034,34 +8038,31 @@ fi[]dnl
# 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
......@@ -8103,16 +8104,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
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
......@@ -8120,25 +8122,24 @@ $$1_PKG_ERRORS
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 <http://pkg-config.freedesktop.org/>.])],
[$4])
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])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
......@@ -8157,7 +8158,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11], [],
m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -8173,7 +8174,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11])dnl
[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
This diff is collapsed.
#! /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
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
timestamp='2009-04-17'
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 @@ timestamp='2009-04-17'
# Please send patches to <config-patches@gnu.org>. 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 @@ Report bugs and patches to <config-patches@gnu.org>."
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,10 +153,13 @@ case $os in
-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
;;
-bluegene*)
os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
......@@ -281,6 +288,7 @@ case $basic_machine in
| 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 \
......@@ -288,13 +296,14 @@ case $basic_machine in
| 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
......@@ -337,7 +346,7 @@ case $basic_machine in
| 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-* \
......@@ -365,15 +374,17 @@ case $basic_machine in
| 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]-* \
......@@ -467,6 +478,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
basic_machine=powerpc-ibm
os=-cnk
;;
c90)
basic_machine=c90-cray
os=-unicos
......@@ -719,6 +734,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
basic_machine=i386-pc
os=-mingw32
......@@ -1069,6 +1087,11 @@ case $basic_machine in
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
......@@ -1240,6 +1263,9 @@ case $os in
# 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|'`
;;
......@@ -1260,9 +1286,9 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
......@@ -1283,7 +1309,7 @@ case $os in
| -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*)
......@@ -1416,6 +1442,8 @@ case $os in
-dicos*)
os=-dicos
;;
-nacl*)
;;
-none)
;;
*)
......@@ -1613,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
-aix*)
-cnk*|-aix*)
vendor=ibm
;;
-beos*)
......
This diff is collapsed.
AC_PREREQ(2.60)
AC_INIT(libvdpau, 0.4, [xorg@lists.freedesktop.org], libvdpau)
AC_INIT(libvdpau, 0.4.1, [xorg@lists.freedesktop.org], libvdpau)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
......
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2007-03-29.01
scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
# Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License