Update to 2.3.0:

The list of fixed bugs:

* Fixed make install for po directory
* Fixed Ffv1rec
* Fix for multiple gthread_init call (aakef)
* Better audio dithering (Mihail+Josh Green)
* Support for DV in .mov/.mp4
* Resample crash fix when upsampling (a nasty one).
* PCM in .mov/.mp4 sample size fix
* Fix for MP4/MOV files containing .url field
* Added smartcopy from cli or from javascript
* Fix encoding x264 with use bframe as reference + output to mp4

5 files changed, 24 insertions, 40 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 29245186d36..d0f425217d4 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2006/07/22 04:46:17 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2006/12/03 10:33:02 xtraeme Exp $
 #
 
-DISTNAME=	avidemux-2.1.2
-PKGREVISION=	1
+DISTNAME=	avidemux_2.3.0
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/
 
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index 91a7fd8ef43..e90626d475d 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/10/23 15:01:26 tron Exp $
+$NetBSD: distinfo,v 1.9 2006/12/03 10:33:02 xtraeme Exp $
 
-SHA1 (avidemux-2.1.2.tar.gz) = e5b475103f2d19543a0e9d72245252143dc77dd7
-RMD160 (avidemux-2.1.2.tar.gz) = beb2f9603fb03a8781387be9fd9547e90ebb1a94
-Size (avidemux-2.1.2.tar.gz) = 3830241 bytes
-SHA1 (patch-aa) = 7d8a6c9318fb68db6456515ddddbf4be5788a694
-SHA1 (patch-ab) = b3412bde623c66826855b46a2da17cd5ca6c74f4
-SHA1 (patch-ac) = 275ffd524e25fd9f3d3f27b503eb092857a6045a
+SHA1 (avidemux_2.3.0.tar.gz) = 40a51db22593d910224dac91b512489a6af499fb
+RMD160 (avidemux_2.3.0.tar.gz) = 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e
+Size (avidemux_2.3.0.tar.gz) = 4750919 bytes
+SHA1 (patch-aa) = a320cdadfeb563af3ced0f1adc15da9b2d22c262
+SHA1 (patch-ab) = 744c90178da28af2e214d57211b4d631a06d8b2e
diff --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-aa
index ea277d98c81..2ff358fef49 100644
--- a/multimedia/avidemux/patches/patch-aa
+++ b/multimedia/avidemux/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2006/01/27 20:28:56 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2006/12/03 10:33:03 xtraeme Exp $
 
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig	2006-01-27 21:17:12.000000000 +0100
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp	2006-01-27 21:17:39.000000000 +0100
+--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig	2006-12-03 11:13:13.000000000 +0100
++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp	2006-12-03 11:13:48.000000000 +0100
 @@ -28,7 +28,8 @@
  
  #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__)
diff --git a/multimedia/avidemux/patches/patch-ab b/multimedia/avidemux/patches/patch-ab
index 83cdb285a96..9955190d918 100644
--- a/multimedia/avidemux/patches/patch-ab
+++ b/multimedia/avidemux/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2006/03/13 17:30:31 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2006/12/03 10:33:03 xtraeme Exp $
 
---- configure.orig	2006-03-13 15:51:48.000000000 +0000
-+++ configure
-@@ -17142,7 +17142,7 @@ have_darwin=no
- have_amd64=no
- have_ppc=no
- have_x264=yes
--LDFLAGS="$LDFLAGS -lpthread "
-+LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "
- 
- 
- for ac_header in malloc.h
+--- avidemux/ADM_script/ADM_JSFunctions.cpp.orig	2006-12-03 11:19:32.000000000 +0100
++++ avidemux/ADM_script/ADM_JSFunctions.cpp	2006-12-03 11:20:16.000000000 +0100
+@@ -325,6 +325,8 @@
+ 	// clear file descriptor table of forked process and fork
+ #if defined( __linux__) || defined(__maxosx__)
+ 	pid_t pidRtn = fork();
++#elif __NetBSD__
++	pid_t pidRtn = vfork();
+ #elif __FreeBSD__
+ 	pid_t pidRtn = rfork(RFPROC|RFCFDG);
+ #endif
diff --git a/multimedia/avidemux/patches/patch-ac b/multimedia/avidemux/patches/patch-ac
deleted file mode 100644
index bb8df73756d..00000000000
--- a/multimedia/avidemux/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/23 15:01:26 tron Exp $
-
---- avidemux/ADM_lavutil/common.h.orig	2005-12-31 14:36:45.000000000 +0000
-+++ avidemux/ADM_lavutil/common.h	2006-10-23 15:39:26.000000000 +0100
-@@ -65,6 +65,10 @@
- #    define restrict
- #endif
- 
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <math.h>
-+#endif
-+
- #ifndef always_inline
- #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
- #    define always_inline __attribute__((always_inline)) inline