178
178
m4_ifndef([AC_AUTOCONF_VERSION],
179
179
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
180
180
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
181
--- libvdpau.orig/config.guess
182
+++ libvdpau/config.guess
183
183
@@ -1,10 +1,10 @@
185
185
# Attempt to guess a canonical system name.
186
186
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
187
187
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
188
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
188
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
189
189
# Free Software Foundation, Inc.
191
191
-timestamp='2009-04-27'
192
+timestamp='2009-06-10'
192
+timestamp='2009-12-30'
194
194
# This file is free software; you can redistribute it and/or modify it
195
195
# under the terms of the GNU General Public License as published by
197
# the same distribution terms that you use for the rest of that program.
200
-# Originally written by Per Bothner <per@bothner.com>.
201
-# Please send patches to <config-patches@gnu.org>. Submit a context
202
-# diff and a properly formatted ChangeLog entry.
203
+# Originally written by Per Bothner. Please send patches (context
204
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
207
# This script attempts to guess a canonical system name similar to
208
# config.sub. If it succeeds, it prints the system name on stdout, and
209
# exits with 0. Otherwise, it exits with 1.
211
-# The plan is that this can be called by configure scripts if you
212
-# don't specify an explicit build system type.
213
+# You can get the latest version of this script from:
214
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
216
me=`echo "$0" | sed -e 's,.*/,,'`
219
GNU config.guess ($timestamp)
221
Originally written by Per Bothner.
222
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
223
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
224
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
225
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
226
+Software Foundation, Inc.
228
This is free software; see the source for copying conditions. There is NO
229
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
197
231
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
198
232
eval $set_cc_for_build
199
233
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
221
280
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
222
281
# How do we know it's Interix rather than the generic POSIX subsystem?
223
282
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
224
@@ -882,40 +885,17 @@
285
echo ${UNAME_MACHINE}-pc-minix
288
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
289
+ EV5) UNAME_MACHINE=alphaev5 ;;
290
+ EV56) UNAME_MACHINE=alphaev56 ;;
291
+ PCA56) UNAME_MACHINE=alphapca56 ;;
292
+ PCA57) UNAME_MACHINE=alphapca56 ;;
293
+ EV6) UNAME_MACHINE=alphaev6 ;;
294
+ EV67) UNAME_MACHINE=alphaev67 ;;
295
+ EV68*) UNAME_MACHINE=alphaev68 ;;
297
+ objdump --private-headers /bin/sh | grep -q ld.so.1
298
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
299
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
302
eval $set_cc_for_build
303
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
306
echo frv-unknown-linux-gnu
310
+ eval $set_cc_for_build
311
+ sed 's/^ //' << EOF >$dummy.c
312
+ #ifdef __dietlibc__
316
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
317
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
320
echo ${UNAME_MACHINE}-unknown-linux-gnu
322
@@ -882,78 +914,34 @@
226
324
echo ${UNAME_MACHINE}-unknown-linux-gnu
228
326
- mips:Linux:*:*)
229
+ mips:Linux:*:* | mips64:Linux:*:*)
230
eval $set_cc_for_build
231
sed 's/^ //' << EOF >$dummy.c
327
- eval $set_cc_for_build
328
- sed 's/^ //' << EOF >$dummy.c
235
+ #undef ${UNAME_MACHINE}
236
+ #undef ${UNAME_MACHINE}el
237
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
332
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
239
+ CPU=${UNAME_MACHINE}el
241
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
335
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
253
347
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
255
349
- mips64:Linux:*:*)
256
- eval $set_cc_for_build
257
- sed 's/^ //' << EOF >$dummy.c
350
+ mips:Linux:*:* | mips64:Linux:*:*)
351
eval $set_cc_for_build
352
sed 's/^ //' << EOF >$dummy.c
260
355
- #undef mips64el
261
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
356
+ #undef ${UNAME_MACHINE}
357
+ #undef ${UNAME_MACHINE}el
358
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
264
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
360
+ CPU=${UNAME_MACHINE}el
362
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
266
364
+ CPU=${UNAME_MACHINE}
271
EV67) UNAME_MACHINE=alphaev67 ;;
272
EV68*) UNAME_MACHINE=alphaev68 ;;
370
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
375
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
376
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
379
echo or32-unknown-linux-gnu
382
- echo powerpc-unknown-linux-gnu
385
- echo powerpc64-unknown-linux-gnu
388
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
389
- EV5) UNAME_MACHINE=alphaev5 ;;
390
- EV56) UNAME_MACHINE=alphaev56 ;;
391
- PCA56) UNAME_MACHINE=alphapca56 ;;
392
- PCA57) UNAME_MACHINE=alphapca56 ;;
393
- EV6) UNAME_MACHINE=alphaev6 ;;
394
- EV67) UNAME_MACHINE=alphaev67 ;;
395
- EV68*) UNAME_MACHINE=alphaev68 ;;
274
397
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
275
+ objdump --private-headers /bin/sh | grep -q ld.so.1
276
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
277
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
279
@@ -1001,14 +981,6 @@
281
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
398
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
399
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
402
echo sparc-unknown-linux-gnu
404
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
405
+ echo hppa64-unknown-linux-gnu
407
parisc:Linux:*:* | hppa:Linux:*:*)
409
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
411
*) echo hppa-unknown-linux-gnu ;;
414
- parisc64:Linux:*:* | hppa64:Linux:*:*)
415
- echo hppa64-unknown-linux-gnu
417
+ echo powerpc64-unknown-linux-gnu
420
+ echo powerpc-unknown-linux-gnu
422
s390:Linux:*:* | s390x:Linux:*:*)
423
echo ${UNAME_MACHINE}-ibm-linux
426
echo ${UNAME_MACHINE}-unknown-linux-gnu
429
- # The BFD linker knows what the default object file format is, so
430
- # first see if it will tell us. cd to the root directory to prevent
431
- # problems with other programs or directories called `ld' in the path.
432
- # Set LC_ALL=C to ensure ld outputs messages in English.
433
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
434
- | sed -ne '/supported targets:/!d
436
- s/.*supported targets: *//
439
- case "$ld_supported_targets" in
441
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
283
443
- a.out-i386-linux)
284
444
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
288
448
- # one that does not give us useful --help.
289
449
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
292
# Determine whether the default compiler is a.out or elf
293
eval $set_cc_for_build
294
@@ -1074,7 +1046,7 @@
452
- # Determine whether the default compiler is a.out or elf
453
- eval $set_cc_for_build
454
- sed 's/^ //' << EOF >$dummy.c
455
- #include <features.h>
458
- # if __GLIBC__ >= 2
467
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
473
- #ifdef __dietlibc__
477
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
482
- test x"${LIBC}" != x && {
483
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
486
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
489
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
490
# earlier versions are messed up and put the nodename in both
491
@@ -1074,7 +1005,7 @@
295
492
i*86:syllable:*:*)
296
493
echo ${UNAME_MACHINE}-pc-syllable
309
506
echo powerpc-unknown-lynxos${UNAME_RELEASE}
311
508
SM[BE]S:UNIX_SV:*:*)
509
@@ -1275,6 +1206,16 @@
511
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
512
case $UNAME_PROCESSOR in
514
+ eval $set_cc_for_build
515
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
516
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
517
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
518
+ grep IS_64BIT_ARCH >/dev/null
520
+ UNAME_PROCESSOR="x86_64"
523
unknown) UNAME_PROCESSOR=powerpc ;;
525
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
526
--- libvdpau.orig/config.sub
527
+++ libvdpau/config.sub
314
528
@@ -1,10 +1,10 @@
316
530
# Configuration validation subroutine script.
317
531
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
318
532
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
319
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
533
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
320
534
# Free Software Foundation, Inc.
322
536
-timestamp='2009-04-17'
323
+timestamp='2009-06-11'
537
+timestamp='2010-01-22'
325
539
# This file is (in principle) common to ALL GNU software.
326
540
# The presence of a machine in this file suggests that SOME GNU software
544
# Please send patches to <config-patches@gnu.org>. Submit a context
545
-# diff and a properly formatted ChangeLog entry.
546
+# diff and a properly formatted GNU ChangeLog entry.
548
# Configuration subroutine to validate and canonicalize a configuration type.
549
# Supply the specified configuration type as an argument.
550
# If it is invalid, we print an error message on stderr and exit with code 1.
551
# Otherwise, we print the canonical config type on stdout and succeed.
553
+# You can get the latest version of this script from:
554
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
556
# This file is supposed to be the same for all GNU packages
557
# and recognize all the CPU types, system types and aliases
558
# that are meaningful with *any* GNU software.
561
GNU config.sub ($timestamp)
563
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
564
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
565
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
566
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
567
+Software Foundation, Inc.
569
This is free software; see the source for copying conditions. There is NO
570
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
571
@@ -149,10 +153,13 @@
572
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
573
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
574
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
575
- -apple | -axis | -knuth | -cray)
576
+ -apple | -axis | -knuth | -cray | -microblaze)
334
583
-sim | -cisco | -oki | -wec | -winbond)
587
| pdp10 | pdp11 | pj | pjl \
588
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
592
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
594
@@ -288,13 +296,14 @@
595
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
597
| tahoe | thumb | tic4x | tic80 | tron \
601
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
603
basic_machine=$basic_machine-unknown
605
- m6811 | m68hc11 | m6812 | m68hc12)
606
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
607
# Motorola 68HC11/12.
608
basic_machine=$basic_machine-unknown
612
| m32c-* | m32r-* | m32rle-* \
613
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
614
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
615
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
616
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
618
| mips64-* | mips64el-* \
619
@@ -365,15 +374,17 @@
620
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
621
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
623
- | romp-* | rs6000-* \
624
+ | romp-* | rs6000-* | rx-* \
625
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
626
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
627
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
629
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
630
| tahoe-* | thumb-* \
631
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
632
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
633
+ | tile-* | tilegx-* \
636
| v850-* | v850e-* | vax-* \
638
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
338
640
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
346
648
basic_machine=c90-cray
348
@@ -1260,7 +1267,7 @@
651
basic_machine=ns32k-utek
655
+ basic_machine=microblaze-xilinx
658
basic_machine=i386-pc
660
@@ -1069,6 +1087,11 @@
661
basic_machine=tic6x-unknown
664
+ # This must be matched before tile*.
666
+ basic_machine=tilegx-unknown
670
basic_machine=tile-unknown
672
@@ -1240,6 +1263,9 @@
673
# First match some system type aliases
674
# that might get confused with valid system types.
675
# -solaris* is a basic system type, with this one exception.
679
-solaris1 | -solaris1.*)
680
os=`echo $os | sed -e 's|solaris1|sunos4|'`
682
@@ -1260,9 +1286,9 @@
349
683
# Each alternative MUST END IN A *, to match a version number.
350
684
# -sysv* is not here because it comes later, after sysvr4.
351
685
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
352
686
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
687
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
353
689
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
354
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
690
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
691
+ | -sym* | -kopensolaris* \
356
692
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
357
@@ -1613,7 +1620,7 @@
694
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
695
@@ -1283,7 +1309,7 @@
696
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
697
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
698
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
699
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
700
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
701
# Remember, each alternative MUST END IN *, to match a version number.
704
@@ -1416,6 +1442,8 @@
713
@@ -1613,7 +1641,7 @@
1221
1577
+# time-stamp-time-zone: "UTC"
1222
1578
+# time-stamp-end: "; # UTC"
1224
--- a/doc/Makefile.in
1225
+++ b/doc/Makefile.in
1580
--- libvdpau.orig/doc/Makefile.in
1581
+++ libvdpau/doc/Makefile.in
1226
1582
@@ -1,4 +1,4 @@
1227
1583
-# Makefile.in generated by automake 1.11 from Makefile.am.
1228
1584
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1229
1585
# @configure_input@
1231
1587
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1588
--- libvdpau.orig/install-sh
1589
+++ libvdpau/install-sh
1234
1590
@@ -1,7 +1,7 @@
1236
1592
# install - install a program, script, or datafile
1474
1830
+# time-stamp-time-zone: "UTC"
1475
1831
+# time-stamp-end: "; # UTC"
1477
--- a/src/Makefile.in
1478
+++ b/src/Makefile.in
1833
--- libvdpau.orig/src/Makefile.in
1834
+++ libvdpau/src/Makefile.in
1479
1835
@@ -1,4 +1,4 @@
1480
1836
-# Makefile.in generated by automake 1.11 from Makefile.am.
1481
1837
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1482
1838
# @configure_input@
1484
1840
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1485
--- a/trace/Makefile.in
1486
+++ b/trace/Makefile.in
1842
"$(DESTDIR)$(libvdpauincludedir)"
1843
LTLIBRARIES = $(lib_LTLIBRARIES)
1844
am__DEPENDENCIES_1 =
1845
-libvdpau_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1846
+libvdpau_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1847
+ $(am__DEPENDENCIES_1)
1848
am__libvdpau_la_SOURCES_DIST = vdpau_wrapper.c mesa_dri2.c mesa_dri2.h
1849
@DRI2_TRUE@am__objects_1 = mesa_dri2.lo
1850
am_libvdpau_la_OBJECTS = vdpau_wrapper.lo $(am__objects_1)
1853
libvdpau_la_LIBADD = \
1859
libvdpau_la_LDFLAGS = -version-info 1:0:0 -no-undefined
1860
libvdpauincludedir = $(includedir)/vdpau
1861
--- libvdpau.orig/trace/Makefile.in
1862
+++ libvdpau/trace/Makefile.in
1487
1863
@@ -1,4 +1,4 @@
1488
1864
-# Makefile.in generated by automake 1.11 from Makefile.am.
1489
1865
+# Makefile.in generated by automake 1.11.1 from Makefile.am.