update to 1.2.2

changes:
-Workaround for nasm bug with Mach-O/OSX target
-Fix for missing resync marker range check
-Improved precision for RGB<->YUV conversions
-Fix for potential RGB24 access violation
-Updated compiler options for Apple PPC target

3 files changed, 16 insertions, 17 deletions

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 3a1b4b80885..b9eebc0f89d 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2009/01/28 16:03:37 tonio Exp $
+# $NetBSD: Makefile,v 1.35 2009/06/02 17:10:53 drochner Exp $
 
-DISTNAME=	xvidcore-1.2.1
-PKGREVISION=	1
+DISTNAME=	xvidcore-1.2.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index 08c850ed083..7f113cc482c 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2009/01/24 17:20:13 jmcneill Exp $
+$NetBSD: distinfo,v 1.22 2009/06/02 17:10:53 drochner Exp $
 
-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 (xvidcore-1.2.2.tar.bz2) = d03270c803592f7655e7aa4181de587be25ba97f
+RMD160 (xvidcore-1.2.2.tar.bz2) = 5fbbc99a02d9eab7f2394220cec2c872957ff26f
+Size (xvidcore-1.2.2.tar.bz2) = 643344 bytes
 SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
-SHA1 (patch-ab) = 45989eeed44af684df183fde91dcc3acb60f022c
+SHA1 (patch-ab) = f4ede5caf57cb35cb566d73672a4228e42d666e9
 SHA1 (patch-ac) = 4318ab70e07444078cf0436b101f88bc4ae80aab
diff --git a/multimedia/xvidcore/patches/patch-ab b/multimedia/xvidcore/patches/patch-ab
index 6750461bf82..1c9e82e537a 100644
--- a/multimedia/xvidcore/patches/patch-ab
+++ b/multimedia/xvidcore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2009/06/02 17:10:53 drochner Exp $
 
---- configure.orig	2008-12-03 12:01:54.000000000 +0100
+--- configure.orig	2009-05-28 19:13:31.000000000 +0200
 +++ configure
-@@ -3800,7 +3800,7 @@ SHARED_EXTENSION=""
+@@ -3802,7 +3802,7 @@ SHARED_EXTENSION=""
  STATIC_EXTENSION=""
  OBJECT_EXTENSION=""
  case "$target_os" in
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
  	echo "$as_me:$LINENO: result: .so .a .o" >&5
  echo "${ECHO_T}.so .a .o" >&6
  	STATIC_EXTENSION="a"
-@@ -3851,7 +3851,7 @@ echo "${ECHO_T}ok" >&6
+@@ -3853,7 +3853,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,12 +20,12 @@ $NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
  	echo "$as_me:$LINENO: result: ok" >&5
  echo "${ECHO_T}ok" >&6
  	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-@@ -3874,13 +3874,13 @@ echo "${ECHO_T}ok" >&6
+@@ -3876,13 +3876,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)"
--	   SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
-+	   SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB) -Wl,-read_only_relocs -Wl,warning"
+-	   SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
++	   SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB) -Wl,-read_only_relocs -Wl,warning"
  	else
  	   echo "$as_me:$LINENO: result: module options" >&5
  echo "${ECHO_T}module options" >&6
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
  	fi
  	;;
       beos)
-@@ -4001,7 +4001,7 @@ echo "$as_me: WARNING: nasm version is t
+@@ -4075,7 +4075,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
@@ -45,7 +45,7 @@ $NetBSD: patch-ab,v 1.4 2009/01/07 10:52:12 wiz Exp $
                 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
+@@ -4108,6 +4108,13 @@ echo "${ECHO_T}macho" >&6
                 PREFIX="-DPREFIX"
                 MARK_FUNCS=""
                 ;;