diff -Nru xvidcore-1.1.2/build/generic/config.log xvidcore-1.1.3/build/generic/config.log --- xvidcore-1.1.2/build/generic/config.log 2006-11-01 10:44:00.000000000 +0000 +++ xvidcore-1.1.3/build/generic/config.log 2007-06-28 16:26:39.000000000 +0100 @@ -1,7 +1,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by XviD configure 1.1.2, which was +It was created by XviD configure 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ ./configure @@ -137,8 +137,8 @@ | | #define PACKAGE_NAME "XviD" | #define PACKAGE_TARNAME "xvid" -| #define PACKAGE_VERSION "1.1.2" -| #define PACKAGE_STRING "XviD 1.1.2" +| #define PACKAGE_VERSION "1.1.3" +| #define PACKAGE_STRING "XviD 1.1.3" | #define PACKAGE_BUGREPORT "xvid-devel@xvid.org" | /* end confdefs.h. */ | #include @@ -153,8 +153,8 @@ | | #define PACKAGE_NAME "XviD" | #define PACKAGE_TARNAME "xvid" -| #define PACKAGE_VERSION "1.1.2" -| #define PACKAGE_STRING "XviD 1.1.2" +| #define PACKAGE_VERSION "1.1.3" +| #define PACKAGE_STRING "XviD 1.1.3" | #define PACKAGE_BUGREPORT "xvid-devel@xvid.org" | /* end confdefs.h. */ | #include @@ -277,8 +277,8 @@ | | #define PACKAGE_NAME "XviD" | #define PACKAGE_TARNAME "xvid" -| #define PACKAGE_VERSION "1.1.2" -| #define PACKAGE_STRING "XviD 1.1.2" +| #define PACKAGE_VERSION "1.1.3" +| #define PACKAGE_STRING "XviD 1.1.3" | #define PACKAGE_BUGREPORT "xvid-devel@xvid.org" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 @@ -381,7 +381,7 @@ ## Running config.status. ## ## ---------------------- ## -This file was extended by XviD config.status 1.1.2, which was +This file was extended by XviD config.status 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = @@ -467,7 +467,7 @@ CPP='gcc -E' CPPFLAGS='' DCT_IA64_SOURCES='' -DEFS='-DPACKAGE_NAME=\"XviD\" -DPACKAGE_TARNAME=\"xvid\" -DPACKAGE_VERSION=\"1.1.2\" -DPACKAGE_STRING=\"XviD\ 1.1.2\" -DPACKAGE_BUGREPORT=\"xvid-devel@xvid.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_INT_P=4 -DHAVE_STDIO_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_ASSERT_H=1 -DHAVE_MATH_H=1 ' +DEFS='-DPACKAGE_NAME=\"XviD\" -DPACKAGE_TARNAME=\"xvid\" -DPACKAGE_VERSION=\"1.1.3\" -DPACKAGE_STRING=\"XviD\ 1.1.3\" -DPACKAGE_BUGREPORT=\"xvid-devel@xvid.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_INT_P=4 -DHAVE_STDIO_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_ASSERT_H=1 -DHAVE_MATH_H=1 ' ECHO_C='' ECHO_N='-n' ECHO_T='' @@ -488,9 +488,9 @@ OBJEXT='o' PACKAGE_BUGREPORT='xvid-devel@xvid.org' PACKAGE_NAME='XviD' -PACKAGE_STRING='XviD 1.1.2' +PACKAGE_STRING='XviD 1.1.3' PACKAGE_TARNAME='xvid' -PACKAGE_VERSION='1.1.2' +PACKAGE_VERSION='1.1.3' PATH_SEPARATOR=':' PPC_ALTIVEC_SOURCES='' PRE_SHARED_LIB='libxvidcore.$(SHARED_EXTENSION).$(API_MAJOR).$(API_MINOR)' @@ -558,9 +558,9 @@ #define HAVE_UNISTD_H 1 #define PACKAGE_BUGREPORT "xvid-devel@xvid.org" #define PACKAGE_NAME "XviD" -#define PACKAGE_STRING "XviD 1.1.2" +#define PACKAGE_STRING "XviD 1.1.3" #define PACKAGE_TARNAME "xvid" -#define PACKAGE_VERSION "1.1.2" +#define PACKAGE_VERSION "1.1.3" #define SIZEOF_INT_P 4 #define STDC_HEADERS 1 diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/build/generic/config.status /tmp/gs3OqrKxNj/xvidcore-1.1.3/build/generic/config.status --- xvidcore-1.1.2/build/generic/config.status 2006-11-01 10:44:00.000000000 +0000 +++ xvidcore-1.1.3/build/generic/config.status 2007-06-28 16:28:10.000000000 +0100 @@ -259,7 +259,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by XviD $as_me 1.1.2, which was +This file was extended by XviD $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -292,7 +292,7 @@ Report bugs to ." ac_cs_version="\ -XviD config.status 1.1.2 +XviD config.status 1.1.3 configured by ./configure, generated by GNU Autoconf 2.59, with options \"\" @@ -436,8 +436,8 @@ s,@PATH_SEPARATOR@,:,;t t s,@PACKAGE_NAME@,XviD,;t t s,@PACKAGE_TARNAME@,xvid,;t t -s,@PACKAGE_VERSION@,1.1.2,;t t -s,@PACKAGE_STRING@,XviD 1.1.2,;t t +s,@PACKAGE_VERSION@,1.1.3,;t t +s,@PACKAGE_STRING@,XviD 1.1.3,;t t s,@PACKAGE_BUGREPORT@,xvid-devel@xvid.org,;t t s,@exec_prefix@,${prefix},;t t s,@prefix@,/usr/local,;t t @@ -457,7 +457,7 @@ s,@build_alias@,,;t t s,@host_alias@,,;t t s,@target_alias@,,;t t -s,@DEFS@,-DPACKAGE_NAME=\"XviD\" -DPACKAGE_TARNAME=\"xvid\" -DPACKAGE_VERSION=\"1.1.2\" -DPACKAGE_STRING=\"XviD\ 1.1.2\" -DPACKAGE_BUGREPORT=\"xvid-devel@xvid.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_INT_P=4 -DHAVE_STDIO_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_ASSERT_H=1 -DHAVE_MATH_H=1 ,;t t +s,@DEFS@,-DPACKAGE_NAME=\"XviD\" -DPACKAGE_TARNAME=\"xvid\" -DPACKAGE_VERSION=\"1.1.3\" -DPACKAGE_STRING=\"XviD\ 1.1.3\" -DPACKAGE_BUGREPORT=\"xvid-devel@xvid.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_INT_P=4 -DHAVE_STDIO_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_ASSERT_H=1 -DHAVE_MATH_H=1 ,;t t s,@ECHO_C@,,;t t s,@ECHO_N@,-n,;t t s,@ECHO_T@,,;t t diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/build/generic/configure /tmp/gs3OqrKxNj/xvidcore-1.1.3/build/generic/configure --- xvidcore-1.1.2/build/generic/configure 2006-11-01 10:39:36.000000000 +0000 +++ xvidcore-1.1.3/build/generic/configure 2009-02-01 11:24:09.000000000 +0000 @@ -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.2. +# Generated by GNU Autoconf 2.59 for XviD 1.1.3. # # Report bugs to . # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='XviD' PACKAGE_TARNAME='xvid' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='XviD 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='XviD 1.1.3' PACKAGE_BUGREPORT='xvid-devel@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.2 to adapt to many kinds of systems. +\`configure' configures XviD 1.1.3 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.2:";; + short | recursive ) echo "Configuration of XviD 1.1.3:";; esac cat <<\_ACEOF @@ -964,7 +964,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -XviD configure 1.1.2 +XviD configure 1.1.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -978,7 +978,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by XviD $as_me 1.1.2, which was +It was created by XviD $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1327,7 +1327,7 @@ our_cflags_defaults="$our_cflags_defaults -O2" our_cflags_defaults="$our_cflags_defaults -fstrength-reduce" our_cflags_defaults="$our_cflags_defaults -finline-functions" -our_cflags_defaults="$our_cflags_defaults -freduce-all-givs" +our_cflags_defaults="$our_cflags_defaults " our_cflags_defaults="$our_cflags_defaults -ffast-math" our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer" @@ -4369,7 +4369,7 @@ # GCC 4.x if test "${GCC_MAJOR}" -gt 3 ; then CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g` - CFLAGS=`echo $CFLAGS | sed s,'-freduce-all-givs','',g` + CFLAGS=`echo $CFLAGS | sed s,'','',g` CFLAGS=`echo $CFLAGS | sed s,'-fmove-all-movables','',g` CFLAGS=`echo $CFLAGS | sed s,'-fnew-ra','',g` CFLAGS=`echo $CFLAGS | sed s,'-fwritable-strings','',g` @@ -4806,7 +4806,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by XviD $as_me 1.1.2, which was +This file was extended by XviD $as_me 1.1.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4861,7 +4861,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -XviD config.status 1.1.2 +XviD config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/build/generic/configure.in /tmp/gs3OqrKxNj/xvidcore-1.1.3/build/generic/configure.in --- xvidcore-1.1.2/build/generic/configure.in 2006-11-01 10:38:15.000000000 +0000 +++ xvidcore-1.1.3/build/generic/configure.in 2005-11-22 21:01:33.000000000 +0000 @@ -8,7 +8,7 @@ AC_PREREQ([2.50]) -AC_INIT([XviD], [1.1.2], [xvid-devel@xvid.org]) +AC_INIT([XviD], [1.1.0], [xvid-devel@xvid.org]) AC_CONFIG_SRCDIR(configure.in) dnl Do not forget to increase that when needed. diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/ChangeLog /tmp/gs3OqrKxNj/xvidcore-1.1.3/ChangeLog --- xvidcore-1.1.2/ChangeLog 2006-11-01 11:01:05.000000000 +0000 +++ xvidcore-1.1.3/ChangeLog 2007-06-28 16:16:37.000000000 +0100 @@ -1,148 +1,15 @@ ---------------------- -PatchSet 1589 -Date: 2005/11/22 10:44:09 -Author: suxen_drol -Branch: release-1_1-branch -Tag: (none) -Log: -release-1_1_0 version patch: - set build string to "xvid-1.1.0" - set XVID_VERSION to 1.1.0 - set XVID_BS_VERSION to 40 - remove XVID_UNSTABLE - -Members: - src/xvid.c:1.65->1.65.2.1 - src/xvid.h:1.51->1.51.2.1 - ---------------------- -PatchSet 1591 -Date: 2005/11/22 21:01:33 -Author: edgomez -Branch: release-1_1-branch -Tag: (none) -Log: -Bits from my repo - -Members: - ChangeLog:1.14->1.14.2.1 - build/generic/configure.in:1.20->1.20.2.1 - src/xvid.h:1.51.2.1->1.51.2.2 - ---------------------- -PatchSet 1595 -Date: 2005/12/09 05:07:31 -Author: syskin -Branch: release-1_1-branch -Tag: release-1_1_0 -Log: -tuning lambdas for better PSNR and vhq0 mode decision - -Members: - src/motion/estimation.h:1.12->1.12.2.1 - src/motion/estimation_common.c:1.12->1.12.2.1 - ---------------------- -PatchSet 1605 -Date: 2005/12/30 14:26:52 -Author: Isibaar -Branch: release-1_1-branch -Tag: release-1_1_0_final -Log: -- Applied the most recent bugfixes from cvs-head to 1_1 release branch as - well. - -Members: - dshow/dshow.dsp:1.5->1.5.2.1 - dshow/src/debug.h:1.4->1.4.2.1 - src/decoder.c:1.75->1.75.2.1 - ---------------------- -PatchSet 1645 -Date: 2006/07/10 16:05:30 -Author: Isibaar -Branch: release-1_1-branch -Tag: (none) -Log: -- Back ported several important bug fixes from head to release-1_1-branch - -Members: - src/decoder.c:1.75.2.1->1.75.2.2 - src/decoder.h:1.17->1.17.2.1 - src/encoder.c:1.120->1.120.2.1 - src/portab.h:1.54->1.54.2.1 - src/xvid.c:1.65.2.1->1.65.2.2 - src/bitstream/bitstream.c:1.55->1.55.2.1 - src/bitstream/bitstream.h:1.22->1.22.2.1 - src/quant/quant.h:1.5->1.5.2.1 - vfw/src/codec.c:1.19->1.19.2.1 - ---------------------- -PatchSet 1646 -Date: 2006/07/10 16:21:49 -Author: Isibaar -Branch: release-1_1-branch -Tag: (none) -Log: -- back ported some important bug fixes from head to release-1_1-branch - -Members: - debian/README.Debian:1.1->1.1.2.1 - debian/changelog:1.1->1.1.2.1 - debian/control:1.1->1.1.2.1 - debian/rules:1.1->1.1.2.1 - dshow/dshow.dsp:1.5.2.1->1.5.2.2 - dshow/src/debug.c:1.1->1.1.2.1 - dshow/src/debug.h:1.4.2.1->1.4.2.2 - examples/xvid_decraw.c:1.22->1.22.2.1 - ---------------------- -PatchSet 1648 -Date: 2006/07/10 18:25:59 -Author: Isibaar -Branch: release-1_1-branch -Tag: (none) -Log: -- Update vfw profile definitions and packed bs enforcement - -Members: - src/xvid.h:1.51.2.2->1.51.2.3 - vfw/src/codec.c:1.19.2.1->1.19.2.2 - vfw/src/config.c:1.30->1.30.2.1 - vfw/src/config.h:1.9->1.9.2.1 - ---------------------- -PatchSet 1650 -Date: 2006/07/10 18:39:38 -Author: Isibaar -Branch: release-1_1-branch -Tag: release-1_1_1-final -Log: -- updated profile definitions - -Members: - vfw/src/config.c:1.30.2.1->1.30.2.2 - ---------------------- -PatchSet 1654 -Date: 2006/07/11 19:35:21 -Author: Isibaar -Branch: release-1_1-branch -Tag: (none) -Log: -- updated graphics - -Members: - dshow/src/XviD_logo.bmp:1.2->1.2.4.1 - vfw/src/XviD_logo.bmp:1.2->1.2.4.1 - vfw/src/xvid.ico:1.1->1.1.2.1 - - # Ed.Gomez: This ChangeLog is generated from a personal tree maintained # under the arch revision control tool. That's why dates may be skewed. I # also removed all my email adresses from the output because they are not # relevant. +user: Isibaar +date: Thu Jun 27 14:38:05 2007 +0100 +files: src/bitstream/mbcoding.c +description: +- patch for a potential vulnerability reported by Secunia + + user: date: Tue Nov 22 21:08:50 2005 +0100 files: examples/xvid_bench.c diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/changelog /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/changelog --- xvidcore-1.1.2/debian/changelog 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/changelog 2009-02-01 11:24:09.000000000 +0000 @@ -1,89 +1,79 @@ -xvidcore (2:1.1.2-0.1ubuntu3) hardy; urgency=low +xvidcore (2:1.1.3-0.6~intrepid1) intrepid; urgency=low - * SECURITY UPDATE: arbitrary code execution via crafted video files. - - debian/patches/CVE-2007-3329.dpatch: Check array indices properly. Patch - from upstream CVS. - - References: - + CVE-2007-3329 - * debian/rules: Unset CFLAGS to make it build again. + * Backporting to intrepid - -- William Grant Sun, 23 Mar 2008 18:01:26 +1100 + -- Mieszko Ślusarczyk (spitfire) Sun, 01 Feb 2009 12:15:13 +0100 -xvidcore (2:1.1.2-0.1ubuntu2) gutsy; urgency=low +xvidcore (2:1.1.3-0.6) unstable; urgency=low - * Added missing yasm [i386] dependency in debian/control (fix bug #84705) + * Patch from Russell Coker to not demand an executable stack. - -- Loïc Martin Thu, 26 Apr 2007 21:33:21 +0200 + -- Christian Marillat Mon, 12 Jan 2009 15:47:42 +0100 -xvidcore (2:1.1.2-0.1ubuntu1) feisty; urgency=low +xvidcore (2:1.1.3-0.5) unstable; urgency=high - * Merge with debian-multimedia, remaining Ubuntu changes: - - Tidy up clean rule a bit to fix lintian warning about autogenerated - files in diff.gz, - - Change Maintainer to Ubuntu MOTU Media Team , - - Add Reinhard Tartler and Sebastian Dröge to uploaders. + * Do not rerun build/generic/bootstrap.sh but instead update config.sub + and config.guess otherwise the configure script doesn't find yasm for + amd64 arch. + * Patch configure (doesn't find nasm). - -- John Dong Thu, 25 Jan 2007 00:32:51 -0500 + -- Christian Marillat Sat, 03 May 2008 21:12:05 +0200 -xvidcore (2:1.1.2-0.1) unstable; urgency=low +xvidcore (2:1.1.3-0.4) unstable; urgency=low - * New patch to fix build on ia64. + * Move to quilt. + * Added Homepage field. + * Re-run build/generic/bootstrap.sh - -- Christian Marillat Thu, 2 Nov 2006 14:01:17 +0100 + -- Christian Marillat Wed, 09 Apr 2008 17:18:45 +0200 -xvidcore (2:1.1.2-0.0) unstable; urgency=low +xvidcore (2:1.1.3-0.3) unstable; urgency=low - * New upstream release. + * Of course nasm is for i386 only. Last uplaod for today :) - -- Christian Marillat Wed, 1 Nov 2006 16:27:54 +0100 + -- Christian Marillat Wed, 05 Sep 2007 10:24:56 +0200 -xvidcore (2:1.1.0-final-0.1ubuntu1) edgy; urgency=low +xvidcore (2:1.1.3-0.2) unstable; urgency=low - * Merge with Marillat + * Add nasm in Build-Depends. - -- Sebastian Dröge Mon, 24 Jul 2006 02:16:22 +0200 + -- Christian Marillat Wed, 05 Sep 2007 10:20:48 +0200 -xvidcore (2:1.1.0-final-0.1) unstable; urgency=low +xvidcore (2:1.1.3-0.1) unstable; urgency=high - * Patch to fix ia64 build. Thanks to Thibaut VARENE. + * Add support for NCPUS and set urgency to high (CVE-2007-3329). - -- Christian Marillat Sun, 7 May 2006 13:08:28 +0200 + -- Christian Marillat Wed, 05 Sep 2007 09:34:57 +0200 -xvidcore (2:1.1.0-final-0.0) unstable; urgency=low +xvidcore (2:1.1.3-0.0) unstable; urgency=low * New upstream release. - -- Christian Marillat Thu, 12 Jan 2006 09:20:35 +0100 + -- Christian Marillat Wed, 05 Sep 2007 09:19:14 +0200 + +xvidcore (2:1.1.2-0.1) unstable; urgency=low -xvidcore (2:1.1.0-final-0ubuntu1) dapper; urgency=low + * New patch to fix build on ia64. - * New upstream release, imported from marillat (no changes other than noted - in this entry) - * tidy up clean rule a bit to fix lintian warning about autogenerated - files in diff.gz - * Change Maintainer to Ubuntu MOTU Media Team - * add myself and slomo to uploaders + -- Christian Marillat Thu, 2 Nov 2006 14:01:17 +0100 - -- Reinhard Tartler Fri, 3 Mar 2006 12:30:26 +0100 +xvidcore (2:1.1.2-0.0) unstable; urgency=low -xvidcore (2:1.1.0-beta2-0.0ubuntu2) dapper; urgency=low + * New upstream release. - * Change CFLAGS to "-O2 -fweb -ffast-math -funswitch-loops -fgcse-after-reload - -fomit-frame-pointer" This produced a speed gain of a few fps on both a - tested k7, and amd64 based machine. (Malone #6004) + -- Christian Marillat Wed, 1 Nov 2006 16:27:54 +0100 - [ Reinhard Tartler ] +xvidcore (2:1.1.0-final-0.1) unstable; urgency=low - * dont make this package report bugs to Christian Marillat. We expect our - users to use Malone + * Patch to fix ia64 build. Thanks to Thibaut VARENE. - -- Jamie Jones Thu, 22 Dec 2005 21:18:27 +0100 + -- Christian Marillat Sun, 7 May 2006 13:08:28 +0200 -xvidcore (2:1.1.0-beta2-0.0ubuntu1) dapper; urgency=low +xvidcore (2:1.1.0-final-0.0) unstable; urgency=low - * recompile with gcc-3.4, xvidcore FTBFS with gcc-4.0 + * New upstream release. - -- Reinhard Tartler Sun, 27 Nov 2005 14:35:24 +0100 + -- Christian Marillat Thu, 12 Jan 2006 09:20:35 +0100 xvidcore (2:1.1.0-beta2+cvs-0.0) unstable; urgency=low diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/compat /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/compat --- xvidcore-1.1.2/debian/compat 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/compat 2009-02-01 11:24:09.000000000 +0000 @@ -1 +1 @@ -4 +7 diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/control /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/control --- xvidcore-1.1.2/debian/control 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/control 2009-02-01 11:24:09.000000000 +0000 @@ -1,10 +1,11 @@ Source: xvidcore Section: libs Priority: optional -Maintainer: Ubuntu MOTU Media Team -Uploaders: Reinhard Tartler , Sebastian Dröge -Standards-Version: 3.6.2 -Build-Depends: debhelper (>> 4), yasm [i386 amd64], dpatch +Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org +Homepage: http://www.xvid.org/ +Standards-Version: 3.8.0 +Build-Depends: debhelper (>> 7), yasm [amd64], quilt, nasm [i386], autotools-dev Package: libxvidcore4 Architecture: any @@ -15,7 +16,7 @@ Package: libxvidcore4-dev Architecture: any -Depends: libxvidcore4 (= ${Source-Version}) +Depends: libxvidcore4 (>= ${source:Version}) Section: libdevel Replaces: libxvidencore0 (<= 1:0.9.1-0.1) Provides: libxvidcore-dev diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/00list /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/00list --- xvidcore-1.1.2/debian/patches/00list 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -01_ia64_fix -CVE-2007-3329 diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/01_ia64_fix.diff /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/01_ia64_fix.diff --- xvidcore-1.1.2/debian/patches/01_ia64_fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ xvidcore-1.1.3/debian/patches/01_ia64_fix.diff 2009-02-01 11:24:09.000000000 +0000 @@ -0,0 +1,11 @@ +--- xvidcore-1.1.2.orig/src/quant/quant.h 2006-05-07 13:06:09.000000000 +0200 ++++ xvidcore-1.1.2/src/quant/quant.h 2006-05-07 13:06:47.000000000 +0200 +@@ -91,7 +91,7 @@ + #endif + + #ifdef ARCH_IS_IA64 +-quant_intraFunc dequant_h263_intra_ia64 ++quant_intraFunc dequant_h263_intra_ia64; + #endif + + #ifdef ARCH_IS_PPC diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/01_ia64_fix.dpatch /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/01_ia64_fix.dpatch --- xvidcore-1.1.2/debian/patches/01_ia64_fix.dpatch 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/patches/01_ia64_fix.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_configure.dpatch by Christian Marillat -## -## All lines beginning with ## DP:' are a description of the patch. -## DP: Fix for ia64 arch. - -@DPATCH@ - ---- xvidcore-1.1.2.orig/src/quant/quant.h 2006-05-07 13:06:09.000000000 +0200 -+++ xvidcore-1.1.2/src/quant/quant.h 2006-05-07 13:06:47.000000000 +0200 -@@ -91,7 +91,7 @@ - #endif - - #ifdef ARCH_IS_IA64 --quant_intraFunc dequant_h263_intra_ia64 -+quant_intraFunc dequant_h263_intra_ia64; - #endif - - #ifdef ARCH_IS_PPC diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/02_configure.diff /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/02_configure.diff --- xvidcore-1.1.2/debian/patches/02_configure.diff 1970-01-01 01:00:00.000000000 +0100 +++ xvidcore-1.1.3/debian/patches/02_configure.diff 2009-02-01 11:24:09.000000000 +0000 @@ -0,0 +1,14 @@ +--- ./build/generic/configure.orig 2008-05-03 20:30:50.000000000 +0200 ++++ ./build/generic/configure 2008-05-03 20:33:08.000000000 +0200 +@@ -4016,9 +4016,9 @@ + if test "$ac_nasm" = "yes" ; then + echo "$as_me:$LINENO: checking for nasm patch version" >&5 + echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6 +- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1` ++ nasm_patch=`$nasm_prog -v | cut -d '.' -f 3 | cut -d ' ' -f 1` + if test -z $nasm_patch ; then +- nasm_patch=-1 ++ nasm_patch=35 + fi + echo "$as_me:$LINENO: result: $nasm_patch" >&5 + echo "${ECHO_T}$nasm_patch" >&6 diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/03_exec-stack.diff /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/03_exec-stack.diff --- xvidcore-1.1.2/debian/patches/03_exec-stack.diff 1970-01-01 01:00:00.000000000 +0100 +++ xvidcore-1.1.3/debian/patches/03_exec-stack.diff 2009-02-01 11:24:09.000000000 +0000 @@ -0,0 +1,442 @@ +Index: xvidcore-1.1.3/src/bitstream/x86_asm/cbp_3dne.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/bitstream/x86_asm/cbp_3dne.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/bitstream/x86_asm/cbp_3dne.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -88,6 +88,8 @@ + ; Code + ;============================================================================= + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + SECTION .text + + cglobal calc_cbp_3dne +Index: xvidcore-1.1.3/src/bitstream/x86_asm/cbp_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/bitstream/x86_asm/cbp_mmx.asm 2005-09-24 05:10:37.000000000 +0200 ++++ xvidcore-1.1.3/src/bitstream/x86_asm/cbp_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -70,6 +70,8 @@ + ; Code + ;============================================================================= + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + SECTION .text + + cglobal calc_cbp_mmx +Index: xvidcore-1.1.3/src/bitstream/x86_asm/cbp_sse2.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/bitstream/x86_asm/cbp_sse2.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/bitstream/x86_asm/cbp_sse2.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -26,6 +26,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + ;============================================================================= + ; Macros + ;============================================================================= +Index: xvidcore-1.1.3/src/dct/x86_asm/fdct_mmx_ffmpeg.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -44,6 +44,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + ;============================================================================= + ; Macros and other preprocessor constants + ;============================================================================= +Index: xvidcore-1.1.3/src/dct/x86_asm/fdct_mmx_skal.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/fdct_mmx_skal.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/fdct_mmx_skal.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/dct/x86_asm/fdct_sse2_skal.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/fdct_sse2_skal.asm 2005-08-01 12:53:46.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/fdct_sse2_skal.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/dct/x86_asm/idct_3dne.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/idct_3dne.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/idct_3dne.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -56,6 +56,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + ;============================================================================= + ; Macros and other preprocessor constants + ;============================================================================= +Index: xvidcore-1.1.3/src/dct/x86_asm/idct_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/idct_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/idct_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -46,6 +46,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + ;============================================================================= + ; Macros and other preprocessor constants + ;============================================================================= +Index: xvidcore-1.1.3/src/dct/x86_asm/idct_sse2_dmitry.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/idct_sse2_dmitry.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/idct_sse2_dmitry.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + ;============================================================================= + ; Macros and other preprocessor constants + ;============================================================================= +Index: xvidcore-1.1.3/src/dct/x86_asm/simple_idct_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/dct/x86_asm/simple_idct_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/dct/x86_asm/simple_idct_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -22,6 +22,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + ;============================================================================= + ; Macros and other preprocessor constants + ;============================================================================= +Index: xvidcore-1.1.3/src/image/x86_asm/colorspace_rgb_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/colorspace_rgb_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/colorspace_rgb_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -24,6 +24,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/colorspace_yuv_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/colorspace_yuv_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/colorspace_yuv_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/colorspace_yuyv_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/colorspace_yuyv_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/colorspace_yuyv_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_3dn.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/interpolate8x8_3dn.asm 2005-09-13 14:12:15.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_3dn.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_3dne.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/interpolate8x8_3dne.asm 2005-09-13 14:12:15.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_3dne.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -26,6 +26,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/interpolate8x8_mmx.asm 2005-09-13 14:12:15.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -24,6 +24,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_xmm.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/interpolate8x8_xmm.asm 2005-09-13 14:12:15.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/interpolate8x8_xmm.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -24,6 +24,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/postprocessing_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/postprocessing_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/postprocessing_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/postprocessing_sse2.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/postprocessing_sse2.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/postprocessing_sse2.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -24,6 +24,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/qpel_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/qpel_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/qpel_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -40,6 +40,8 @@ + + bits 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/image/x86_asm/reduced_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/image/x86_asm/reduced_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/image/x86_asm/reduced_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/motion/x86_asm/sad_3dn.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/motion/x86_asm/sad_3dn.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/motion/x86_asm/sad_3dn.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/motion/x86_asm/sad_3dne.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/motion/x86_asm/sad_3dne.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/motion/x86_asm/sad_3dne.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -28,6 +28,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/motion/x86_asm/sad_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/motion/x86_asm/sad_mmx.asm 2005-02-20 00:20:27.000000000 +0100 ++++ xvidcore-1.1.3/src/motion/x86_asm/sad_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -26,6 +26,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/motion/x86_asm/sad_sse2.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/motion/x86_asm/sad_sse2.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/motion/x86_asm/sad_sse2.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -26,6 +26,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/motion/x86_asm/sad_xmm.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/motion/x86_asm/sad_xmm.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/motion/x86_asm/sad_xmm.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -27,6 +27,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/quant/x86_asm/quantize_h263_3dne.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/quant/x86_asm/quantize_h263_3dne.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/quant/x86_asm/quantize_h263_3dne.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -31,6 +31,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/quant/x86_asm/quantize_h263_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/quant/x86_asm/quantize_h263_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/quant/x86_asm/quantize_h263_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -30,6 +30,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/quant/x86_asm/quantize_mpeg_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/quant/x86_asm/quantize_mpeg_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/quant/x86_asm/quantize_mpeg_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -29,6 +29,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/quant/x86_asm/quantize_mpeg_xmm.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/quant/x86_asm/quantize_mpeg_xmm.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/quant/x86_asm/quantize_mpeg_xmm.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -31,6 +31,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/utils/x86_asm/cpuid.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/utils/x86_asm/cpuid.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/utils/x86_asm/cpuid.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/utils/x86_asm/interlacing_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/utils/x86_asm/interlacing_mmx.asm 2004-08-29 12:02:38.000000000 +0200 ++++ xvidcore-1.1.3/src/utils/x86_asm/interlacing_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -25,6 +25,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/utils/x86_asm/mem_transfer_3dne.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/utils/x86_asm/mem_transfer_3dne.asm 2005-09-13 14:12:15.000000000 +0200 ++++ xvidcore-1.1.3/src/utils/x86_asm/mem_transfer_3dne.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -28,6 +28,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS +Index: xvidcore-1.1.3/src/utils/x86_asm/mem_transfer_mmx.asm +=================================================================== +--- xvidcore-1.1.3.orig/src/utils/x86_asm/mem_transfer_mmx.asm 2005-09-13 14:12:15.000000000 +0200 ++++ xvidcore-1.1.3/src/utils/x86_asm/mem_transfer_mmx.asm 2009-01-12 15:49:44.000000000 +0100 +@@ -27,6 +27,8 @@ + + BITS 32 + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %macro cglobal 1 + %ifdef PREFIX + %ifdef MARK_FUNCS diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/CVE-2007-3329.dpatch /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/CVE-2007-3329.dpatch --- xvidcore-1.1.2/debian/patches/CVE-2007-3329.dpatch 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/patches/CVE-2007-3329.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## CVE-2007-3329.dpatch by William Grant -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xvidcore-1.1.2~/src/bitstream/mbcoding.c xvidcore-1.1.2/src/bitstream/mbcoding.c ---- xvidcore-1.1.2~/src/bitstream/mbcoding.c 2005-09-13 22:12:15.000000000 +1000 -+++ xvidcore-1.1.2/src/bitstream/mbcoding.c 2008-03-23 17:16:24.000000000 +1100 -@@ -1067,18 +1067,11 @@ - - do { - level = get_coeff(bs, &run, &last, 1, 0); -- if (run == -1) { -- DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); -- break; -- } - coeff += run; -- --#ifdef _DEBUG -- if(coeff>=64) { -- DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n"); -- return; -+ if ((run|coeff)&~63) { -+ DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index"); -+ break; - } --#endif - - block[scan[coeff]] = level; - -@@ -1115,18 +1108,11 @@ - p = 0; - do { - level = get_coeff(bs, &run, &last, 0, 0); -- if (run == -1) { -- DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); -- break; -- } - p += run; -- --#ifdef _DEBUG -- if(p>=64) { -- DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n"); -- return; -+ if ((p|run)&~63) { -+ DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index"); -+ break; - } --#endif - - if (level < 0) { - level = level*quant_m_2 - quant_add; -@@ -1157,18 +1143,11 @@ - p = 0; - do { - level = get_coeff(bs, &run, &last, 0, 0); -- if (run == -1) { -- DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); -- break; -- } - p += run; -- --#ifdef _DEBUG -- if(p>=64) { -- DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n"); -- return; -+ if ((p|run)&~63) { -+ DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index"); -+ break; - } --#endif - - if (level < 0) { - level = ((2 * -level + 1) * matrix[scan[p]] * quant) >> 4; diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/patches/series /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/patches/series --- xvidcore-1.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ xvidcore-1.1.3/debian/patches/series 2009-02-01 11:24:09.000000000 +0000 @@ -0,0 +1,3 @@ +01_ia64_fix.diff +02_configure.diff +03_exec-stack.diff diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/debian/rules /tmp/gs3OqrKxNj/xvidcore-1.1.3/debian/rules --- xvidcore-1.1.2/debian/rules 2009-02-01 11:24:09.000000000 +0000 +++ xvidcore-1.1.3/debian/rules 2009-02-01 11:24:09.000000000 +0000 @@ -2,17 +2,21 @@ #export DH_VERBOSE=1 -unexport CFLAGS - -include /usr/share/dpatch/dpatch.make +include /usr/share/quilt/quilt.make version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 endif CFLAGS = -Wall -g @@ -20,42 +24,47 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else - CFLAGS += -O2 -fweb -ffast-math -funswitch-loops -fgcse-after-reload -fomit-frame-pointer + CFLAGS += -O2 endif configure: configure-stamp -configure-stamp: patch +configure-stamp: debian/stamp-patched dh_testdir + cp -f /usr/share/misc/config.sub build/generic/config.sub + cp -f /usr/share/misc/config.guess build/generic/config.guess + CFLAGS="$(CFLAGS)" build/generic/configure --prefix=/usr \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) - touch configure-stamp + touch $@ build: build-stamp build-stamp: configure-stamp dh_testdir - $(MAKE) -j 4 -C build/generic + $(MAKE) -j $(NCPUS) -C build/generic - touch build-stamp + touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - [ ! -f build/generic/Makefile ] || $(MAKE) -C build/generic distclean + perl -i -pe 's,-freduce-all-givs,,' build/generic/platform.inc + + [ ! -f build/generic/config.sub ] || $(MAKE) -C build/generic distclean debian/rules unpatch - dh_clean config.status config.log build/generic/config.status \ - platform.inc libxvidcore.def build/generic/config.log + dh_clean config.log platform.inc libxvidcore.def build/generic/config.log \ + build/generic/config.guess build/generic/config.sub config.status build/generic/platform.inc install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs -A usr/lib usr/include $(MAKE) -C build/generic install prefix=$(CURDIR)/debian/${version}/usr diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/dshow/src/config.c /tmp/gs3OqrKxNj/xvidcore-1.1.3/dshow/src/config.c --- xvidcore-1.1.2/dshow/src/config.c 2005-09-18 02:34:13.000000000 +0100 +++ xvidcore-1.1.3/dshow/src/config.c 2007-06-27 19:57:42.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: config.c,v 1.8 2005/09/18 01:34:13 suxen_drol Exp $ + * $Id: config.c,v 1.8.2.1 2007/06/27 18:57:42 Isibaar Exp $ * ****************************************************************************/ @@ -109,14 +109,14 @@ nForceColorspace = SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_GETCURSEL, 0, 0); if ( g_config.nForceColorspace != nForceColorspace ) { - MessageBox(0, "You have changed the output colorspace.\r\nClose the movie and open it for the new colorspace to take effect.", "XviD DShow", MB_TOPMOST); + MessageBox(0, "You have changed the output colorspace.\r\nClose the movie and open it for the new colorspace to take effect.", "Xvid DShow", MB_TOPMOST); } g_config.nForceColorspace = nForceColorspace; aspect_ratio = SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_GETCURSEL, 0, 0); if ( g_config.aspect_ratio != aspect_ratio ) { - MessageBox(0, "You have changed the default aspect ratio.\r\nClose the movie and open it for the new aspect ratio to take effect.", "XviD DShow", MB_TOPMOST); + MessageBox(0, "You have changed the default aspect ratio.\r\nClose the movie and open it for the new aspect ratio to take effect.", "Xvid DShow", MB_TOPMOST); } g_config.aspect_ratio = aspect_ratio; SaveRegistryInfo(); diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/dshow/src/Configure.cpp /tmp/gs3OqrKxNj/xvidcore-1.1.3/dshow/src/Configure.cpp --- xvidcore-1.1.2/dshow/src/Configure.cpp 2004-07-28 12:26:16.000000000 +0100 +++ xvidcore-1.1.3/dshow/src/Configure.cpp 2007-06-27 19:57:42.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: Configure.cpp,v 1.4 2004/07/28 11:26:16 suxen_drol Exp $ + * $Id: Configure.cpp,v 1.4.2.1 2007/06/27 18:57:42 Isibaar Exp $ * ****************************************************************************/ @@ -52,7 +52,7 @@ psh.hwndParent = hwndOwner; psh.hInstance = g_xvid_hInst; psh.pszIcon = NULL; - psh.pszCaption = (LPSTR)"XviD Configuration"; + psh.pszCaption = (LPSTR)"Xvid Configuration"; psh.nPages = sizeof (psp) / sizeof (PROPSHEETPAGE); psh.ppsp = psp; diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/dshow/src/CXvidDecoder.h /tmp/gs3OqrKxNj/xvidcore-1.1.3/dshow/src/CXvidDecoder.h --- xvidcore-1.1.2/dshow/src/CXvidDecoder.h 2005-10-08 01:58:02.000000000 +0100 +++ xvidcore-1.1.3/dshow/src/CXvidDecoder.h 2007-06-27 19:57:42.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: CXvidDecoder.h,v 1.6 2005/10/08 00:58:02 suxen_drol Exp $ + * $Id: CXvidDecoder.h,v 1.6.2.1 2007/06/27 18:57:42 Isibaar Exp $ * ****************************************************************************/ @@ -30,7 +30,7 @@ #include "IXvidDecoder.h" -#define XVID_NAME_L L"XviD MPEG-4 Video Decoder" +#define XVID_NAME_L L"Xvid MPEG-4 Video Decoder" /* --- fourcc --- */ diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/src/bitstream/mbcoding.c /tmp/gs3OqrKxNj/xvidcore-1.1.3/src/bitstream/mbcoding.c --- xvidcore-1.1.2/src/bitstream/mbcoding.c 2005-09-13 13:12:15.000000000 +0100 +++ xvidcore-1.1.3/src/bitstream/mbcoding.c 2007-06-28 16:00:11.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: mbcoding.c,v 1.52 2005/09/13 12:12:15 suxen_drol Exp $ + * $Id: mbcoding.c,v 1.52.2.2 2007/06/28 15:00:11 Isibaar Exp $ * ****************************************************************************/ @@ -1051,7 +1051,7 @@ return (level << 20) >> 20; error: - *run = VLC_ERROR; + *run = 64; return 0; } @@ -1067,19 +1067,12 @@ do { level = get_coeff(bs, &run, &last, 1, 0); - if (run == -1) { - DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); + coeff += run; + if (coeff & ~63) { + DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index"); break; } - coeff += run; -#ifdef _DEBUG - if(coeff>=64) { - DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n"); - return; - } -#endif - block[scan[coeff]] = level; DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[coeff], level); @@ -1115,18 +1108,11 @@ p = 0; do { level = get_coeff(bs, &run, &last, 0, 0); - if (run == -1) { - DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); - break; - } p += run; - -#ifdef _DEBUG - if(p>=64) { - DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n"); - return; + if (p & ~63) { + DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index"); + break; } -#endif if (level < 0) { level = level*quant_m_2 - quant_add; @@ -1157,18 +1143,11 @@ p = 0; do { level = get_coeff(bs, &run, &last, 0, 0); - if (run == -1) { - DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); - break; - } p += run; - -#ifdef _DEBUG - if(p>=64) { - DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n"); - return; + if (p & ~63) { + DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index"); + break; } -#endif if (level < 0) { level = ((2 * -level + 1) * matrix[scan[p]] * quant) >> 4; diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/src/xvid.c /tmp/gs3OqrKxNj/xvidcore-1.1.3/src/xvid.c --- xvidcore-1.1.2/src/xvid.c 2006-11-01 10:17:27.000000000 +0000 +++ xvidcore-1.1.3/src/xvid.c 2007-06-27 19:57:42.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: xvid.c,v 1.65.2.4 2006/11/01 10:17:27 Isibaar Exp $ + * $Id: xvid.c,v 1.65.2.5 2007/06/27 18:57:42 Isibaar Exp $ * ****************************************************************************/ @@ -712,7 +712,7 @@ return XVID_ERR_VERSION; info->actual_version = XVID_VERSION; - info->build = "xvid-1.1.2"; + info->build = "xvid-1.1.3"; info->cpu_flags = detect_cpu_flags(); #if defined(_SMP) && defined(WIN32) diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/src/xvid.h /tmp/gs3OqrKxNj/xvidcore-1.1.3/src/xvid.h --- xvidcore-1.1.2/src/xvid.h 2006-11-01 10:17:27.000000000 +0000 +++ xvidcore-1.1.3/src/xvid.h 2007-06-27 19:57:42.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: xvid.h,v 1.51.2.4 2006/11/01 10:17:27 Isibaar Exp $ + * $Id: xvid.h,v 1.51.2.5 2007/06/27 18:57:42 Isibaar Exp $ * ****************************************************************************/ @@ -57,7 +57,7 @@ #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) -#define XVID_VERSION XVID_MAKE_VERSION(1,1,2) +#define XVID_VERSION XVID_MAKE_VERSION(1,1,3) #define XVID_API XVID_MAKE_API(4, 1) /* Bitstream Version diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/vfw/bin/xvid.inf /tmp/gs3OqrKxNj/xvidcore-1.1.3/vfw/bin/xvid.inf --- xvidcore-1.1.2/vfw/bin/xvid.inf 2004-05-30 03:30:33.000000000 +0100 +++ xvidcore-1.1.3/vfw/bin/xvid.inf 2007-06-28 17:09:39.000000000 +0100 @@ -1,11 +1,11 @@ -; XviD MPEG-4 Video Codec install +; Xvid MPEG-4 Video Codec install [Version] Signature = "$CHICAGO$" Class = MEDIA [SourceDisksNames] -1="XviD MPEG-4 Video Codec Install Disk",, 0001 +1="Xvid MPEG-4 Video Codec Install Disk",, 0001 [SourceDisksFiles] xvidvfw.dll=1 @@ -13,7 +13,7 @@ xvidcore.dll=1 [Installable.Drivers] -XVID = 1:xvidvfw.dll, "vidc.XVID", "XviD MPEG-4 Video Codec" , , , +XVID = 1:xvidvfw.dll, "vidc.XVID", "Xvid MPEG-4 Video Codec" , , , [DefaultInstall] CopyFiles=MPEG4.Copy.Inf,MPEG4.Copy @@ -70,7 +70,7 @@ HKLM,%UnInstallPath%,UninstallString,,"%11%\rundll32.exe setupapi,InstallHinfSection Remove_XviD 132 %17%\%InfFile%" [MPEG4.DoReg] -;HKLM,Software\Microsoft\Windows\CurrentVersion\RunOnce\Setup,"Registering XviD Direct Show ;Decoder...",,"%11%\regsvr32.exe /s %11%\xvid.ax" +;HKLM,Software\Microsoft\Windows\CurrentVersion\RunOnce\Setup,"Registering Xvid Direct Show ;Decoder...",,"%11%\regsvr32.exe /s %11%\xvid.ax" [MPEG4.DelReg] HKLM,SYSTEM\CurrentControlSet\Control\MediaResources\icm\vidc.XVID @@ -79,7 +79,7 @@ HKLM,%UnInstallPath% [MPEG4.Unregister] -;HKLM,Software\Microsoft\Windows\CurrentVersion\RunOnce\Setup,"Unregistering XviD Direct Show ;Decoder...",,"%11%\regsvr32.exe /s /u %11%\xvid.ax" +;HKLM,Software\Microsoft\Windows\CurrentVersion\RunOnce\Setup,"Unregistering Xvid Direct Show ;Decoder...",,"%11%\regsvr32.exe /s /u %11%\xvid.ax" [MPEG4.DelConfig] HKCU,Software\GNU\XviD @@ -90,10 +90,10 @@ MPEG4.Copy.Inf = 17 [Strings] -XviD="XviD MPEG-4 Video Codec" +XviD="Xvid MPEG-4 Video Codec" InfFile="xvid.inf" UnInstallPath="Software\Microsoft\Windows\CurrentVersion\Uninstall\xvid" MediaClassName="Media Devices" -mfgname="XviD Development Team" +mfgname="Xvid Development Team" Website="http://www.xvid.org/" REG_DWORD=0x00010001 diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/vfw/src/codec.h /tmp/gs3OqrKxNj/xvidcore-1.1.3/vfw/src/codec.h --- xvidcore-1.1.2/vfw/src/codec.h 2004-04-18 08:55:11.000000000 +0100 +++ xvidcore-1.1.3/vfw/src/codec.h 2007-06-27 19:57:42.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: codec.h,v 1.5 2004/04/18 07:55:11 syskin Exp $ + * $Id: codec.h,v 1.5.2.1 2007/06/27 18:57:42 Isibaar Exp $ * ****************************************************************************/ #ifndef _CODEC_H_ @@ -30,7 +30,7 @@ #include "status.h" #define XVID_NAME_L L"XVID" -#define XVID_DESC_L L"XviD MPEG-4 Codec" +#define XVID_DESC_L L"Xvid MPEG-4 Codec" #define FOURCC_XVID mmioFOURCC('X','V','I','D') #define FOURCC_DIVX mmioFOURCC('D','I','V','X') diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/vfw/src/config.c /tmp/gs3OqrKxNj/xvidcore-1.1.3/vfw/src/config.c --- xvidcore-1.1.2/vfw/src/config.c 2006-07-10 18:39:38.000000000 +0100 +++ xvidcore-1.1.3/vfw/src/config.c 2007-06-27 19:57:42.000000000 +0100 @@ -1747,7 +1747,7 @@ psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW | PSH_NOCONTEXTHELP; psh.hwndParent = hParent; psh.hInstance = g_hInst; - psh.pszCaption = (LPSTR) "XviD Configuration"; + psh.pszCaption = (LPSTR) "Xvid Configuration"; psh.nPages = size; psh.nStartPage = 0; psh.ppsp = (LPCPROPSHEETPAGE)&psp; diff -Nru /tmp/cdgZtnAaWb/xvidcore-1.1.2/vfw/src/resource.rc /tmp/gs3OqrKxNj/xvidcore-1.1.3/vfw/src/resource.rc --- xvidcore-1.1.2/vfw/src/resource.rc 2005-10-16 01:00:04.000000000 +0100 +++ xvidcore-1.1.3/vfw/src/resource.rc 2007-06-28 17:08:50.000000000 +0100 @@ -77,7 +77,7 @@ IDD_MAIN DIALOGEX 0, 0, 225, 255 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XviD Configuration" +CAPTION "Xvid Configuration" FONT 8, "MS Shell Dlg" BEGIN COMBOBOX IDC_PROFILE,88,16,91,200,CBS_DROPDOWNLIST | WS_VSCROLL | @@ -465,7 +465,7 @@ IDD_ABOUT DIALOG DISCARDABLE 0, 0, 192, 165 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XviD MPEG4 Video Codec" +CAPTION "Xvid MPEG4 Video Codec" FONT 8, "MS Shell Dlg" BEGIN CTEXT "GPL'ed MPEG4 video codec demonstration.\nFor educational purposes only.", @@ -474,7 +474,7 @@ SS_CENTERIMAGE CTEXT "BUILD",IDC_BUILD,8,28,176,8,SS_CENTERIMAGE CONTROL "IDB_LOGO",IDC_STATIC,"Static",SS_BITMAP,24,56,15,13 - CTEXT "XviD MPEG4 video codec",IDC_STATIC,8,16,176,12 + CTEXT "Xvid MPEG4 video codec",IDC_STATIC,8,16,176,12 GROUPBOX "About",IDC_STATIC,4,4,184,132 DEFPUSHBUTTON "OK",IDOK,102,144,80,14 CTEXT "CORE",IDC_CORE,8,40,176,8,SS_CENTERIMAGE @@ -585,7 +585,7 @@ EDITTEXT IDC_LEVEL_BITRATE,156,131,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY LTEXT "Profile @ Level:",IDC_STATIC,8,10,52,8 - GROUPBOX "Level - XviD will not force you to respect these", + GROUPBOX "Level - Xvid will not force you to respect these", IDC_LEVEL_LEVEL_G,8,28,196,66 LTEXT "Suggested:",IDC_LEVEL_DIM_S,16,45,48,8 LTEXT "x",IDC_STATIC,120,45,8,8 @@ -627,7 +627,7 @@ IDD_STATUS DIALOGEX 0, 0, 325, 220 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XviD Status" +CAPTION "Xvid Status" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_STATUS_GRAPH,"Static",SS_OWNERDRAW | SS_NOTIFY,4, @@ -884,7 +884,7 @@ // Bitmap // -IDB_LOGO BITMAP DISCARDABLE "XviD_logo.bmp" +IDB_LOGO BITMAP DISCARDABLE "Xvid_logo.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -991,8 +991,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDC_CPU_AUTO "Enable XviD's internal CPU detection" - IDC_CPU_FORCE "Override XviD's internal CPU detection (not recommended)" + IDC_CPU_AUTO "Enable Xvid's internal CPU detection" + IDC_CPU_FORCE "Override Xvid's internal CPU detection (not recommended)" END STRINGTABLE DISCARDABLE