[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22625] trunk/blender/extern/xvidcore: Upgrade extern/xvidcore to version 1.22.
Brecht Van Lommel
brecht at blender.org
Wed Aug 19 11:23:46 CEST 2009
Revision: 22625
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22625
Author: blendix
Date: 2009-08-19 11:23:46 +0200 (Wed, 19 Aug 2009)
Log Message:
-----------
Upgrade extern/xvidcore to version 1.22. This fixes Xvid crashing on
linux 64 bit. I don't know if it's useful to upgrade the windows libs,
mainly committing this as a bugfix.
Modified Paths:
--------------
trunk/blender/extern/xvidcore/build/generic/Makefile
trunk/blender/extern/xvidcore/build/generic/bootstrap.sh
trunk/blender/extern/xvidcore/build/generic/config.guess
trunk/blender/extern/xvidcore/build/generic/config.sub
trunk/blender/extern/xvidcore/build/generic/configure
trunk/blender/extern/xvidcore/build/generic/configure.in
trunk/blender/extern/xvidcore/build/generic/install-sh
trunk/blender/extern/xvidcore/build/generic/libxvidcore.def
trunk/blender/extern/xvidcore/build/generic/libxvidcore.ld
trunk/blender/extern/xvidcore/build/generic/missing
trunk/blender/extern/xvidcore/build/generic/sources.inc
trunk/blender/extern/xvidcore/src/bitstream/bitstream.c
trunk/blender/extern/xvidcore/src/bitstream/bitstream.h
trunk/blender/extern/xvidcore/src/bitstream/cbp.h
trunk/blender/extern/xvidcore/src/bitstream/mbcoding.c
trunk/blender/extern/xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
trunk/blender/extern/xvidcore/src/bitstream/x86_asm/cbp_sse2.asm
trunk/blender/extern/xvidcore/src/dct/fdct.h
trunk/blender/extern/xvidcore/src/dct/ia64_asm/fdct_ia64.s
trunk/blender/extern/xvidcore/src/dct/ia64_asm/idct_fini.s
trunk/blender/extern/xvidcore/src/dct/ia64_asm/idct_ia64_ecc.s
trunk/blender/extern/xvidcore/src/dct/ia64_asm/idct_ia64_gcc.s
trunk/blender/extern/xvidcore/src/dct/ia64_asm/idct_init.s
trunk/blender/extern/xvidcore/src/dct/idct.h
trunk/blender/extern/xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm
trunk/blender/extern/xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm
trunk/blender/extern/xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm
trunk/blender/extern/xvidcore/src/dct/x86_asm/idct_3dne.asm
trunk/blender/extern/xvidcore/src/dct/x86_asm/idct_mmx.asm
trunk/blender/extern/xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm
trunk/blender/extern/xvidcore/src/decoder.c
trunk/blender/extern/xvidcore/src/decoder.h
trunk/blender/extern/xvidcore/src/encoder.c
trunk/blender/extern/xvidcore/src/encoder.h
trunk/blender/extern/xvidcore/src/global.h
trunk/blender/extern/xvidcore/src/image/colorspace.c
trunk/blender/extern/xvidcore/src/image/colorspace.h
trunk/blender/extern/xvidcore/src/image/ia64_asm/interpolate8x8_ia64.s
trunk/blender/extern/xvidcore/src/image/ia64_asm/interpolate8x8_ia64_exact.s
trunk/blender/extern/xvidcore/src/image/image.c
trunk/blender/extern/xvidcore/src/image/image.h
trunk/blender/extern/xvidcore/src/image/interpolate8x8.h
trunk/blender/extern/xvidcore/src/image/postprocessing.c
trunk/blender/extern/xvidcore/src/image/qpel.c
trunk/blender/extern/xvidcore/src/image/qpel.h
trunk/blender/extern/xvidcore/src/image/reduced.h
trunk/blender/extern/xvidcore/src/image/x86_asm/colorspace_mmx.inc
trunk/blender/extern/xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/postprocessing_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/postprocessing_sse2.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/qpel_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/reduced_mmx.asm
trunk/blender/extern/xvidcore/src/motion/estimation_bvop.c
trunk/blender/extern/xvidcore/src/motion/estimation_pvop.c
trunk/blender/extern/xvidcore/src/motion/estimation_rd_based.c
trunk/blender/extern/xvidcore/src/motion/estimation_rd_based_bvop.c
trunk/blender/extern/xvidcore/src/motion/gmc.c
trunk/blender/extern/xvidcore/src/motion/gmc.h
trunk/blender/extern/xvidcore/src/motion/ia64_asm/calc_delta_1.s
trunk/blender/extern/xvidcore/src/motion/ia64_asm/calc_delta_2.s
trunk/blender/extern/xvidcore/src/motion/ia64_asm/calc_delta_3.s
trunk/blender/extern/xvidcore/src/motion/ia64_asm/halfpel8_refine_ia64.s
trunk/blender/extern/xvidcore/src/motion/ia64_asm/sad_ia64.s
trunk/blender/extern/xvidcore/src/motion/motion.h
trunk/blender/extern/xvidcore/src/motion/motion_inlines.h
trunk/blender/extern/xvidcore/src/motion/sad.h
trunk/blender/extern/xvidcore/src/motion/x86_asm/sad_3dn.asm
trunk/blender/extern/xvidcore/src/motion/x86_asm/sad_3dne.asm
trunk/blender/extern/xvidcore/src/motion/x86_asm/sad_mmx.asm
trunk/blender/extern/xvidcore/src/motion/x86_asm/sad_sse2.asm
trunk/blender/extern/xvidcore/src/motion/x86_asm/sad_xmm.asm
trunk/blender/extern/xvidcore/src/plugins/plugin_dump.c
trunk/blender/extern/xvidcore/src/plugins/plugin_lumimasking.c
trunk/blender/extern/xvidcore/src/portab.h
trunk/blender/extern/xvidcore/src/quant/ia64_asm/quant_h263_ia64.s
trunk/blender/extern/xvidcore/src/quant/quant.h
trunk/blender/extern/xvidcore/src/quant/quant_matrix.c
trunk/blender/extern/xvidcore/src/quant/quant_matrix.h
trunk/blender/extern/xvidcore/src/quant/quant_mpeg.c
trunk/blender/extern/xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm
trunk/blender/extern/xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm
trunk/blender/extern/xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm
trunk/blender/extern/xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm
trunk/blender/extern/xvidcore/src/utils/emms.h
trunk/blender/extern/xvidcore/src/utils/ia64_asm/mem_transfer_ia64.s
trunk/blender/extern/xvidcore/src/utils/mbfunctions.h
trunk/blender/extern/xvidcore/src/utils/mbtransquant.c
trunk/blender/extern/xvidcore/src/utils/mem_transfer.h
trunk/blender/extern/xvidcore/src/utils/x86_asm/cpuid.asm
trunk/blender/extern/xvidcore/src/utils/x86_asm/interlacing_mmx.asm
trunk/blender/extern/xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm
trunk/blender/extern/xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm
trunk/blender/extern/xvidcore/src/xvid.c
trunk/blender/extern/xvidcore/src/xvid.h
Added Paths:
-----------
trunk/blender/extern/xvidcore/src/image/x86_asm/deintl_sse.asm
trunk/blender/extern/xvidcore/src/image/x86_asm/gmc_mmx.asm
trunk/blender/extern/xvidcore/src/motion/motion_smp.h
trunk/blender/extern/xvidcore/src/nasm.inc
trunk/blender/extern/xvidcore/src/plugins/plugin_ssim.c
trunk/blender/extern/xvidcore/src/plugins/plugin_ssim.h
trunk/blender/extern/xvidcore/src/plugins/x86_asm/
trunk/blender/extern/xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
Removed Paths:
-------------
trunk/blender/extern/xvidcore/src/bitstream/x86_asm/cbp_3dne.asm
trunk/blender/extern/xvidcore/src/dct/x86_64_asm/
trunk/blender/extern/xvidcore/src/dct/x86_asm/simple_idct_mmx.asm
trunk/blender/extern/xvidcore/src/image/x86_64_asm/
trunk/blender/extern/xvidcore/src/motion/x86_64_asm/
trunk/blender/extern/xvidcore/src/plugins/plugin_fixed.c
trunk/blender/extern/xvidcore/src/quant/x86_64_asm/
trunk/blender/extern/xvidcore/src/utils/x86_64_asm/
Modified: trunk/blender/extern/xvidcore/build/generic/Makefile
===================================================================
--- trunk/blender/extern/xvidcore/build/generic/Makefile 2009-08-19 09:12:21 UTC (rev 22624)
+++ trunk/blender/extern/xvidcore/build/generic/Makefile 2009-08-19 09:23:46 UTC (rev 22625)
@@ -1,12 +1,12 @@
##############################################################################
#
-# - Unified Makefile for XviD for *nix environments -
+# - Unified Makefile for Xvid for *nix environments -
#
# Copyright(C) 2003-2004 Edouard Gomez <ed.gomez at free.fr>
#
#
# Description:
-# This Makefile allows building XviD sources to obtain a shared library
+# This Makefile allows building Xvid sources to obtain a shared library
# and a static library. This Makefile uses variables defined in the
# platform.inc file. This platform.inc file is usually created by the
# ./configure script whenever a unix shell is available.
@@ -71,7 +71,7 @@
all: $(STATIC_LIB) $(SHARED_LIB)
@echo
@echo "---------------------------------------------------------------"
- @echo " XviD has been successfully built."
+ @echo " Xvid has been successfully built."
@echo
@echo " * Binaries are currently located in the '$(BUILD_DIR)' directory"
@echo " * To install them on your system, you can run '# make install'"
Modified: trunk/blender/extern/xvidcore/build/generic/bootstrap.sh
===================================================================
--- trunk/blender/extern/xvidcore/build/generic/bootstrap.sh 2009-08-19 09:12:21 UTC (rev 22624)
+++ trunk/blender/extern/xvidcore/build/generic/bootstrap.sh 2009-08-19 09:23:46 UTC (rev 22625)
@@ -7,7 +7,7 @@
# This file builds the configure script and copies all needed files
# provided by automake/libtoolize
#
-# $Id$
+# $Id: bootstrap.sh,v 1.7 2005/05/23 09:29:43 Skal Exp $
##############################################################################
Modified: trunk/blender/extern/xvidcore/build/generic/config.guess
===================================================================
--- trunk/blender/extern/xvidcore/build/generic/config.guess 2009-08-19 09:12:21 UTC (rev 22624)
+++ trunk/blender/extern/xvidcore/build/generic/config.guess 2009-08-19 09:23:46 UTC (rev 22625)
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-08-03'
+timestamp='2005-07-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -138,6 +138,16 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_MACHINE}" in
+ i?86)
+ test -z "$VENDOR" && VENDOR=pc
+ ;;
+ *)
+ test -z "$VENDOR" && VENDOR=unknown
+ ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -794,7 +804,7 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ amd64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
p*:CYGWIN*:*)
@@ -815,25 +825,25 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo cris-axis-linux
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo crisv32-axis-linux
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-${VENDOR}-linux
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
@@ -852,7 +862,7 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -871,16 +881,13 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
;;
- or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-${VENDOR}-linux
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-${VENDOR}-linux
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -894,33 +901,33 @@
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-${VENDOR}-linux ;;
+ PA8*) echo hppa2.0-${VENDOR}-linux ;;
+ *) echo hppa-${VENDOR}-linux ;;
esac
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-${VENDOR}-linux
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo x86_64-${VENDOR}-linux
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -935,18 +942,18 @@
p'`
case "$ld_supported_targets" in
elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
;;
a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
exit ;;
coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
exit ;;
"")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # Either a pre-BFD a.out linker (linuxoldld) or
# one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
exit ;;
esac
# Determine whether the default compiler is a.out or elf
@@ -976,7 +983,7 @@
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
exit
}
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
Modified: trunk/blender/extern/xvidcore/build/generic/config.sub
===================================================================
--- trunk/blender/extern/xvidcore/build/generic/config.sub 2009-08-19 09:12:21 UTC (rev 22624)
+++ trunk/blender/extern/xvidcore/build/generic/config.sub 2009-08-19 09:23:46 UTC (rev 22625)
@@ -1181,7 +1181,7 @@
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1215,9 +1215,6 @@
-linux-dietlibc)
os=-linux-dietlibc
;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
;;
Modified: trunk/blender/extern/xvidcore/build/generic/configure
===================================================================
--- trunk/blender/extern/xvidcore/build/generic/configure 2009-08-19 09:12:21 UTC (rev 22624)
+++ trunk/blender/extern/xvidcore/build/generic/configure 2009-08-19 09:23:46 UTC (rev 22625)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for XviD 1.1.0.
+# Generated by GNU Autoconf 2.59 for Xvid 1.2.2.
#
# Report bugs to <xvid-devel at xvid.org>.
#
@@ -267,10 +267,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='XviD'
+PACKAGE_NAME='Xvid'
PACKAGE_TARNAME='xvid'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='XviD 1.1.0'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='Xvid 1.2.2'
PACKAGE_BUGREPORT='xvid-devel at xvid.org'
ac_unique_file="configure.in"
@@ -781,7 +781,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 XviD 1.1.0 to adapt to many kinds of systems.
+\`configure' configures Xvid 1.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -843,7 +843,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of XviD 1.1.0:";;
+ short | recursive ) echo "Configuration of Xvid 1.2.2:";;
esac
cat <<\_ACEOF
@@ -957,14 +957,14 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-XviD configure 1.1.0
+Xvid configure 1.2.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -978,7 +978,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list