Always return value in non-void functions. Default arguments in typedefs

are invalid. Be explicit about argument sizes of assembler ops.

9 files changed, 160 insertions, 3 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index dd632da88cb..0296d0d133e 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2012/06/14 07:45:26 sbd Exp $
+# $NetBSD: Makefile,v 1.74 2012/07/03 17:38:31 joerg Exp $
 #
 
 DISTNAME=	avidemux_2.5.4
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/
 
@@ -47,6 +47,11 @@ INSTALLATION_DIRS=	share/applications share/icons/hicolor/64x64/apps
 pre-configure:
 	${MKDIR} ${WRKSRC}/_build
 
+post-configure:
+	for manual in ${PATCHDIR}/manual-*; do \
+		cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < $${manual}; \
+	done
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/avidemux2.desktop \
 	    ${DESTDIR}${PREFIX}/share/applications/avidemux2.desktop
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index 72d0986ec16..3d696b43383 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2011/02/17 09:20:17 markd Exp $
+$NetBSD: distinfo,v 1.22 2012/07/03 17:38:31 joerg Exp $
 
 SHA1 (avidemux_2.5.4.tar.gz) = 83d6f6d87442ce4fc4e4806735ec27ef5e90364c
 RMD160 (avidemux_2.5.4.tar.gz) = e20454a558210d5f7ab1418ae4013b618d1001d9
@@ -7,6 +7,11 @@ SHA1 (patch-CMakeLists.txt) = e86945a4cf51ae9275f94d2545be4ec3ed711b88
 SHA1 (patch-ab) = 2fb71f3eb3d04503ef6b34bb960a891ba3afa64f
 SHA1 (patch-addons_avsfilter_CMakeLists.txt) = f6b08d7e62f26fdb5a2ab32dd6002303b76e4111
 SHA1 (patch-as) = 391b9f173aaa329ec879cc0ac5a9a2a0ad48a924
+SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp) = 54a6bb29553c0c039617e57aef39d9d32e25683a
+SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp) = 91c6741ad967e65a91f7f2e439453d44894e37df
+SHA1 (patch-avidemux_ADM__coreUI_include_DIA__factory.h) = 1aa53bdb0519122e63ac8fbcb76ca389cc97d6ba
+SHA1 (patch-avidemux_ADM__core_include_ADM__mangle.h) = 54d580839fb5c1007379692e5e33979f72eedcbf
+SHA1 (patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c) = d9fb28f3db0978cff3e90746aa9efcef0084daa3
 SHA1 (patch-avidemux_ADM_core_src_ADM_cpuCap.cpp) = c344cf9707c2e8dc9f03b6379f749997bf01b22b
 SHA1 (patch-avidemux_ADM_core_src_ADM_crashdump.cpp) = cdbd0419a100601b0c8f125228b2e3bf1c42fd14
 SHA1 (patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp) = 334fb6c2195b0e9e294ea461aa88ab9bd4828c53
