diff -Nru libvdpau-0.9/aclocal.m4 libvdpau-1.0/aclocal.m4 --- libvdpau-0.9/aclocal.m4 2014-12-19 17:33:32.000000000 +0000 +++ libvdpau-1.0/aclocal.m4 2015-03-09 21:23:19.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -125,19 +125,36 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) @@ -736,6 +753,9 @@ _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -743,6 +763,17 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" @@ -2216,6 +2247,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2226,6 +2298,7 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2320,6 +2393,9 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor @@ -2608,6 +2684,7 @@ case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; @@ -2667,10 +2744,11 @@ soname_spec='$libname$release$shared_ext$major' if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2803,7 +2881,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -3027,10 +3110,20 @@ if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi + if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -3063,8 +3156,10 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER @@ -7360,6 +7455,7 @@ } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7538,51 +7634,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test yes != "$solaris_use_stlport4"; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test yes != "$solaris_use_stlport4"; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -8319,7 +8370,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2014 Free Software +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8751,7 +8802,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8876,7 +8927,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -8885,22 +8936,22 @@ # @configure_input@ -# serial 4151 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.4]) -m4_define([LT_PACKAGE_REVISION], [2.4.4]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.4' -macro_revision='2.4.4' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2014 Free Software +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software # Foundation, Inc. # Written by Scott James Remnant, 2004. # @@ -9213,7 +9264,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9225,10 +9276,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' 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.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9244,14 +9295,14 @@ # 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.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9296,15 +9347,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9335,7 +9385,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9526,7 +9576,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9602,7 +9652,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9692,8 +9742,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -9766,7 +9816,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -9795,7 +9849,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9806,7 +9860,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -9816,7 +9870,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9838,7 +9892,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9873,7 +9927,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9923,7 +9977,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9962,7 +10016,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9991,7 +10045,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10038,7 +10092,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10057,7 +10111,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10138,7 +10192,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10198,7 +10252,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10226,7 +10280,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10245,7 +10299,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru libvdpau-0.9/ChangeLog libvdpau-1.0/ChangeLog --- libvdpau-0.9/ChangeLog 2014-12-19 17:33:45.000000000 +0000 +++ libvdpau-1.0/ChangeLog 2015-03-09 21:23:31.000000000 +0000 @@ -1,3 +1,88 @@ +commit 686633d21b10293a10c1d6ba77499b0d67c23056 +Author: Aaron Plattner +Date: Mon Mar 9 14:22:56 2015 -0700 + + Bump version to 1.0 + + Signed-off-by: Aaron Plattner + +commit 705a8166e03446f77143455c270d9f69fc459eb8 +Author: Aaron Plattner +Date: Thu Jan 29 13:11:25 2015 -0800 + + Use member groups to simplify documentation + + For lists of fields that are copied or derived from the video bitstreams, use + Doxygen member groups to document them once as a block, rather than copying the + text "Copy of the bitstream field." all over the place. This groups + the fields together in the HTML. + + Reviewed-by: Christian König + v2: Rebase on top of José's HEVC work. + Signed-off-by: Aaron Plattner + Reviewed-by: José Hiram Soltren + +commit c199b6107fda78cc575f0bdace6327e85add7fa9 +Author: José Hiram Soltren +Date: Mon Feb 9 12:40:11 2015 -0600 + + Extend the VDPAU API to support H.265/HEVC Decoding + + This patch adds an API for player applications to utilize VDPAU for + hardware-accelerated playback of H.265/HEVC streams. + + The goals of this API are: + - enable hardware accelerated decoding of H.265/HEVC content under VDPAU; + - provide a reference implementation for H.265/HEVC hardware decoding that + is vendor agnostic; + - provide enough data for H.265/HEVC hardware acceleration implementations + from multiple vendors to be able to use the same API; + + This patch is written against "version one" of the H.265/HEVC Specification, + Rec. ITU-T H.265 (04/2013), available at: + + http://handle.itu.int/11.1002/1000/12296 + + A future patch against this header may address bug fixes, and may support + the new features described in "version two" of the H.265/HEVC Specification, + Rec. ITU-T H.265 v2 (10/2014). + + Note that the API does need to be self documenting with Doxygen markup, + which we (NVIDIA) will generate and post as an update to our public VDPAU + documentation. + + This is version 8 of the patch. + + Version 1 was the original version. + + Version 2 was a minor cleanup change. + + Version 3 incorporated 10- and 12-bit formats. + + Version 4 clarified some documentation related to H.265/HEVC support. + + Version 5 clarified some documentation related to H.265/HEVC support + and correcting the Specification URI above. + + Version 6 further corrected the Specification URI above, re-ordered the + fields in VdpPictureInfoHEVC to agree with the Specification, and added + additional documentation for some fields. It also corrected some cosmetic + indentation errors. + + Version 7 removed the sps_sub_layer_ordering_info_present_flag, added a + note on implementing clauses 8.3 through 8.7, clarified the meaning of + sps_max_dec_pic_buffering_minus1, moved the scaling lists to follow + scaling_list_enabled_flag, clarified comments on pps_beta_offset_div2 + and pps_tc_offset_div2, and added "Ignored otherwise." or "Invalid + values are ignored" comments to several fields. + + Version 8 truncated a number of fields related to reference pictures to + 8 bit types, e.g. uint8_t. + + Signed-off-by: Aaron Plattner + Reviewed-by: Aaron Plattner + Acked-by: Christian König + commit 1836c6bc73a1f505490f67144e2d37c4d8646685 Author: Aaron Plattner Date: Fri Dec 19 09:33:09 2014 -0800 diff -Nru libvdpau-0.9/configure libvdpau-1.0/configure --- libvdpau-0.9/configure 2014-12-19 17:33:34.000000000 +0000 +++ libvdpau-1.0/configure 2015-03-09 21:23:22.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libvdpau 0.9. +# Generated by GNU Autoconf 2.69 for libvdpau 1.0. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libvdpau' PACKAGE_TARNAME='libvdpau' -PACKAGE_VERSION='0.9' -PACKAGE_STRING='libvdpau 0.9' +PACKAGE_VERSION='1.0' +PACKAGE_STRING='libvdpau 1.0' PACKAGE_BUGREPORT='vdpau@lists.freedesktop.org' PACKAGE_URL='' @@ -658,6 +658,7 @@ PKG_CONFIG CXXCPP CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -807,6 +808,7 @@ CXX CXXFLAGS CCC +LT_SYS_LIBRARY_PATH CPP CXXCPP PKG_CONFIG @@ -1358,7 +1360,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libvdpau 0.9 to adapt to many kinds of systems. +\`configure' configures libvdpau 1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1428,7 +1430,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libvdpau 0.9:";; + short | recursive ) echo "Configuration of libvdpau 1.0:";; esac cat <<\_ACEOF @@ -1477,6 +1479,8 @@ you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility @@ -1559,7 +1563,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libvdpau configure 0.9 +libvdpau configure 1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1958,7 +1962,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libvdpau $as_me 0.9, which was +It was created by libvdpau $as_me 1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2306,7 +2310,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2507,8 +2511,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2527,7 +2531,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2821,7 +2825,7 @@ # Define the identity of the package. PACKAGE='libvdpau' - VERSION='0.9' + VERSION='1.0' cat >>confdefs.h <<_ACEOF @@ -2855,8 +2859,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2914,6 +2918,7 @@ fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4407,8 +4412,8 @@ -macro_version='2.4.4' -macro_revision='2.4.4' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -6831,6 +6836,21 @@ + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; @@ -7838,6 +7858,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8406,15 +8461,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -10869,6 +10917,8 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor @@ -11157,6 +11207,7 @@ case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; @@ -11216,10 +11267,11 @@ soname_spec='$libname$release$shared_ext$major' if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -11371,7 +11423,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -11596,10 +11653,25 @@ if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi + if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -12598,15 +12670,8 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + func_cc_basename $compiler +cc_basename=$func_cc_basename_result if test -n "$compiler"; then @@ -13993,51 +14058,6 @@ postdep_objects_CXX= postdeps_CXX= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test yes != "$solaris_use_stlport4"; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test yes != "$solaris_use_stlport4"; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac @@ -14861,6 +14881,8 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor @@ -15147,6 +15169,7 @@ case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; @@ -15206,10 +15229,11 @@ soname_spec='$libname$release$shared_ext$major' if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -15361,7 +15385,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -15586,10 +15615,22 @@ if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi + if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + @@ -17113,7 +17154,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libvdpau $as_me 0.9, which was +This file was extended by libvdpau $as_me 1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17179,7 +17220,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libvdpau config.status 0.9 +libvdpau config.status 1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17435,7 +17476,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17638,7 +17680,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -18431,6 +18474,9 @@ # The names of the tagged configurations supported by this script. available_tags='CXX ' +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG # Whether or not to build static libraries. @@ -18680,8 +18726,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18846,6 +18895,65 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" diff -Nru libvdpau-0.9/configure.ac libvdpau-1.0/configure.ac --- libvdpau-0.9/configure.ac 2014-12-19 17:32:57.000000000 +0000 +++ libvdpau-1.0/configure.ac 2015-03-09 21:22:40.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(libvdpau, 0.9, [vdpau@lists.freedesktop.org], libvdpau) +AC_INIT(libvdpau, 1.0, [vdpau@lists.freedesktop.org], libvdpau) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE diff -Nru libvdpau-0.9/debian/changelog libvdpau-1.0/debian/changelog --- libvdpau-0.9/debian/changelog 2015-01-17 19:51:19.000000000 +0000 +++ libvdpau-1.0/debian/changelog 2015-03-10 16:36:26.000000000 +0000 @@ -1,8 +1,18 @@ -libvdpau (0.9-0~~xedgers14.04.1) trusty; urgency=medium +libvdpau (1.0-0ubuntu1~xedgers14.04.1) trusty; urgency=medium * New upstream release - -- Rico Tzschichholz Sat, 17 Jan 2015 20:39:16 +0100 + -- Rico Tzschichholz Tue, 10 Mar 2015 17:33:51 +0100 + +libvdpau (0.9-1) experimental; urgency=medium + + * New upstream release. + * Drop patches cherry-picked from upstream git. + * hardening.patch: Remove, fixed upstream. + * link-with-libx11.patch: Refresh. + * Upload to experimental. + + -- Andreas Beckmann Sat, 24 Jan 2015 18:07:15 +0100 libvdpau (0.8-3) unstable; urgency=medium diff -Nru libvdpau-0.9/debian/control libvdpau-1.0/debian/control --- libvdpau-0.9/debian/control 2014-10-19 20:23:00.000000000 +0000 +++ libvdpau-1.0/debian/control 2015-03-10 16:35:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: libvdpau Section: libs Priority: optional -Maintainer: Debian NVIDIA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian NVIDIA Maintainers Uploaders: Jean-Yves Avenard , Russ Allbery , diff -Nru libvdpau-0.9/debian/copyright libvdpau-1.0/debian/copyright --- libvdpau-0.9/debian/copyright 2014-10-19 20:23:00.000000000 +0000 +++ libvdpau-1.0/debian/copyright 2015-01-24 17:07:30.000000000 +0000 @@ -10,7 +10,7 @@ Files: debian/* Copyright: 2009-2012 Andres Mejia - © 2010-2014 Andreas Beckmann + © 2010-2015 Andreas Beckmann 2010 Russ Allbery License: Expat diff -Nru libvdpau-0.9/debian/patches/0001-trace-properly-annotate-private-functions-as-static.patch libvdpau-1.0/debian/patches/0001-trace-properly-annotate-private-functions-as-static.patch --- libvdpau-0.9/debian/patches/0001-trace-properly-annotate-private-functions-as-static.patch 2014-10-19 20:23:00.000000000 +0000 +++ libvdpau-1.0/debian/patches/0001-trace-properly-annotate-private-functions-as-static.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -From 9d27eb0a3947603c061607b94515e906d47c1b8a Mon Sep 17 00:00:00 2001 -From: Emil Velikov -Date: Sat, 19 Jul 2014 08:22:37 -0700 -Subject: [PATCH 1/2] trace: properly annotate private functions as static - -The following three were never a part of the public API and as such -should have never been exported by libvdpau_trace.so - -Correct that by marking them as static, thus allowing the compiler -to hide them from the exported namespace. - -_vdp_cap_init_planes_adapt_surface_video -_vdp_cap_init_planes_adapt_surface_bitmap -_vdp_cap_init_planes_adapt_surface_output - -Signed-off-by: Emil Velikov -Reviewed-by: Aaron Plattner -Signed-off-by: Aaron Plattner ---- - trace/vdpau_trace.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/trace/vdpau_trace.cpp b/trace/vdpau_trace.cpp -index cc92def..31c988a 100644 ---- a/trace/vdpau_trace.cpp -+++ b/trace/vdpau_trace.cpp -@@ -849,7 +849,7 @@ static bool _vdp_cap_init_planes_adapt_format_bits_indexed( - ); - } - --bool _vdp_cap_init_planes_adapt_surface_video( -+static bool _vdp_cap_init_planes_adapt_surface_video( - uint32_t surface, - uint32_t * surface_format, - uint32_t * width, -@@ -874,7 +874,7 @@ bool _vdp_cap_init_planes_adapt_surface_video( - return true; - } - --bool _vdp_cap_init_planes_adapt_surface_output( -+static bool _vdp_cap_init_planes_adapt_surface_output( - uint32_t surface, - uint32_t * surface_format, - uint32_t * width, -@@ -899,7 +899,7 @@ bool _vdp_cap_init_planes_adapt_surface_output( - return true; - } - --bool _vdp_cap_init_planes_adapt_surface_bitmap( -+static bool _vdp_cap_init_planes_adapt_surface_bitmap( - uint32_t surface, - uint32_t * surface_format, - uint32_t * width, --- -2.1.0 - diff -Nru libvdpau-0.9/debian/patches/0002-vdpau-do-not-export-_vdp_DRI2-functions.patch libvdpau-1.0/debian/patches/0002-vdpau-do-not-export-_vdp_DRI2-functions.patch --- libvdpau-0.9/debian/patches/0002-vdpau-do-not-export-_vdp_DRI2-functions.patch 2014-10-19 20:23:00.000000000 +0000 +++ libvdpau-1.0/debian/patches/0002-vdpau-do-not-export-_vdp_DRI2-functions.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -From 6cb973e59d7b3fa50404d9d0ec30476ad1753bfd Mon Sep 17 00:00:00 2001 -From: Emil Velikov -Date: Sat, 19 Jul 2014 11:01:47 -0700 -Subject: [PATCH 2/2] vdpau: do not export _vdp_DRI2* functions - -Neither one is part of the public API, thus should never be used outside -of the library itself. - -Add macro PRIVATE, that is used to annotate the function visibility by -setting __attribute__((visibility("hidden"))). - -v2: Provide only PRIVATE macro. Requested by Aaron. - -Signed-off-by: Emil Velikov -Reviewed-by: Aaron Plattner -Signed-off-by: Aaron Plattner ---- - src/mesa_dri2.h | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/src/mesa_dri2.h b/src/mesa_dri2.h -index 09bde8c..369b271 100644 ---- a/src/mesa_dri2.h -+++ b/src/mesa_dri2.h -@@ -37,17 +37,24 @@ - - #include - --extern Bool -+#if (defined(__GNUC__) && __GNUC__ >= 4) -+ #define PRIVATE __attribute__ ((visibility("hidden"))) -+#else -+ #define PRIVATE -+#endif -+ -+ -+PRIVATE extern Bool - _vdp_DRI2QueryExtension(Display * display, int *eventBase, int *errorBase); - --extern Bool -+PRIVATE extern Bool - _vdp_DRI2QueryVersion(Display * display, int *major, int *minor); - --extern Bool -+PRIVATE extern Bool - _vdp_DRI2Connect(Display * display, XID window, char **driverName, - char **deviceName); - --extern void -+PRIVATE extern void - _vdp_DRI2RemoveExtension(Display * display); - - #endif --- -2.1.0 - diff -Nru libvdpau-0.9/debian/patches/hardening.patch libvdpau-1.0/debian/patches/hardening.patch --- libvdpau-0.9/debian/patches/hardening.patch 2014-10-19 20:23:00.000000000 +0000 +++ libvdpau-1.0/debian/patches/hardening.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Author: Andreas Beckmann -Description: enable hardening while building the tests, too - ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,5 +1,5 @@ - AM_CPPFLAGS = -I$(top_srcdir)/include --CFLAGS = $(X11_CFLAGS) -+CFLAGS += $(X11_CFLAGS) - dlclose_LDADD = $(DLOPEN_LIBS) $(X11_LIBS) - - TESTS = dlclose diff -Nru libvdpau-0.9/debian/patches/link-with-libx11.patch libvdpau-1.0/debian/patches/link-with-libx11.patch --- libvdpau-0.9/debian/patches/link-with-libx11.patch 2015-01-17 19:41:47.000000000 +0000 +++ libvdpau-1.0/debian/patches/link-with-libx11.patch 2015-01-24 17:07:30.000000000 +0000 @@ -16,7 +16,7 @@ --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -18,7 +18,8 @@ +@@ -22,7 +22,8 @@ endif libvdpau_la_LIBADD = \ $(DLOPEN_LIBS) \ $(PTHREAD_LIBS) \ diff -Nru libvdpau-0.9/debian/patches/series libvdpau-1.0/debian/patches/series --- libvdpau-0.9/debian/patches/series 2015-01-17 19:42:49.000000000 +0000 +++ libvdpau-1.0/debian/patches/series 2015-01-24 17:07:30.000000000 +0000 @@ -1,6 +1,3 @@ -#0001-trace-properly-annotate-private-functions-as-static.patch -#0002-vdpau-do-not-export-_vdp_DRI2-functions.patch link-with-libx11.patch simplify-dlopen-path-length-error-handling.patch vdpau-module-searchpath.patch -#hardening.patch diff -Nru libvdpau-0.9/doc/Makefile.in libvdpau-1.0/doc/Makefile.in --- libvdpau-0.9/doc/Makefile.in 2014-12-19 17:33:35.000000000 +0000 +++ libvdpau-1.0/doc/Makefile.in 2015-03-09 21:23:23.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,12 +88,12 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -108,6 +118,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -156,6 +167,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -270,7 +282,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -448,6 +459,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-local +.PRECIOUS: Makefile + all: html install-data-local: install-html diff -Nru libvdpau-0.9/include/vdpau/vdpau.h libvdpau-1.0/include/vdpau/vdpau.h --- libvdpau-0.9/include/vdpau/vdpau.h 2014-12-12 20:33:51.000000000 +0000 +++ libvdpau-1.0/include/vdpau/vdpau.h 2015-02-12 21:50:00.000000000 +0000 @@ -6,7 +6,7 @@ /* * This copyright notice applies to this header file: * - * Copyright (c) 2008-2010 NVIDIA Corporation + * Copyright (c) 2008-2015 NVIDIA Corporation * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -432,6 +432,26 @@ * Include all slices beginning with start codes 0x000001B6. The slice start * code must be included for all slices. * + * \subsection bitstream_hevc H.265/HEVC - High Efficiency Video Codec + * + * Include all video coding layer (VCL) NAL units, with nal_unit_type values + * of 0 (TRAIL_N) through 31 (RSV_VCL31) inclusive. In addition to parsing + * and providing NAL units, an H.265/HEVC decoder application using VDPAU + * for decoding must parse certain values of the first slice segment header + * in a VCL NAL unit and provide it through VdpPictureInfoHEVC. Please see + * the documentation for VdpPictureInfoHEVC below for further details. + * + * The complete slice start code (including the 0x000001 prefix) must be + * included for all slices, even when the prefix is not included in the + * bitstream. + * + * Note that if desired: + * + * - The slice start code prefix may be included in a separate bitstream + * buffer array entry to the actual slice data extracted from the bitstream. + * - Multiple bitstream buffer array entries (e.g. one per slice) may point at + * the same physical data storage for the slice start code prefix. + * * \section video_mixer_usage Video Mixer Usage * * \subsection video_surface_content VdpVideoSurface Content @@ -2463,6 +2483,17 @@ /** \hideinitializer */ /** \brief Support for 8 bit depth only */ #define VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE ((VdpDecoderProfile)26) +/** \hideinitializer */ +/** \brief MPEG-H Part 2 == H.265 == HEVC */ +#define VDP_DECODER_PROFILE_HEVC_MAIN ((VdpDecoderProfile)50) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_10 ((VdpDecoderProfile)51) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_STILL ((VdpDecoderProfile)52) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_12 ((VdpDecoderProfile)53) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_444 ((VdpDecoderProfile)54) /** \hideinitializer */ #define VDP_DECODER_LEVEL_MPEG1_NA 0 @@ -2558,6 +2589,38 @@ #define VDP_DECODER_LEVEL_DIVX_NA 0 /** + * The VDPAU H.265/HEVC decoder levels correspond to the values of + * general_level_idc as described in the H.265 Specification, Annex A, + * Table A.1. The enumeration values are equal to thirty times the level + * number. + */ +#define VDP_DECODER_LEVEL_HEVC_1 30 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_2 60 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_2_1 63 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_3 90 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_3_1 93 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_4 120 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_4_1 123 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_5 150 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_5_1 153 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_5_2 156 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_6 180 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_6_1 183 +/** \hideinitializer */ +#define VDP_DECODER_LEVEL_HEVC_6_2 186 + +/** * \brief Query the implementation's VdpDecoder capabilities. * \param[in] device The device to query. * \param[in] profile The decoder profile for which information is requested. @@ -2679,9 +2742,9 @@ * \brief Picture parameter information for an MPEG 1 or MPEG 2 * picture. * - * Note: References to "copy of bitstream field" in the field descriptions - * may refer to data literally parsed from the bitstream, or derived from - * the bitstream using a mechanism described in the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -2697,45 +2760,38 @@ /** Number of slices in the bitstream provided. */ uint32_t slice_count; - /** Copy of the MPEG bitstream field. */ + /** \name MPEG bitstream + * + * Copies of the MPEG bitstream fields. + * @{ */ uint8_t picture_structure; - /** Copy of the MPEG bitstream field. */ uint8_t picture_coding_type; - /** Copy of the MPEG bitstream field. */ uint8_t intra_dc_precision; - /** Copy of the MPEG bitstream field. */ uint8_t frame_pred_frame_dct; - /** Copy of the MPEG bitstream field. */ uint8_t concealment_motion_vectors; - /** Copy of the MPEG bitstream field. */ uint8_t intra_vlc_format; - /** Copy of the MPEG bitstream field. */ uint8_t alternate_scan; - /** Copy of the MPEG bitstream field. */ uint8_t q_scale_type; - /** Copy of the MPEG bitstream field. */ uint8_t top_field_first; - /** Copy of the MPEG-1 bitstream field. For MPEG-2, set to 0. */ + /** MPEG-1 only. For MPEG-2, set to 0. */ uint8_t full_pel_forward_vector; - /** Copy of the MPEG-1 bitstream field. For MPEG-2, set to 0. */ + /** MPEG-1 only. For MPEG-2, set to 0. */ uint8_t full_pel_backward_vector; - /** - * Copy of the MPEG bitstream field. - * For MPEG-1, fill both horizontal and vertical entries. - */ + /** For MPEG-1, fill both horizontal and vertical entries. */ uint8_t f_code[2][2]; - /** Copy of the MPEG bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t intra_quantizer_matrix[64]; - /** Copy of the MPEG bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t non_intra_quantizer_matrix[64]; + /** @} */ } VdpPictureInfoMPEG1Or2; /** * \brief Information about an H.264 reference frame * - * Note: References to "copy of bitstream field" in the field descriptions - * may refer to data literally parsed from the bitstream, or derived from - * the bitstream using a mechanism described in the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -2779,9 +2835,9 @@ * VdpDecoderRender may be used as reference frames. In particular, * surfaces filled using any "put bits" API will not work. * - * Note: References to "copy of bitstream field" in the field descriptions - * may refer to data literally parsed from the bitstream, or derived from - * the bitstream using a mechanism described in the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. * * Note: VDPAU clients must use VdpPictureInfoH264Predictive to describe the * attributes of a frame being decoded with @@ -2795,59 +2851,39 @@ /** Will the decoded frame be used as a reference later. */ VdpBool is_reference; - /** Copy of the H.264 bitstream field. */ + /** \name H.264 bitstream + * + * Copies of the H.264 bitstream fields. + * @{ */ uint16_t frame_num; - /** Copy of the H.264 bitstream field. */ uint8_t field_pic_flag; - /** Copy of the H.264 bitstream field. */ uint8_t bottom_field_flag; - /** Copy of the H.264 bitstream field. */ uint8_t num_ref_frames; - /** Copy of the H.264 bitstream field. */ uint8_t mb_adaptive_frame_field_flag; - /** Copy of the H.264 bitstream field. */ uint8_t constrained_intra_pred_flag; - /** Copy of the H.264 bitstream field. */ uint8_t weighted_pred_flag; - /** Copy of the H.264 bitstream field. */ uint8_t weighted_bipred_idc; - /** Copy of the H.264 bitstream field. */ uint8_t frame_mbs_only_flag; - /** Copy of the H.264 bitstream field. */ uint8_t transform_8x8_mode_flag; - /** Copy of the H.264 bitstream field. */ int8_t chroma_qp_index_offset; - /** Copy of the H.264 bitstream field. */ int8_t second_chroma_qp_index_offset; - /** Copy of the H.264 bitstream field. */ int8_t pic_init_qp_minus26; - /** Copy of the H.264 bitstream field. */ uint8_t num_ref_idx_l0_active_minus1; - /** Copy of the H.264 bitstream field. */ uint8_t num_ref_idx_l1_active_minus1; - /** Copy of the H.264 bitstream field. */ uint8_t log2_max_frame_num_minus4; - /** Copy of the H.264 bitstream field. */ uint8_t pic_order_cnt_type; - /** Copy of the H.264 bitstream field. */ uint8_t log2_max_pic_order_cnt_lsb_minus4; - /** Copy of the H.264 bitstream field. */ uint8_t delta_pic_order_always_zero_flag; - /** Copy of the H.264 bitstream field. */ uint8_t direct_8x8_inference_flag; - /** Copy of the H.264 bitstream field. */ uint8_t entropy_coding_mode_flag; - /** Copy of the H.264 bitstream field. */ uint8_t pic_order_present_flag; - /** Copy of the H.264 bitstream field. */ uint8_t deblocking_filter_control_present_flag; - /** Copy of the H.264 bitstream field. */ uint8_t redundant_pic_cnt_present_flag; - - /** Copy of the H.264 bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t scaling_lists_4x4[6][16]; - /** Copy of the H.264 bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t scaling_lists_8x8[2][64]; + /** @} */ /** See \ref VdpPictureInfoH264 for instructions regarding this field. */ VdpReferenceFrameH264 referenceFrames[16]; @@ -2866,26 +2902,30 @@ typedef struct { /** \ref VdpPictureInfoH264 struct. */ VdpPictureInfoH264 pictureInfo; - /** Copy of the H.264 bitstream field. + + /** \name H.264 bitstream * + * Copies of the H.264 bitstream fields. + * @{ */ + /** * 0 - lossless disabled * 1 - lossless enabled */ uint8_t qpprime_y_zero_transform_bypass_flag; - /** Copy of the H.264 bitstream field. + /** * 0 - disabled * 1 - enabled */ uint8_t separate_colour_plane_flag; - + /** @} */ } VdpPictureInfoH264Predictive; /** * \brief Picture parameter information for a VC1 picture. * - * Note: References to "copy of bitstream field" in the field descriptions - * may refer to data literally parsed from the bitstream, or derived from - * the bitstream using a mechanism described in the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -2906,54 +2946,56 @@ /** Progressive=0, Frame-interlace=2, Field-interlace=3; see VC-1 7.1.1.15. */ uint8_t frame_coding_mode; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.5. */ + /** \name VC-1 bitstream + * + * Copies of the VC-1 bitstream fields. + * @{ */ + /** See VC-1 6.1.5. */ uint8_t postprocflag; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.8. */ + /** See VC-1 6.1.8. */ uint8_t pulldown; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.9. */ + /** See VC-1 6.1.9. */ uint8_t interlace; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.10. */ + /** See VC-1 6.1.10. */ uint8_t tfcntrflag; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.11. */ + /** See VC-1 6.1.11. */ uint8_t finterpflag; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.3. */ + /** See VC-1 6.1.3. */ uint8_t psf; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.8. */ + /** See VC-1 6.2.8. */ uint8_t dquant; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.3. */ + /** See VC-1 6.2.3. */ uint8_t panscan_flag; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.4. */ + /** See VC-1 6.2.4. */ uint8_t refdist_flag; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.11. */ + /** See VC-1 6.2.11. */ uint8_t quantizer; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.7. */ + /** See VC-1 6.2.7. */ uint8_t extended_mv; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.14. */ + /** See VC-1 6.2.14. */ uint8_t extended_dmv; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.10. */ + /** See VC-1 6.2.10. */ uint8_t overlap; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.9. */ + /** See VC-1 6.2.9. */ uint8_t vstransform; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.5. */ + /** See VC-1 6.2.5. */ uint8_t loopfilter; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.6. */ + /** See VC-1 6.2.6. */ uint8_t fastuvmc; - /** Copy of the VC-1 bitstream field. See VC-1 6.12.15. */ + /** See VC-1 6.12.15. */ uint8_t range_mapy_flag; - /** Copy of the VC-1 bitstream field. */ uint8_t range_mapy; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.16. */ + /** See VC-1 6.2.16. */ uint8_t range_mapuv_flag; - /** Copy of the VC-1 bitstream field. */ uint8_t range_mapuv; /** - * Copy of the VC-1 bitstream field. See VC-1 J.1.10. + * See VC-1 J.1.10. * Only used by simple and main profiles. */ uint8_t multires; /** - * Copy of the VC-1 bitstream field. See VC-1 J.1.16. + * See VC-1 J.1.16. * Only used by simple and main profiles. */ uint8_t syncmarker; @@ -2965,10 +3007,11 @@ */ uint8_t rangered; /** - * Copy of the VC-1 bitstream field. See VC-1 J.1.17. + * See VC-1 J.1.17. * Only used by simple and main profiles. */ uint8_t maxbframes; + /** @} */ /** * Out-of-loop deblocking enable. @@ -2987,9 +3030,9 @@ /** * \brief Picture parameter information for an MPEG-4 Part 2 picture. * - * Note: References to "copy of bitstream field" in the field descriptions - * may refer to data literally parsed from the bitstream, or derived from - * the bitstream using a mechanism described in the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -3003,38 +3046,28 @@ */ VdpVideoSurface backward_reference; - /** Copy of the bitstream field. */ + /** \name MPEG 4 part 2 bitstream + * + * Copies of the MPEG 4 part 2 bitstream fields. + * @{ */ int32_t trd[2]; - /** Copy of the bitstream field. */ int32_t trb[2]; - /** Copy of the bitstream field. */ uint16_t vop_time_increment_resolution; - /** Copy of the bitstream field. */ uint8_t vop_coding_type; - /** Copy of the bitstream field. */ uint8_t vop_fcode_forward; - /** Copy of the bitstream field. */ uint8_t vop_fcode_backward; - /** Copy of the bitstream field. */ uint8_t resync_marker_disable; - /** Copy of the bitstream field. */ uint8_t interlaced; - /** Copy of the bitstream field. */ uint8_t quant_type; - /** Copy of the bitstream field. */ uint8_t quarter_sample; - /** Copy of the bitstream field. */ uint8_t short_video_header; /** Derived from vop_rounding_type bitstream field. */ uint8_t rounding_control; - /** Copy of the bitstream field. */ uint8_t alternate_vertical_scan_flag; - /** Copy of the bitstream field. */ uint8_t top_field_first; - /** Copy of the bitstream field. */ uint8_t intra_quantizer_matrix[64]; - /** Copy of the bitstream field. */ uint8_t non_intra_quantizer_matrix[64]; + /** @} */ } VdpPictureInfoMPEG4Part2; /** @@ -3054,6 +3087,219 @@ typedef VdpPictureInfoMPEG4Part2 VdpPictureInfoDivX5; /** + * \brief Picture parameter information for an H.265/HEVC picture. + * + * References to bitsream fields below may refer to data literally parsed from + * the bitstream, or derived from the bitstream using a mechanism described in + * Rec. ITU-T H.265 (04/2013), hereafter referred to as "the H.265/HEVC + * Specification". + * + * VDPAU H.265/HEVC implementations implement the portion of the decoding + * process described by clauses 8.4, 8.5, 8.6 and 8.7 of the the + * H.265/HEVC Specification. VdpPictureInfoHEVC provides enough data + * to complete this portion of the decoding process, plus additional + * information not defined in the H.265/HEVC Specification that may be + * useful to particular implementations. + * + * Client applications must supply every field in this struct. + */ +typedef struct { + /** \name HEVC Sequence Parameter Set + * + * Copies of the HEVC Sequence Parameter Set bitstream fields. + * @{ */ + uint8_t chroma_format_idc; + /** Only valid if chroma_format_idc == 3. Ignored otherwise.*/ + uint8_t separate_colour_plane_flag; + uint32_t pic_width_in_luma_samples; + uint32_t pic_height_in_luma_samples; + uint8_t bit_depth_luma_minus8; + uint8_t bit_depth_chroma_minus8; + uint8_t log2_max_pic_order_cnt_lsb_minus4; + /** Provides the value corresponding to the nuh_temporal_id of the frame + to be decoded. */ + uint8_t sps_max_dec_pic_buffering_minus1; + uint8_t log2_min_luma_coding_block_size_minus3; + uint8_t log2_diff_max_min_luma_coding_block_size; + uint8_t log2_min_transform_block_size_minus2; + uint8_t log2_diff_max_min_transform_block_size; + uint8_t max_transform_hierarchy_depth_inter; + uint8_t max_transform_hierarchy_depth_intra; + uint8_t scaling_list_enabled_flag; + /** Scaling lists, in diagonal order, to be used for this frame. */ + /** Scaling List for 4x4 quantization matrix, + indexed as ScalingList4x4[matrixId][i]. */ + uint8_t ScalingList4x4[6][16]; + /** Scaling List for 8x8 quantization matrix, + indexed as ScalingList8x8[matrixId][i]. */ + uint8_t ScalingList8x8[6][64]; + /** Scaling List for 16x16 quantization matrix, + indexed as ScalingList16x16[matrixId][i]. */ + uint8_t ScalingList16x16[6][64]; + /** Scaling List for 32x32 quantization matrix, + indexed as ScalingList32x32[matrixId][i]. */ + uint8_t ScalingList32x32[2][64]; + /** Scaling List DC Coefficients for 16x16, + indexed as ScalingListDCCoeff16x16[matrixId]. */ + uint8_t ScalingListDCCoeff16x16[6]; + /** Scaling List DC Coefficients for 32x32, + indexed as ScalingListDCCoeff32x32[matrixId]. */ + uint8_t ScalingListDCCoeff32x32[2]; + uint8_t amp_enabled_flag; + uint8_t sample_adaptive_offset_enabled_flag; + uint8_t pcm_enabled_flag; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t pcm_sample_bit_depth_luma_minus1; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t pcm_sample_bit_depth_chroma_minus1; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t log2_min_pcm_luma_coding_block_size_minus3; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t log2_diff_max_min_pcm_luma_coding_block_size; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t pcm_loop_filter_disabled_flag; + /** Per spec, when zero, assume short_term_ref_pic_set_sps_flag + is also zero. */ + uint8_t num_short_term_ref_pic_sets; + uint8_t long_term_ref_pics_present_flag; + /** Only needed if long_term_ref_pics_present_flag is set. Ignored + otherwise. */ + uint8_t num_long_term_ref_pics_sps; + uint8_t sps_temporal_mvp_enabled_flag; + uint8_t strong_intra_smoothing_enabled_flag; + /** @} */ + + /** \name HEVC Picture Parameter Set + * + * Copies of the HEVC Picture Parameter Set bitstream fields. + * @{ */ + uint8_t dependent_slice_segments_enabled_flag; + uint8_t output_flag_present_flag; + uint8_t num_extra_slice_header_bits; + uint8_t sign_data_hiding_enabled_flag; + uint8_t cabac_init_present_flag; + uint8_t num_ref_idx_l0_default_active_minus1; + uint8_t num_ref_idx_l1_default_active_minus1; + int8_t init_qp_minus26; + uint8_t constrained_intra_pred_flag; + uint8_t transform_skip_enabled_flag; + uint8_t cu_qp_delta_enabled_flag; + /** Only needed if cu_qp_delta_enabled_flag is set. Ignored otherwise. */ + uint8_t diff_cu_qp_delta_depth; + int8_t pps_cb_qp_offset; + int8_t pps_cr_qp_offset; + uint8_t pps_slice_chroma_qp_offsets_present_flag; + uint8_t weighted_pred_flag; + uint8_t weighted_bipred_flag; + uint8_t transquant_bypass_enabled_flag; + uint8_t tiles_enabled_flag; + uint8_t entropy_coding_sync_enabled_flag; + /** Only valid if tiles_enabled_flag is set. Ignored otherwise. */ + uint8_t num_tile_columns_minus1; + /** Only valid if tiles_enabled_flag is set. Ignored otherwise. */ + uint8_t num_tile_rows_minus1; + /** Only valid if tiles_enabled_flag is set. Ignored otherwise. */ + uint8_t uniform_spacing_flag; + /** Only need to set 0..num_tile_columns_minus1. The struct + definition reserves up to the maximum of 22. Invalid values are + ignored. */ + uint16_t column_width_minus1[22]; + /** Only need to set 0..num_tile_rows_minus1. The struct + definition reserves up to the maximum of 20. Invalid values are + ignored.*/ + uint16_t row_height_minus1[20]; + /** Only needed if tiles_enabled_flag is set. Invalid values are + ignored. */ + uint8_t loop_filter_across_tiles_enabled_flag; + uint8_t pps_loop_filter_across_slices_enabled_flag; + uint8_t deblocking_filter_control_present_flag; + /** Only valid if deblocking_filter_control_present_flag is set. Ignored + otherwise. */ + uint8_t deblocking_filter_override_enabled_flag; + /** Only valid if deblocking_filter_control_present_flag is set. Ignored + otherwise. */ + uint8_t pps_deblocking_filter_disabled_flag; + /** Only valid if deblocking_filter_control_present_flag is set and + pps_deblocking_filter_disabled_flag is not set. Ignored otherwise.*/ + int8_t pps_beta_offset_div2; + /** Only valid if deblocking_filter_control_present_flag is set and + pps_deblocking_filter_disabled_flag is not set. Ignored otherwise. */ + int8_t pps_tc_offset_div2; + uint8_t lists_modification_present_flag; + uint8_t log2_parallel_merge_level_minus2; + uint8_t slice_segment_header_extension_present_flag; + + /** \name HEVC Slice Segment Header + * + * Copies of the HEVC Slice Segment Header bitstream fields and calculated + * values detailed in the specification. + * @{ */ + /** Set to 1 if nal_unit_type is equal to IDR_W_RADL or IDR_N_LP. + Set to zero otherwise. */ + uint8_t IDRPicFlag; + /** Set to 1 if nal_unit_type in the range of BLA_W_LP to + RSV_IRAP_VCL23, inclusive. Set to zero otherwise.*/ + uint8_t RAPPicFlag; + /** See section 7.4.7.1 of the specification. */ + uint8_t CurrRpsIdx; + /** See section 7.4.7.2 of the specification. */ + uint32_t NumPocTotalCurr; + /** Corresponds to specification field, NumDeltaPocs[RefRpsIdx]. + Only applicable when short_term_ref_pic_set_sps_flag == 0. + Implementations will ignore this value in other cases. See 7.4.8. */ + uint32_t NumDeltaPocsOfRefRpsIdx; + /** Section 7.6.3.1 of the H.265/HEVC Specification defines the syntax of + the slice_segment_header. This header contains information that + some VDPAU implementations may choose to skip. The VDPAU API + requires client applications to track the number of bits used in the + slice header for structures associated with short term and long term + reference pictures. First, VDPAU requires the number of bits used by + the short_term_ref_pic_set array in the slice_segment_header. */ + uint32_t NumShortTermPictureSliceHeaderBits; + /** Second, VDPAU requires the number of bits used for long term reference + pictures in the slice_segment_header. This is equal to the number + of bits used for the contents of the block beginning with + "if(long_term_ref_pics_present_flag)". */ + uint32_t NumLongTermPictureSliceHeaderBits; + /** @} */ + + /** Slice Decoding Process - Picture Order Count */ + /** The value of PicOrderCntVal of the picture in the access unit + containing the SEI message. The picture being decoded. */ + int32_t CurrPicOrderCntVal; + + /** Slice Decoding Process - Reference Picture Sets */ + /** Array of video reference surfaces. + Set any unused positions to VDP_INVALID_HANDLE. */ + VdpVideoSurface RefPics[16]; + /** Array of picture order counts. These correspond to positions + in the RefPics array. */ + int32_t PicOrderCntVal[16]; + /** Array used to specify whether a particular RefPic is + a long term reference. A value of "1" indicates a long-term + reference. */ + uint8_t IsLongTerm[16]; + /** Copy of specification field, see Section 8.3.2 of the + H.265/HEVC Specification. */ + uint8_t NumPocStCurrBefore; + /** Copy of specification field, see Section 8.3.2 of the + H.265/HEVC Specification. */ + uint8_t NumPocStCurrAfter; + /** Copy of specification field, see Section 8.3.2 of the + H.265/HEVC Specification. */ + uint8_t NumPocLtCurr; + /** Reference Picture Set list, one of the short-term RPS. These + correspond to positions in the RefPics array. */ + uint8_t RefPicSetStCurrBefore[8]; + /** Reference Picture Set list, one of the short-term RPS. These + correspond to positions in the RefPics array. */ + uint8_t RefPicSetStCurrAfter[8]; + /** Reference Picture Set list, one of the long-term RPS. These + correspond to positions in the RefPics array. */ + uint8_t RefPicSetLtCurr[8]; +} VdpPictureInfoHEVC; + +/** * \brief Decode a compressed field/frame and render the result * into a \ref VdpVideoSurface "VdpVideoSurface". * \param[in] decoder The decoder object that will perform the diff -Nru libvdpau-0.9/ltmain.sh libvdpau-1.0/ltmain.sh --- libvdpau-0.9/ltmain.sh 2014-12-19 17:33:33.000000000 +0000 +++ libvdpau-1.0/ltmain.sh 2015-03-09 21:23:20.000000000 +0000 @@ -2,11 +2,11 @@ ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in ## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.4 +# libtool (GNU libtool) 2.4.6 # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 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. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.4 -package_revision=2.4.4 +VERSION=2.4.6 +package_revision=2.4.6 ## ------ ## @@ -64,12 +64,12 @@ # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2014-01-03.01; # UTC +scriptversion=2015-01-20.17; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 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. @@ -192,7 +192,7 @@ _G_path_prog_max=0 _G_path_prog_found=false - _G_save_IFS=$IFS; IFS=$PATH_SEPARATOR + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} for _G_dir in $_G_PATH; do IFS=$_G_save_IFS test -z "$_G_dir" && _G_dir=. @@ -1375,7 +1375,7 @@ # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 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. @@ -1977,7 +1977,7 @@ # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.4' +scriptversion='(GNU libtool) 2.4.6' # func_echo ARG... @@ -2039,7 +2039,12 @@ " # Additional text appended to 'usage_message' in response to '--help'. -long_help_message=$long_help_message" +func_help () +{ + $debug_cmd + + func_usage_message + $ECHO "$long_help_message MODE must be one of the following: @@ -2063,13 +2068,15 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.4 + version: $progname (GNU libtool) 2.4.6 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . GNU libtool home page: . General help using GNU software: ." + exit 0 +} # func_lo2o OBJECT-NAME @@ -6461,6 +6468,24 @@ esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -7437,6 +7462,9 @@ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" @@ -8599,6 +8627,37 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= diff -Nru libvdpau-0.9/Makefile.in libvdpau-1.0/Makefile.in --- libvdpau-0.9/Makefile.in 2014-12-19 17:33:35.000000000 +0000 +++ libvdpau-1.0/Makefile.in 2015-03-09 21:23:23.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/vdpau.pc.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS README TODO compile config.guess \ - config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -181,6 +188,10 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/vdpau.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \ + README TODO compile config.guess config.sub depcomp install-sh \ + ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -269,6 +280,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -382,7 +394,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -638,15 +649,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -682,17 +693,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -873,6 +884,8 @@ ps ps-am tags tags-am uninstall uninstall-am \ uninstall-pkgconfigDATA +.PRECIOUS: Makefile + .PHONY: ChangeLog diff -Nru libvdpau-0.9/src/Makefile.in libvdpau-1.0/src/Makefile.in --- libvdpau-0.9/src/Makefile.in 2014-12-19 17:33:35.000000000 +0000 +++ libvdpau-1.0/src/Makefile.in 2015-03-09 21:23:23.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -84,14 +94,13 @@ @DRI2_TRUE@ $(dri2proto_CFLAGS) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(dist_libvdpausysconf_DATA) \ - $(libvdpauinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_libvdpausysconf_DATA) \ + $(libvdpauinclude_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,6 +212,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -251,6 +261,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -383,7 +394,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -729,6 +739,8 @@ uninstall-am uninstall-dist_libvdpausysconfDATA \ uninstall-libLTLIBRARIES uninstall-libvdpauincludeHEADERS +.PRECIOUS: Makefile + # 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. diff -Nru libvdpau-0.9/test/Makefile.in libvdpau-1.0/test/Makefile.in --- libvdpau-0.9/test/Makefile.in 2014-12-19 17:33:35.000000000 +0000 +++ libvdpau-1.0/test/Makefile.in 2015-03-09 21:23:23.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,13 +90,12 @@ TESTS = dlclose$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = test -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -364,6 +373,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -412,6 +423,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -521,7 +533,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign test/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -670,7 +681,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -959,6 +970,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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. diff -Nru libvdpau-0.9/trace/Makefile.in libvdpau-1.0/trace/Makefile.in --- libvdpau-0.9/trace/Makefile.in 2014-12-19 17:33:35.000000000 +0000 +++ libvdpau-1.0/trace/Makefile.in 2015-03-09 21:23:23.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,13 +90,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = trace -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(libvdpau_traceinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libvdpau_traceinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -194,6 +204,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -242,6 +253,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -365,7 +377,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign trace/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign trace/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -689,6 +700,8 @@ uninstall-libvdpau_traceincludeHEADERS \ uninstall-moduleLTLIBRARIES +.PRECIOUS: Makefile + # 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.