Update to 1.1.0:

This release is the long awaited 1.1.0. It is mostly API compatible
with the previous stable release as we dropped support for reduced
resolution coding. If your application didn't use that feature then the
upgrade is totally compatible.

Changes since 1.0.3:
  * xvidcore:
       * Improved Low bitrate quality.
       * Improved VBV support
       * Rate-Distortion mode decision for bvops
       * New postprocessing functions, brightness and deringing
       * New PowerPC port by Christoph Naegeli
       * Brand new amd64 Linux 64bit port by Andre Werthmann
       * Various decoder and encoder speedups
       * A few bugs squashed
  * VFW frontend
       * Mingw/CygWin support
       * Various small improvements
       * A few bugs squashed
  * DShow frontend
       * Mingw/CygWin support
       * Support for brightness control
       * Various small improvements
       * A few bugs squashed
Changes since 1.1.0-beta2:
  * xvidcore
       * Field interlaced decoding
       * IEEE-1180 compliant SSE2 iDCT (disabled for safety)
       * Fixed misaligned reads on RISC platforms such as ARM
       * Completed GCC 4.0 support
       * Export only public API on GNU/Linux and Solaris
       * Work on the example apps. Support for AVS input in xvid_encraw
  * VFW frontend
       * Small updates
  * DShow frontend
       * Additional fourcc support

5 files changed, 44 insertions, 41 deletions

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 2075fc23799..d4e333eb286 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:43 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 17:12:18 wiz Exp $
 #
 
-DISTNAME=	xvidcore-1.0.3
-PKGREVISION=	1
+DISTNAME=	xvidcore-1.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.xvid.org/
 COMMENT=	ISO MPEG-4 compliant video codec
 
-ONLY_FOR_PLATFORM+=	*-*-i386
+ONLY_FOR_PLATFORM+=	*-*-i386 *-*-powerpc *-*-x86_64
 
 BUILD_DEPENDS+=	nasm>=0.98.34:../../devel/nasm
 
diff --git a/multimedia/xvidcore/PLIST b/multimedia/xvidcore/PLIST
index 2acb3c02e48..7b80d551721 100644
--- a/multimedia/xvidcore/PLIST
+++ b/multimedia/xvidcore/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/21 07:41:53 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/06 17:12:18 wiz Exp $
 include/xvid.h
 lib/libxvidcore.a
 lib/libxvidcore.so
 lib/libxvidcore.so.4
-lib/libxvidcore.so.4.0
+lib/libxvidcore.so.4.1
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index a3731d4f02c..8f929c682ef 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/10/21 07:41:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2006/01/06 17:12:18 wiz Exp $
 
-SHA1 (xvidcore-1.0.3.tar.bz2) = 4b7de410e55c318cb68a829bb7e3619cbf40a1cf
-RMD160 (xvidcore-1.0.3.tar.bz2) = 96e4d46f617ebb802c2a6cacbf64502356a70741
-Size (xvidcore-1.0.3.tar.bz2) = 541841 bytes
-SHA1 (patch-aa) = b43b94cad51f3121ccb7d0a4ece497ad29393ad2
-SHA1 (patch-ab) = d0b79c482883191f99dfc4d870a90f52776366c9
+SHA1 (xvidcore-1.1.0.tar.bz2) = f3ffc21529ab7941e423df7365de22c391d2eaeb
+RMD160 (xvidcore-1.1.0.tar.bz2) = 582927437970cf81534b9ed4f02173201e10f47b
+Size (xvidcore-1.1.0.tar.bz2) = 612101 bytes
+SHA1 (patch-aa) = d0e69ecd59578b71f49205fbd102496bdcfd8e24
+SHA1 (patch-ab) = 445d528602f67079bca03986c2c172af3291b15d
diff --git a/multimedia/xvidcore/patches/patch-aa b/multimedia/xvidcore/patches/patch-aa
index cba5f25e116..8a7721fb394 100644
--- a/multimedia/xvidcore/patches/patch-aa
+++ b/multimedia/xvidcore/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/10/21 07:41:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/06 17:12:18 wiz Exp $
 