diff --git a/multimedia/avidemux/patches/manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_dsputil__mmx.c b/multimedia/avidemux/patches/manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_dsputil__mmx.c
new file mode 100644
index 00000000000..89532efa5a1
--- /dev/null
+++ b/multimedia/avidemux/patches/manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_dsputil__mmx.c
@@ -0,0 +1,13 @@
+$NetBSD: manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_dsputil__mmx.c,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_libraries/ffmpeg/libavcodec/x86/dsputil_mmx.c.orig	2012-07-03 11:38:24.000000000 +0000
++++ avidemux/ADM_libraries/ffmpeg/libavcodec/x86/dsputil_mmx.c
+@@ -611,7 +611,7 @@ static void add_hfyu_median_prediction_c
+     __asm__ volatile(
+         "mov    %7, %3 \n"
+         "1: \n"
+-        "movzx (%3,%4), %2 \n"
++        "movzbl (%3,%4), %2 \n"
+         "mov    %2, %k3 \n"
+         "sub   %b1, %b3 \n"
+         "add   %b0, %b3 \n"
diff --git a/multimedia/avidemux/patches/manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_snowdsp__mmx.c b/multimedia/avidemux/patches/manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_snowdsp__mmx.c
new file mode 100644
index 00000000000..1af25213a79
--- /dev/null
+++ b/multimedia/avidemux/patches/manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_snowdsp__mmx.c
@@ -0,0 +1,13 @@
+$NetBSD: manual-patch-avidemux_ADM__libraries_ffmpeg_libavcodec_x86_snowdsp__mmx.c,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_libraries/ffmpeg/libavcodec/x86/snowdsp_mmx.c.orig	2012-07-03 11:38:30.000000000 +0000
++++ avidemux/ADM_libraries/ffmpeg/libavcodec/x86/snowdsp_mmx.c
+@@ -812,7 +812,7 @@ snow_inner_add_yblock_sse2_end_16
+              "add %%"REG_c", "PTR_SIZE"*2(%%"REG_a");\n\t"\
+              "add %%"REG_c", "PTR_SIZE"*1(%%"REG_a");\n\t"\
+              "add %%"REG_c", (%%"REG_a")     \n\t"\
+-             "add $"PTR_SIZE"*1, %1          \n\t"\
++             "addl $"PTR_SIZE"*1, %1          \n\t"\
+              "add %%"REG_c", %0              \n\t"\
+              "dec %2                         \n\t"\
+              "jnz 1b                         \n\t"\
diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp b/multimedia/avidemux/patches/patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp
new file mode 100644
index 00000000000..72db2509292
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp.orig	2012-07-03 11:35:12.000000000 +0000
++++ avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
+@@ -141,8 +141,8 @@ void myDeintASM(void)
+                             "add 	$4,	"REG_ax"\n\t"
+                             "add 	$4,	"REG_bx"\n\t"
+                             "add 	$4,	"REG_cx"\n\t"
+-                            "add 	$4,	"Mangle(_l_e)"\n\t"
+-                            "add 	$4,	"Mangle(_l_e2)"\n\t"
++                            "addl 	$4,	"Mangle(_l_e)"\n\t"
++                            "addl 	$4,	"Mangle(_l_e2)"\n\t"
+                             "sub 	$1,	"REG_si"\n\t"
+                             "jnz 7b\n\t"
+                             "pop "REG_bx"\n\t" // Dont clobber ebx for macOsX
diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp b/multimedia/avidemux/patches/patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp
new file mode 100644
index 00000000000..815a06aeefe
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_coreImage/src/ADM_vidFieldBlend.cpp.orig	2012-07-03 11:36:10.000000000 +0000
++++ avidemux/ADM_coreImage/src/ADM_vidFieldBlend.cpp
+@@ -163,7 +163,7 @@ void myBlendASM(void)
+ "add       $4,"REG_di" \n\t"
+ "sub       $1,"REG_dx"	\n\t"
+ "jne        DHLineB%= \n\t"   // next
+-"sub       $1,"Mangle(_l_h)"  \n\t" // next line
++"subl       $1,"Mangle(_l_h)"  \n\t" // next line
+ "jne        DHCOLB%= \n\t"
+ "pop 				"REG_ax"\n\t"
+ "pop 				"REG_si"\n\t"
diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM__coreUI_include_DIA__factory.h b/multimedia/avidemux/patches/patch-avidemux_ADM__coreUI_include_DIA__factory.h
new file mode 100644
index 00000000000..a75609fff97
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__coreUI_include_DIA__factory.h
@@ -0,0 +1,40 @@
+$NetBSD: patch-avidemux_ADM__coreUI_include_DIA__factory.h,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_coreUI/include/DIA_factory.h.orig	2012-07-03 11:24:33.000000000 +0000
++++ avidemux/ADM_coreUI/include/DIA_factory.h
+@@ -206,7 +206,7 @@ public:

+ };

+ /*********************************************/

+ typedef diaElem *CREATE_TOGGLE_UINT(uint32_t *toggleValue,const char *toggleTitle, uint32_t *uintval, 

+-								const char *name,uint32_t min,uint32_t max,const char *tip=NULL);

