Changes 1.3.3:

* xvidcore/examples/xvid_encraw.c: Help info about zones usage and
  various fixes for compiler warnings
* xvidcore/examples/xvid_encraw.c: Improved help texts and defaults
  handling.
* xvidcore/examples/Makefile, xvidcore/examples/xvid_encraw.c:
  Better environment detection for Makefile
* xvidcore/examples/xvid_encraw.c: Fix out of bound access to
  framestats struct.

4 files changed, 31 insertions, 33 deletions

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 037f055dfee..469ca388fda 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2014/06/04 11:40:41 adam Exp $
 
-DISTNAME=	xvidcore-1.3.2
+DISTNAME=	xvidcore-1.3.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index 675eac26f4f..7057544d528 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2011/07/19 18:56:46 drochner Exp $
+$NetBSD: distinfo,v 1.27 2014/06/04 11:40:41 adam Exp $
 
-SHA1 (xvidcore-1.3.2.tar.bz2) = 74f9ce9c1bebcc9806bf21cb53274b8102700309
-RMD160 (xvidcore-1.3.2.tar.bz2) = 968493d5813cbc30630532a1a64011e5572a5017
-Size (xvidcore-1.3.2.tar.bz2) = 697038 bytes
-SHA1 (patch-aa) = 468884a8ab9dc528d9b51cbdb498bce2e08a02db
-SHA1 (patch-ab) = 195e50e1dfbfc20b88b7275793cdb78270f818ae
+SHA1 (xvidcore-1.3.3.tar.bz2) = aead171974e2916bafce60ac9e0ca033641346f5
+RMD160 (xvidcore-1.3.3.tar.bz2) = 63960a2ad567ab1e1fc1efa18b86d86fc0abddb4
+Size (xvidcore-1.3.3.tar.bz2) = 695279 bytes
+SHA1 (patch-aa) = 301aa9c2c668fca1a74fdb4d3b1a7e5f8eca1c2a
+SHA1 (patch-ab) = 7917694cf3c2c10f76be511f0ad05fa3023a40ce
diff --git a/multimedia/xvidcore/patches/patch-aa b/multimedia/xvidcore/patches/patch-aa
index 54817f7602f..b88d662d245 100644
--- a/multimedia/xvidcore/patches/patch-aa
+++ b/multimedia/xvidcore/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2011/06/24 13:04:43 tron Exp $
+$NetBSD: patch-aa,v 1.6 2014/06/04 11:40:41 adam Exp $
 
---- build/generic/Makefile.orig	2005-12-30 14:45:30.000000000 +0000
+--- build/generic/Makefile.orig	2014-04-08 20:41:05.000000000 +0000
 +++ build/generic/Makefile
-@@ -83,7 +83,7 @@ $(OBJECTS): platform.inc
+@@ -85,7 +85,7 @@ $(OBJECTS): platform.inc
  
  $(BUILD_DIR):
  	@echo "  D: $(BUILD_DIR)"
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2011/06/24 13:04:43 tron Exp $
  
  #-----------------------------------------------------------------------------
  # Generic assembly rule
-@@ -91,7 +91,7 @@ $(BUILD_DIR):
+@@ -93,7 +93,7 @@ $(BUILD_DIR):
  
  .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
  	@echo "  A: $(@D)/$(<F)"
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.5 2011/06/24 13:04:43 tron Exp $
  	@$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
  
  #-----------------------------------------------------------------------------
