update to 1.1.7

changes:
-bugfixes
-speed improve,memt
-new ffmpeg compatibility

5 files changed, 60 insertions, 20 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 6742570aa08..7af2b84e6db 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.78 2012/10/08 09:21:13 asau Exp $
+# $NetBSD: Makefile,v 1.79 2012/10/10 13:37:25 drochner Exp $
 
-DISTNAME=	transcode-1.1.5
-PKGREVISION=	15
+DISTNAME=	transcode-1.1.7
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.berlios.de/tcforge/
+#MASTER_SITES=	http://download.berlios.de/tcforge/
+MASTER_SITES=	http://bitbucket.org/france/transcode-tcforge/downloads/
 EXTRACT_SUFX=	.tar.bz2
+FETCH_USING=	curl
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcforge.berlios.de/
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index 5898ae9c811..c8512bb6c8b 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.20 2009/11/15 18:09:35 drochner Exp $
+$NetBSD: distinfo,v 1.21 2012/10/10 13:37:25 drochner Exp $
 
-SHA1 (transcode-1.1.5.tar.bz2) = 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26
-RMD160 (transcode-1.1.5.tar.bz2) = fdc441190110a4ae4a54a4e2abd307db7f0111aa
-Size (transcode-1.1.5.tar.bz2) = 2123207 bytes
-SHA1 (patch-ac) = 0640a062611c87d8666b7983594ab93b068c6580
+SHA1 (transcode-1.1.7.tar.bz2) = e35df68b960eb56ef0a59a4cdbed1491be56aee6
+RMD160 (transcode-1.1.7.tar.bz2) = faa854acbbfd52faaa216505176f94d756d77841
+Size (transcode-1.1.7.tar.bz2) = 2183627 bytes
+SHA1 (patch-ac) = 3a738bc76d427d28a1c03edfcef7dc227537bc3b
 SHA1 (patch-aw) = a2a118bad9e3783f98e8cbfa62cff8771118ac17
+SHA1 (patch-ax) = 4e767e6ab77e49bb375de55457e3956e1531c7bb
+SHA1 (patch-ba) = 92f31ca0d49cee2883d278b443b1d616381fee2d
diff --git a/multimedia/transcode/patches/patch-ac b/multimedia/transcode/patches/patch-ac
index 02651f25a61..ca17812b49b 100644
--- a/multimedia/transcode/patches/patch-ac
+++ b/multimedia/transcode/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2009/07/07 16:38:29 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2012/10/10 13:37:25 drochner Exp $
 
---- configure.orig	2009-03-28 10:13:11.000000000 +0100
+--- configure.orig	2011-11-19 16:50:37.000000000 +0000
 +++ configure
-@@ -4864,7 +4864,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
+@@ -5096,7 +5096,7 @@ case "${target_os}" in
+ $as_echo "#define OS_LINUX 1" >>confdefs.h
  
      ;;
 -  freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*)
 +  freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*)
      is_bsd=yes
  
- cat >>confdefs.h <<\_ACEOF
-@@ -21959,7 +21959,7 @@ case "$host" in
+ $as_echo "#define OS_BSD 1" >>confdefs.h
+@@ -19431,7 +19431,7 @@ case "$host" in
  esac
  # let user override
  if test -n "$PTHREAD_LIBS" ; then
@@ -20,12 +20,12 @@ $NetBSD: patch-ac,v 1.5 2009/07/07 16:38:29 drochner Exp $
  fi
  if test -n "$PTHREAD_CFLAGS" ; then
    pthread_cflags="$PTHREAD_CFLAGS"
-@@ -42108,7 +42108,7 @@ if test "${enable_nuv+set}" = set; then
- echo "$as_me: error: liblzo2 is required for NuppelVideo support, try --enable-lzo" >&2;}
-    { (exit 1); exit 1; }; }
+@@ -29507,7 +29507,7 @@ if test "${enable_nuv+set}" = set; then 
+     yes) if test yes != "$have_lzo"; then
+            as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5
           fi
 -    	 if test true == "$have_x86_64cpu"; then
 +    	 if test true = "$have_x86_64cpu"; then
-            { echo "$as_me:$LINENO: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5
- echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5
+ $as_echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;}
           elif test true != "$have_x86cpu"; then
diff --git a/multimedia/transcode/patches/patch-ax b/multimedia/transcode/patches/patch-ax
new file mode 100644
index 00000000000..bc714bfec4c
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ax
@@ -0,0 +1,22 @@
+$NetBSD: patch-ax,v 1.4 2012/10/10 13:37:25 drochner Exp $
+
+--- avilib/avidump.c.orig	2012-02-01 17:07:24.000000000 +0000
++++ avilib/avidump.c
+@@ -320,7 +320,7 @@ static void dump_vals(int fd, int count,
+ {
+     uint32_t i,j,val32;
+     uint16_t val16;
+-    loff_t val64;
++    uint64_t val64;
+     char val8;
+ 
+     for (i = 0; names[i].type != EoLST; i++) {
+@@ -605,7 +605,7 @@ static boolean ProcessChunk(int fd, off_
+ 
+     case indxtag: {
+ 	uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*);
+-	loff_t offset;
++	uint64_t offset;
+ 	uint32_t size, duration;
+ 	uint32_t u=0;
+ 	off_t indxend = datapos + chunks;
diff --git a/multimedia/transcode/patches/patch-ba b/multimedia/transcode/patches/patch-ba
new file mode 100644
index 00000000000..44d183e8f68
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.4 2012/10/10 13:37:25 drochner Exp $
+
+--- filter/filter_pp.c.orig	2011-11-19 16:50:27.000000000 +0000
++++ filter/filter_pp.c
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+