++								const char *name,uint32_t min,uint32_t max,const char *tip);

+ class diaElemToggleUint : public diaElem

+ {

+   protected:

+@@ -226,7 +226,7 @@ public:

+   int getRequiredLayout(void);

+ };

+ typedef diaElem *CREATE_TOGGLE_INT(uint32_t *toggleValue,const char *toggleTitle, int32_t *intval, 

+-									const char *name,int32_t min,int32_t max,const char *tip=NULL);

++									const char *name,int32_t min,int32_t max,const char *tip);

+ class diaElemToggleInt : public diaElem

+ {

+   protected:

+@@ -620,7 +620,7 @@ public:

+   void updateMe(void);

+ };

+ /**********************************************/

+-typedef diaElem *(CREATE_THREADCOUNT_T)(uint32_t *value, const char *title, const char *tip = NULL);

++typedef diaElem *(CREATE_THREADCOUNT_T)(uint32_t *value, const char *title, const char *tip);

+ class diaElemThreadCount : public diaElem

+ {

+ 

+@@ -634,7 +634,7 @@ public:

+   void updateMe(void);

+ };

+ /**********************************************/

+-typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip = NULL);

++typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip);

+ class diaElemAspectRatio : public diaElem

+ {

+ public:

diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__mangle.h b/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__mangle.h
new file mode 100644
index 00000000000..942d22a69b0
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__mangle.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-avidemux_ADM__core_include_ADM__mangle.h,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_core/include/ADM_mangle.h.orig	2012-07-03 11:47:37.000000000 +0000
++++ avidemux/ADM_core/include/ADM_mangle.h
+@@ -31,12 +31,12 @@
+ #else
+ #    if defined(ADM_CPU_X86_64) && defined(PIC)
+ #        define MANGLE(a) #a"(%%rip)"
+-#        define FUNNY_MANGLE(x) x asm(#x)
+-#        define FUNNY_MANGLE_ARRAY(x, y)  x[y] asm(#x)
++#        define FUNNY_MANGLE(x) x asm(#x) __attribute__((__used__))
++#        define FUNNY_MANGLE_ARRAY(x, y)  x[y] asm(#x) __attribute__((__used__))
+ #    else
+ #        define MANGLE(a) #a
+-#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
+-#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
++#        define FUNNY_MANGLE(x) x asm(MANGLE(x)) __attribute__((__used__))
++#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x)) __attribute__((__used__))
+ #    endif
+ #endif
+ 
diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c b/multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c
new file mode 100644
index 00000000000..31ea22689d7
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c,v 1.1 2012/07/03 17:38:31 joerg Exp $
+
+--- avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/jogshuttle.c.orig	2012-07-03 12:04:00.000000000 +0000
++++ avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/jogshuttle.c
+@@ -110,7 +110,7 @@ jog_shuttle_button_release (GtkWidget *w
+ 	
+ 	widget = GTK_WIDGET (wheel);
+ 	
+-	if (!widget->window) return;
++	if (!widget->window) return FALSE;
+ 
+ 	region = gdk_drawable_get_clip_region (widget->window);
+ 	gdk_window_invalidate_region (widget->window, region, TRUE);
+@@ -144,15 +144,16 @@ jog_shuttle_motion_notify (GtkWidget *wh
+ 	priv->offset = event->x - priv->start;
+ 	priv->start = event->x;
+ 
+-	if (!widget->window) return;
++	if (!widget->window) return FALSE;
+ 	
+-	if ((priv->offset+priv->pos[3]) > width || (priv->offset+priv->pos[3]) < 0) return;
++	if ((priv->offset+priv->pos[3]) > width || (priv->offset+priv->pos[3]) < 0) return FALSE;
+ 	
+ 	region = gdk_drawable_get_clip_region (widget->window);
+ 	gdk_window_invalidate_region (widget->window, region, TRUE);
+ 	gdk_window_process_updates (widget->window, TRUE);
+ 
+ 	gdk_region_destroy (region);
++	return TRUE;
+ }
+ 
+ static void