Update to 2.4.4:

Improved Win32 Unicode handling. Improved h264 support in TS/TS2/MP4
files. Improved image handling (BMP, JPEG, etc.). The Qt4 GUI has
been greatly improved. Translations have been updated.

7 files changed, 12 insertions, 163 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index f57c5a8b33c..edefe3330da 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2009/01/29 16:56:52 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/02/24 16:09:39 wiz Exp $
 #
 
-DISTNAME=	avidemux_2.4.3
+DISTNAME=	avidemux_2.4.4
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/
 
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index c9a7b26fea4..2d12bcadc61 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.18 2009/01/04 21:37:54 wiz Exp $
+$NetBSD: distinfo,v 1.19 2009/02/24 16:09:39 wiz Exp $
 
-SHA1 (avidemux_2.4.3.tar.gz) = d3a4dc2c07884916c45f750229d02fbdeb3cedde
-RMD160 (avidemux_2.4.3.tar.gz) = 3d9d098d97462027ac1a62fe9438451b1915367b
-Size (avidemux_2.4.3.tar.gz) = 6707930 bytes
+SHA1 (avidemux_2.4.4.tar.gz) = c50a00caf13a8ea1053e5994edeb59354192e18e
+RMD160 (avidemux_2.4.4.tar.gz) = 8bb2705b3e2d5379d833ec4fa06a01b897c06e04
+Size (avidemux_2.4.4.tar.gz) = 6894690 bytes
 SHA1 (patch-aa) = f29870ecca511e28ef3bb873026f0bf2421ebc5e
-SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303
-SHA1 (patch-ac) = 1a55886c5b0682d3d01abd3a40a87ff92b493178
-SHA1 (patch-ad) = 703545a72d605622e0e0ad08fac3832298416d39
-SHA1 (patch-ae) = 66e35ffbfa9d3e3f9cdb2fce7658ff2afd573bb6
-SHA1 (patch-af) = 31d17b44f869324e0ad7167671a185510abe7f09
+SHA1 (patch-ab) = 7d0849c2acdd48a5f02738005b17b2b74456e521
 SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6
 SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b
 SHA1 (patch-au) = af3179c26a298dd2c14025db891b8a10ac89fd9a
diff --git a/multimedia/avidemux/patches/patch-ab b/multimedia/avidemux/patches/patch-ab
index 8948f54f602..4c423ca5c48 100644
--- a/multimedia/avidemux/patches/patch-ab
+++ b/multimedia/avidemux/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2008/02/19 09:11:43 xtraeme Exp $
+$NetBSD: patch-ab,v 1.7 2009/02/24 16:09:39 wiz Exp $
 