-@@ -100,7 +100,7 @@ $(BUILD_DIR):
+@@ -104,7 +104,7 @@ $(PPC_ALTIVEC_OBJECTS): CFLAGS+= $(ALTIV
  
  .c.$(OBJECT_EXTENSION):
  	@echo "  C: $(@D)/$(<F)"
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.5 2011/06/24 13:04:43 tron Exp $
  	@$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
  
  #-----------------------------------------------------------------------------
-@@ -128,8 +128,8 @@ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
+@@ -132,8 +132,8 @@ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
  
  $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
  	@echo "  L: $(@F)"
@@ -40,14 +40,12 @@ $NetBSD: patch-aa,v 1.5 2011/06/24 13:04:43 tron Exp $
  	@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
  
  #-----------------------------------------------------------------------------
-@@ -140,7 +140,9 @@ install: $(BUILD_DIR)/$(STATIC_LIB) $(BU
- 	@echo "  D: $(libdir)"
- 	@$(INSTALL) -d $(DESTDIR)$(libdir)
+@@ -158,7 +158,7 @@ ifeq ($(SHARED_EXTENSION),dll)
+ 	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(bindir)/$(SHARED_LIB)
+ else
  	@echo "  I: $(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) $(DESTDIR)$(libdir)/libxvidcore.so
-+	@ln -s $(libdir)/$(SHARED_LIB) $(DESTDIR)$(libdir)/libxvidcore.so.$(API_MAJOR)
- 	@echo "  I: $(libdir)/$(STATIC_LIB)"
- 	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
- 	@echo "  D: $(includedir)"
+ 	@test -z "$(SO_API_MAJOR_LINK)" || \
+ 		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_API_MAJOR_LINK)
+ 	@test -z "$(SO_LINK)" || \
diff --git a/multimedia/xvidcore/patches/patch-ab b/multimedia/xvidcore/patches/patch-ab
index 1551e52fb80..1819ee59842 100644
--- a/multimedia/xvidcore/patches/patch-ab
+++ b/multimedia/xvidcore/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.8 2011/07/19 18:56:46 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2014/06/04 11:40:41 adam Exp $
 
---- build/generic/configure.orig	2009-05-28 17:13:31.000000000 +0000
+--- build/generic/configure.orig	2014-04-08 20:41:05.000000000 +0000
 +++ build/generic/configure
-@@ -3802,7 +3802,7 @@ SHARED_EXTENSION=""
+@@ -4316,7 +4316,7 @@ SHARED_EXTENSION=""
  STATIC_EXTENSION=""
  OBJECT_EXTENSION=""
  case "$target_os" in
--     *bsd*|linux*|beos|irix*|solaris*)
-+     *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
+-     *bsd*|linux*|beos|irix*|solaris*|gnu*|*qnx*)
++     *bsd*|linux*|beos|irix*|solaris*|gnu*|*qnx*|dragonfly*)
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: .so .a .o" >&5
  $as_echo ".so .a .o" >&6; }
  	STATIC_EXTENSION="a"
-@@ -4312,7 +4312,7 @@ $as_echo "ok" >&6; }
+@@ -4372,7 +4372,7 @@ $as_echo "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.8 2011/07/19 18:56:46 drochner Exp $
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-@@ -4341,7 +4341,7 @@ $as_echo "dylib options" >&6; }
+@@ -4403,7 +4403,7 @@ $as_echo "dylib options" >&6; }
  $as_echo "module options" >&6; }
   	   PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
  	   SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
@@ -29,16 +29,16 @@ $NetBSD: patch-ab,v 1.8 2011/07/19 18:56:46 drochner Exp $
  	fi
  	;;
       beos)
-@@ -4538,7 +4538,7 @@ $as_echo "$as_me: WARNING: nasm version 
+@@ -4600,7 +4600,7 @@ $as_echo "$as_me: WARNING: nasm version 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm object format" >&5
  $as_echo_n "checking for asm object format... " >&6; }
         case "$target_os" in
--           *bsd*|linux*|beos|irix*|solaris*)
-+           *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
+-           *bsd*|linux*|beos|irix*|solaris*|gnu*|*qnx*)
++           *bsd*|linux*|beos|irix*|solaris*|gnu*|*qnx*|dragonfly*)
                 if test "$ARCHITECTURE" = "X86_64" ; then
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: elf64" >&5
  $as_echo "elf64" >&6; }
-@@ -4577,6 +4577,13 @@ $as_echo "macho32" >&6; }
+@@ -4647,6 +4647,13 @@ $as_echo "macho32" >&6; }
                 PREFIX="-DPREFIX"
                 MARK_FUNCS=""
                 ;;