Update to 1.2.1:

New in 1.2.1:
   * Fix for 'nested function' potential compilation error

New in 1.2.0:
   * Complete AMD64/EM64T 64-bit support
   * Added support for WIN64 platform
   * Multi-threaded encoding support
   * SSE3/SSE4 optimizations
   * Faster and more precise mpeg intra quantization
   * Fixed bug in packed pixel format colorspace conversion
   * Noexec-stack security patch
   * Fix for bad resync marker length
   * Improved decoder robustness for broken streams containing B-frames
   * Fix for potential out-of-bound access to MV bits table
   * Added SSIM quality-metric plugin

4 files changed, 22 insertions, 22 deletions

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index c55dc09d7a0..3a758212060 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2007/12/17 22:13:42 tron Exp $
+# $NetBSD: Makefile,v 1.31 2009/01/07 10:52:12 wiz Exp $
 
-DISTNAME=	xvidcore-1.1.3
+DISTNAME=	xvidcore-1.2.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -28,7 +28,7 @@ BUILD_DEPENDS+=		nasm>=0.98.39nb3:../../devel/nasm
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
+WRKSRC=		${WRKDIR}/xvidcore/build/generic
 GNU_CONFIGURE=	YES
 
 MAKE_ENV+=	MKDIR=${MKDIR:Q}
diff --git a/multimedia/xvidcore/PLIST b/multimedia/xvidcore/PLIST
index 7b80d551721..757827ec09a 100644
--- a/multimedia/xvidcore/PLIST
+++ b/multimedia/xvidcore/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2006/01/06 17:12:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/01/07 10:52:12 wiz Exp $
 include/xvid.h
 lib/libxvidcore.a
 lib/libxvidcore.so
 lib/libxvidcore.so.4
-lib/libxvidcore.so.4.1
+lib/libxvidcore.so.4.2
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index cbf937b556d..5bbc695b9bf 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2007/07/03 19:53:00 wiz Exp $
+$NetBSD: distinfo,v 1.19 2009/01/07 10:52:12 wiz Exp $
 
-SHA1 (xvidcore-1.1.3.tar.bz2) = 7a945c245851e115bc107aa621f72d775a5d1adb
-RMD160 (xvidcore-1.1.3.tar.bz2) = f890a2ef58be5362aa1d2894e748ef11a0c7bba8
-Size (xvidcore-1.1.3.tar.bz2) = 625974 bytes
+SHA1 (xvidcore-1.2.1.tar.bz2) = 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3
+RMD160 (xvidcore-1.2.1.tar.bz2) = fcb6a5a0410d1921d99361fe5d580f00128b9ba3
+Size (xvidcore-1.2.1.tar.bz2) = 641101 bytes
 SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
-SHA1 (patch-ab) = 19306e1db22eeb58e703b1b416b019c0d2c4a694
+SHA1 (patch-ab) = 45989eeed44af684df183fde91dcc3acb60f022c
diff --git a/multimedia/xvidcore/patches/patch-ab b/multimedia/xvidcore/patches/patch-ab
index f8c64648ef4..6750461bf82 100644
--- a/multimedia/xvidcore/patches/patch-ab
+++ b/multimedia/xvidcore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/01/06 16:31:48 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
 
---- configure.orig	2006-11-01 11:39:36.000000000 +0100
+--- configure.orig	2008-12-03 12:01:54.000000000 +0100
 +++ configure
-@@ -3782,7 +3782,7 @@ SHARED_EXTENSION=""
+@@ -3800,7 +3800,7 @@ SHARED_EXTENSION=""
  STATIC_EXTENSION=""
  OBJECT_EXTENSION=""
  case "$target_os" in
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2007/01/06 16:31:48 jmmv Exp $
  	echo "$as_me:$LINENO: result: .so .a .o" >&5
  echo "${ECHO_T}.so .a .o" >&6
  	STATIC_EXTENSION="a"
-@@ -3833,7 +3833,7 @@ echo "${ECHO_T}ok" >&6
+@@ -3851,7 +3851,7 @@ echo "${ECHO_T}ok" >&6
  	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
  	SPECIFIC_CFLAGS="-fPIC"
  	;;
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2007/01/06 16:31:48 jmmv Exp $
  	echo "$as_me:$LINENO: result: ok" >&5
  echo "${ECHO_T}ok" >&6
  	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-@@ -3856,13 +3856,13 @@ echo "${ECHO_T}ok" >&6
+@@ -3874,13 +3874,13 @@ echo "${ECHO_T}ok" >&6
  	   echo "$as_me:$LINENO: result: dylib options" >&5
  echo "${ECHO_T}dylib options" >&6
  	   SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
@@ -36,18 +36,18 @@ $NetBSD: patch-ab,v 1.3 2007/01/06 16:31:48 jmmv Exp $
  	fi
  	;;
       beos)
-@@ -4038,7 +4038,7 @@ echo "$as_me: WARNING: nasm patch versio
+@@ -4001,7 +4001,7 @@ echo "$as_me: WARNING: nasm version is t
         echo "$as_me:$LINENO: checking for asm object format" >&5
  echo $ECHO_N "checking for asm object format... $ECHO_C" >&6
         case "$target_os" in
 -           *bsd*|linux*|beos|irix*|solaris*)
 +           *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
-                echo "$as_me:$LINENO: result: elf" >&5
- echo "${ECHO_T}elf" >&6
-                NASM_FORMAT="elf"
-@@ -4052,6 +4052,13 @@ echo "${ECHO_T}win32" >&6
- 	       PREFIX="-DPREFIX"
- 	       MARK_FUNCS=""
+                if test "$ARCHITECTURE" = "X86_64" ; then
+                    echo "$as_me:$LINENO: result: elf64" >&5
+ echo "${ECHO_T}elf64" >&6
+@@ -4034,6 +4034,13 @@ echo "${ECHO_T}macho" >&6
+                PREFIX="-DPREFIX"
+                MARK_FUNCS=""
                 ;;
 +           darwin*|rhapsody*)
 +               echo "$as_me:$LINENO: result: macho" >&5