---- avidemux/ADM_script/ADM_JSFunctions.cpp.orig	2008-02-18 21:17:52.000000000 +0100
-+++ avidemux/ADM_script/ADM_JSFunctions.cpp	2008-02-18 21:18:36.000000000 +0100
-@@ -375,7 +375,9 @@
+--- avidemux/ADM_script/ADM_JSFunctions.cpp.orig	2008-07-24 11:49:40.000000000 +0000
++++ avidemux/ADM_script/ADM_JSFunctions.cpp
+@@ -372,7 +372,9 @@ JSBool systemExecute(JSContext *cx, JSOb
  	// clear file descriptor table of forked process and fork
  #if defined( __linux__) || defined(__macosx__) || defined(__APPLE__)
  	pid_t pidRtn = fork();
@@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.6 2008/02/19 09:11:43 xtraeme Exp $
 +#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
  	pid_t pidRtn = rfork(RFPROC|RFCFDG);
  #endif
- 	if(pidRtn == 0)
+ 
diff --git a/multimedia/avidemux/patches/patch-ac b/multimedia/avidemux/patches/patch-ac
deleted file mode 100644
index 3396a229870..00000000000
--- a/multimedia/avidemux/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/01/04 21:37:54 wiz Exp $
-
-Support for newer x264 snapshots. From upstream SVN.
-
---- avidemux/ADM_codecs/ADM_x264.cpp.orig	2008-07-21 19:24:20.000000000 +0200
-+++ avidemux/ADM_codecs/ADM_x264.cpp
-@@ -109,8 +109,14 @@ uint8_t X264Encoder::preamble (uint32_t 
-   MKPARAM(i_bframe,MaxBFrame);
-   MKPARAM(i_bframe_bias,Bias);
-   MKPARAM( b_bframe_pyramid,BasReference );
-+#if X264_BUILD < 65
-   MKPARAM(analyse. b_bidir_me,BidirME );
-+#endif
-+#if X264_BUILD >= 63
-+  MKPARAM( i_bframe_adaptive, Adaptative);
-+#else
-   MKPARAM( b_bframe_adaptive, Adaptative);
-+#endif
-   MKPARAM( analyse.b_weighted_bipred, Weighted);
-   MKPARAM( b_cabac , CABAC);
-   MKPARAM( analyse.i_trellis, Trellis);
-@@ -118,12 +124,16 @@ uint8_t X264Encoder::preamble (uint32_t 
- #define MIN_RDO 6
-   if(zparam->PartitionDecision+1>=MIN_RDO)
-   {
-+#if X264_BUILD >= 65
-+	  param.analyse.i_subpel_refine = zparam->PartitionDecision + 1;
-+#else
-       int rank,parity;
-       rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
-       parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
-       
-       param.analyse.i_subpel_refine=rank;
-       param.analyse.b_bframe_rdo=parity;
-+#endif
-   }
-   MKPARAM(analyse.b_chroma_me,ChromaME);
-   MKPARAM(b_deblocking_filter,DeblockingFilter);
diff --git a/multimedia/avidemux/patches/patch-ad b/multimedia/avidemux/patches/patch-ad
deleted file mode 100644
index cfd8e75fe2b..00000000000
--- a/multimedia/avidemux/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/01/04 21:37:54 wiz Exp $
-
-Support for newer x264 snapshots. From upstream SVN.
-
---- avidemux/ADM_encoder/ADM_encCodecDesc.h.orig	2008-07-20 09:17:43.000000000 +0200
-+++ avidemux/ADM_encoder/ADM_encCodecDesc.h
-@@ -742,7 +742,7 @@ NULL,//     char      *logfile;
- 1,//     uint32_t Weighted;
- 1,//     uint32_t DirectMode;
- //     //
--4,//     uint32_t PartitionDecision;
-+5,//     uint32_t PartitionDecision;
- 16, //Range
- 1,//     uint32_t Method;
- 1,//     uint32_t AR_Num;
diff --git a/multimedia/avidemux/patches/patch-ae b/multimedia/avidemux/patches/patch-ae
deleted file mode 100644
index 5b512ac7a59..00000000000
--- a/multimedia/avidemux/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2009/01/04 21:37:54 wiz Exp $
-
-Support for newer x264 snapshots. From upstream SVN.
-
---- avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_x264.cpp.orig	2008-06-18 21:35:02.000000000 +0200
-+++ avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_x264.cpp
-@@ -109,6 +109,30 @@ uint8_t DIA_x264(COMPRES_PARAMS *config)
- 											GTK_RESPONSE_CANCEL,
- 											-1);
- 
-+#if X264_BUILD >= 65
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("1 - QPel SAD (Fastest)"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("2 - QPel SATD"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("3 - HPel on MB then QPel"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("4 - Always QPel"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("5 - QPel + Bidirectional ME"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("6 - RD on I/P frames (Default)"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("7 - RD on all frames"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("8 - RD refinement on I/P frames"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("9 - RD refinement on all frames"));
-+
-+		gtk_widget_hide(WID(checkbuttonBidirME));
-+#else
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("1  - Extremely Low (Fastest)"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("2  - Very Low"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("3  - Low"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("4  - Medium"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("5  - High"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("6  - High (Default)"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("6B - Very High (RDO on B-frames)"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("7  - Ultra High"));
-+		gtk_combo_box_append_text (GTK_COMBO_BOX(WID(comboboxPartitionDecision)), QT_TR_NOOP("7B - Ultra High (RDO on B-frames)"));
-+#endif
-+
-         gtk_register_dialog(dialog);
-         gtk_dialog_add_action_widget (GTK_DIALOG (dialog), WID(buttonResetDaults),ACTION_LOAD_DEFAULT);
- 
-@@ -721,15 +745,6 @@ create_dialog1 (void)
-   gtk_table_attach (GTK_TABLE (table7), comboboxPartitionDecision, 1, 3, 0, 1,
-                     (GtkAttachOptions) (GTK_FILL),
-                     (GtkAttachOptions) (GTK_FILL), 0, 0);
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("1  - Extremely Low (Fastest)"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("2  - Very Low"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("3  - Low"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("4  - Medium"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("5  - High (Default)"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("6  - Very High"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("6B - Very High (RDO on B-frames)"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("7  - Ultra High"));
--  gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxPartitionDecision), QT_TR_NOOP("7B - Ultra High (RDO on B-frames)"));
- 
-   comboboxMethod = gtk_combo_box_new_text ();
-   gtk_widget_show (comboboxMethod);
diff --git a/multimedia/avidemux/patches/patch-af b/multimedia/avidemux/patches/patch-af
deleted file mode 100644
index 5020b8fc616..00000000000
--- a/multimedia/avidemux/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.4 2009/01/04 21:37:54 wiz Exp $
-
-Support for newer x264 snapshots. From upstream SVN.
-
---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_x264.cpp.orig	2008-06-17 12:52:12.000000000 +0200
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_x264.cpp
-@@ -53,18 +53,29 @@ int code;
-            

-         /* Tab 2 Motion */

- 

--

-+#if X264_BUILD >= 65

-+          diaMenuEntry partitionM[] = {

-+                 {0,    QT_TR_NOOP("1 - QPel SAD (Fastest)")}

-+                ,{1,    QT_TR_NOOP("2 - QPel SATD")}

-+                ,{2,    QT_TR_NOOP("3 - HPel on MB then QPel")}

-+                ,{3,    QT_TR_NOOP("4 - Always QPel")}

-+                ,{4,    QT_TR_NOOP("5 - QPel + Bidirectional ME")}

-+                ,{5,    QT_TR_NOOP("6 - RD on I/P frames (Default)")}

-+                ,{6,    QT_TR_NOOP("7 - RD on all frames")}

-+                ,{7,    QT_TR_NOOP("8 - RD refinement on I/P frames")}

-+                               ,{8,    QT_TR_NOOP("9 - RD refinement on all frames")}};

-+#else
-          diaMenuEntry partitionM[] = {

-                   {0,   QT_TR_NOOP("1  - Extremely Low (Fastest)")}

-                 ,{1,    QT_TR_NOOP("2  - Very Low")}

-                 ,{2,    QT_TR_NOOP("3  - Low")}

-                 ,{3,    QT_TR_NOOP("4  - Medium")}

--                ,{4,    QT_TR_NOOP("5  - High (Default)")}

--                ,{5,    QT_TR_NOOP("6  - Very High")}

-+                ,{4,    QT_TR_NOOP("5  - High")}

-+                ,{5,    QT_TR_NOOP("6  - High (Default)")}

-                 ,{6,    QT_TR_NOOP("6B - Very High (RDO on Bframes)")}

-                 ,{7,    QT_TR_NOOP("7  - Ultra High")}

-                 ,{8,    QT_TR_NOOP("7B - Ultra High (RDO on Bframes)")}};

--

-+#endif

-                             

-         diaElemMenu parition(PX(PartitionDecision),QT_TR_NOOP("Partition Decision"),10,partitionM);

-