---- Makefile.orig	2004-12-19 12:38:46.000000000 +0100
-+++ Makefile	2005-10-21 08:26:37.000000000 +0200
-@@ -82,7 +82,7 @@
+--- Makefile.orig	2005-12-30 14:45:30.000000000 +0000
++++ Makefile
+@@ -83,7 +83,7 @@ $(OBJECTS): platform.inc
  
  $(BUILD_DIR):
  	@echo "  D: $(BUILD_DIR)"
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2005/10/21 07:41:53 xtraeme Exp $
  
  #-----------------------------------------------------------------------------
  # Generic assembly rule
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@ $(BUILD_DIR):
  
  .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
  	@echo "  A: $(@D)/$(<F)"
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2005/10/21 07:41:53 xtraeme Exp $
  	@$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
  
  #-----------------------------------------------------------------------------
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@ $(BUILD_DIR):
  
  .c.$(OBJECT_EXTENSION):
  	@echo "  C: $(@D)/$(<F)"
@@ -29,21 +29,25 @@ $NetBSD: patch-aa,v 1.2 2005/10/21 07:41:53 xtraeme Exp $
  	@$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
  
  #-----------------------------------------------------------------------------
-@@ -127,7 +127,7 @@
+@@ -128,8 +128,8 @@ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
  
  $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
  	@echo "  L: $(@F)"
 -	@$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
+-	@$(INSTALL) -m 644 libxvidcore.ld $(BUILD_DIR)/libxvidcore.ld
 +	@$(BSD_INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
++	@$(BSD_INSTALL) -m 644 libxvidcore.ld $(BUILD_DIR)/libxvidcore.ld
  	@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
  
  #-----------------------------------------------------------------------------
-@@ -139,6 +139,8 @@
- 	@$(INSTALL) -d $(libdir)
+@@ -140,7 +140,9 @@ install: $(BUILD_DIR)/$(STATIC_LIB) $(BU
+ 	@echo "  D: $(libdir)"
+ 	@$(INSTALL) -d $(DESTDIR)$(libdir)
  	@echo "  I: $(libdir)/$(SHARED_LIB)"
- 	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(libdir)/$(SHARED_LIB)
+-	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
++	@$(BSD_INSTALL_LIB) $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
 +	@ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so
 +	@ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so.$(API_MAJOR)
  	@echo "  I: $(libdir)/$(STATIC_LIB)"
- 	@$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(libdir)/$(STATIC_LIB)
+ 	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
  	@echo "  D: $(includedir)"
diff --git a/multimedia/xvidcore/patches/patch-ab b/multimedia/xvidcore/patches/patch-ab
index 123ccf9e975..9f858f6d741 100644
--- a/multimedia/xvidcore/patches/patch-ab
+++ b/multimedia/xvidcore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/05/20 12:54:54 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/06 17:12:18 wiz Exp $
 
---- configure.orig	2005-05-19 22:22:30.000000000 +0200
-+++ configure	2005-05-19 22:22:54.000000000 +0200
-@@ -3776,7 +3776,7 @@
+--- configure.orig	2005-12-30 15:45:30.000000000 +0100
++++ configure
+@@ -3782,7 +3782,7 @@ SHARED_EXTENSION=""
  STATIC_EXTENSION=""
  OBJECT_EXTENSION=""
  case "$target_os" in
@@ -11,21 +11,21 @@ $NetBSD: patch-ab,v 1.1 2005/05/20 12:54:54 drochner Exp $
  	echo "$as_me:$LINENO: result: .so .a .o" >&5
  echo "${ECHO_T}.so .a .o" >&6
  	STATIC_EXTENSION="a"
-@@ -3819,7 +3819,7 @@
- SPECIFIC_CFLAGS=""
- PRE_SHARED_LIB=""
- case "$target_os" in
--     *bsd*|linux*|irix*|solaris*)
-+     *bsd*|linux*|irix*|solaris*|dragonfly*)
+@@ -3833,7 +3833,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"
+ 	;;
+-     *bsd*|irix*)
++     *bsd*|dragonfly*|irix*)
  	echo "$as_me:$LINENO: result: ok" >&5
  echo "${ECHO_T}ok" >&6
  	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-@@ -3957,7 +3957,7 @@
-                                     echo "$as_me:$LINENO: checking for nasm object format" >&5
- echo $ECHO_N "checking for nasm 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
+@@ -4038,7 +4038,7 @@ echo "$as_me: WARNING: nasm patch versio
+        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"
+                NASM_FORMAT="elf"