Update to avidemux 2.5.4

Various bug fixes and support for additional video formats.
Including support for gcc4.5 and for latest x264 library.

22 files changed, 220 insertions, 161 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 138329cbc5b..5e47e58d60b 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2011/01/13 13:38:52 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2011/02/17 09:20:17 markd Exp $
 #
 
-DISTNAME=	avidemux_2.4.4
+DISTNAME=	avidemux_2.5.4
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/
 
@@ -19,20 +18,31 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt pkg-config
 USE_CMAKE=		yes
+CMAKE_ARG_PATH=		..
+CONFIGURE_DIRS=		_build
 
 CMAKE_ARGS+=		-DNO_ARTS=1
-CMAKE_ARGS+=		-DUSE_X264=1
+CMAKE_ARGS+=		-DUSE_SYSTEM_SPIDERMONKEY=1
 
 LIBS+=			${LIBOSSAUDIO}
 
+# make sure __STDC_CONSTANT_MACROS is set before <stdint.h> is
+# pulled in the first time - for UINT64_C()
+CFLAGS+=		-D__STDC_CONSTANT_MACROS
+
 SUBST_CLASSES=		audio
 SUBST_STAGE.audio=	post-patch
-SUBST_FILES.audio=	avidemux/ADM_audiodevice/ADM_deviceoss.cpp
+SUBST_FILES.audio=	plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp
 SUBST_SED.audio=	-e "s|\\/dev\\/dsp|${DEVOSSAUDIO}|g"
 SUBST_MESSAGE.audio=	Fixing hardcoded audio device.
 
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+
 INSTALLATION_DIRS=	share/applications share/icons/hicolor/64x64/apps
 
+pre-configure:
+	${MKDIR} ${WRKSRC}/_build
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/avidemux2.desktop \
 	    ${DESTDIR}${PREFIX}/share/applications/avidemux2.desktop
@@ -59,5 +69,6 @@ post-install:
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/avidemux/PLIST b/multimedia/avidemux/PLIST
index 8109a640c95..937abf0d89e 100644
--- a/multimedia/avidemux/PLIST
+++ b/multimedia/avidemux/PLIST
@@ -1,18 +1,47 @@
-@comment $NetBSD: PLIST,v 1.8 2009/01/27 00:56:41 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/02/17 09:20:17 markd Exp $
 bin/avidemux2_cli
 bin/avidemux2_gtk
+lib/libADM5avcodec.so.52
+lib/libADM5avcore.so.0
+lib/libADM5avformat.so.52
+lib/libADM5avutil.so.50
+lib/libADM5postproc.so.51
+lib/libADM5swscale.so.0
+lib/libADM_UICli.so
+lib/libADM_UIGtk.so
+lib/libADM_core.so
+lib/libADM_coreAudio.so
+lib/libADM_coreImage.so
+lib/libADM_coreUI.so
+lib/libADM_render_cli.so
+lib/libADM_render_gtk.so
+share/ADM_addons/avsfilter/avsload.exe
+share/ADM_addons/avsfilter/pipe_source.dll
+share/ADM_scripts/auto/Apple iPod.js
+share/ADM_scripts/auto/Optical Disc/DVD.js
+share/ADM_scripts/auto/Optical Disc/Super Video CD.js
+share/ADM_scripts/auto/Optical Disc/Video CD.js
+share/ADM_scripts/auto/Sony PlayStation Portable.js
+share/ADM_scripts/video/autoWizard.js
+share/ADM_scripts/video/filter.js
+share/ADM_scripts/video/functions.js
 share/applications/avidemux2.desktop
 share/icons/hicolor/64x64/apps/avidemux.png
+share/locale/bg/LC_MESSAGES/avidemux.mo
 share/locale/ca/LC_MESSAGES/avidemux.mo
 share/locale/cs/LC_MESSAGES/avidemux.mo
 share/locale/de/LC_MESSAGES/avidemux.mo
 share/locale/el/LC_MESSAGES/avidemux.mo
 share/locale/es/LC_MESSAGES/avidemux.mo
 share/locale/fr/LC_MESSAGES/avidemux.mo
+share/locale/hu/LC_MESSAGES/avidemux.mo
 share/locale/it/LC_MESSAGES/avidemux.mo
 share/locale/ja/LC_MESSAGES/avidemux.mo
+share/locale/pl/LC_MESSAGES/avidemux.mo
 share/locale/pt_BR/LC_MESSAGES/avidemux.mo
 share/locale/ru/LC_MESSAGES/avidemux.mo
 share/locale/sr/LC_MESSAGES/avidemux.mo
 share/locale/sr@latin/LC_MESSAGES/avidemux.mo
 share/locale/tr/LC_MESSAGES/avidemux.mo
+share/locale/zh_CN/LC_MESSAGES/avidemux.mo
+share/locale/zh_TW/LC_MESSAGES/avidemux.mo
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index ab0f48b595a..72d0986ec16 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.20 2009/06/07 11:49:25 hasso Exp $
+$NetBSD: distinfo,v 1.21 2011/02/17 09:20:17 markd Exp $
 
-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) = 7d0849c2acdd48a5f02738005b17b2b74456e521
-SHA1 (patch-ac) = 268a7df2ac824ebf6413407a235cfd20707f3958
-SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6
-SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b
-SHA1 (patch-au) = af3179c26a298dd2c14025db891b8a10ac89fd9a
-SHA1 (patch-av) = 68e40fff1eaa735b9ac36556f308ed9a45316911
-SHA1 (patch-aw) = 2f89f7d2beb7863a831bb7ae6e539ecc2cadcb21
+SHA1 (avidemux_2.5.4.tar.gz) = 83d6f6d87442ce4fc4e4806735ec27ef5e90364c
+RMD160 (avidemux_2.5.4.tar.gz) = e20454a558210d5f7ab1418ae4013b618d1001d9
+Size (avidemux_2.5.4.tar.gz) = 18154965 bytes
+SHA1 (patch-CMakeLists.txt) = e86945a4cf51ae9275f94d2545be4ec3ed711b88
+SHA1 (patch-ab) = 2fb71f3eb3d04503ef6b34bb960a891ba3afa64f
+SHA1 (patch-addons_avsfilter_CMakeLists.txt) = f6b08d7e62f26fdb5a2ab32dd6002303b76e4111
+SHA1 (patch-as) = 391b9f173aaa329ec879cc0ac5a9a2a0ad48a924
+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
+SHA1 (patch-avidemux_CMakeLists.txt) = 00b6e92b77af1d575e801a824664921dae067db0
 SHA1 (patch-ax) = 09d676d910dfcccb30b4f73d1a935647492c259a
-SHA1 (patch-ay) = 7bfde827e20a9546d9a533293e6d9519b166bb95
-SHA1 (patch-da) = 162c124bed65bebcc11c77444b249b6c62fb23fd
+SHA1 (patch-cmake_admCheckMiscLibs.cmake) = 2ece918805b2561f2ec47510265aed6352433c42
+SHA1 (patch-cmake_admFFmpegPrepareTar.cmake) = 690039fb2a74f628c905200a5e767da2904f2df3
 SHA1 (patch-db) = f4fd01633de4dc459286158f15d4bc0233b5ca61
+SHA1 (patch-plugins_ADM_audioDevices_Oss_ADM_deviceoss.cpp) = a208e06b9ec8ef11c0a341a9a3bada4ee9380888
+SHA1 (patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp) = 07e0fc94cc5c8e9bdb5a472a4dcf7f0b00ee11e9
diff --git a/multimedia/avidemux/patches/patch-CMakeLists.txt b/multimedia/avidemux/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..201eff7edde
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+ADM_BSD_FAMILY is a superset of APPLE and still not Linux
+
+--- CMakeLists.txt.orig	2010-10-23 16:12:07.000000000 +0000
++++ CMakeLists.txt
+@@ -58,7 +58,7 @@ IF (ADM_CPU_ALTIVEC)

+ 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADM_ALTIVEC_FLAGS}")

+ ENDIF (ADM_CPU_ALTIVEC)

+ 

+-IF (UNIX AND NOT APPLE)

++IF (UNIX AND NOT ADM_BSD_FAMILY)

+ 	# jog shuttle is only available on Linux due to its interface

+ 	SET(USE_JOG 1)

+ ENDIF (UNIX AND NOT APPLE)

diff --git a/multimedia/avidemux/patches/patch-ab b/multimedia/avidemux/patches/patch-ab
index 4c423ca5c48..8cfffac0b40 100644
--- a/multimedia/avidemux/patches/patch-ab
+++ b/multimedia/avidemux/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2009/02/24 16:09:39 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2011/02/17 09:20:17 markd Exp $
 
---- avidemux/ADM_script/ADM_JSFunctions.cpp.orig	2008-07-24 11:49:40.000000000 +0000
+--- avidemux/ADM_script/ADM_JSFunctions.cpp.orig	2010-08-02 19:07:48.000000000 +0000
 +++ avidemux/ADM_script/ADM_JSFunctions.cpp
-@@ -372,7 +372,9 @@ JSBool systemExecute(JSContext *cx, JSOb
+@@ -377,7 +377,9 @@ JSBool systemExecute(JSContext *cx, JSOb
  	// clear file descriptor table of forked process and fork
- #if defined( __linux__) || defined(__macosx__) || defined(__APPLE__)
+ #if defined( __linux__) || defined(__macosx__) || defined(__APPLE__) || defined(__CYGWIN__)
  	pid_t pidRtn = fork();
 -#elif defined(__FreeBSD__) || defined(__OpenBSD__)
 +#elif defined(__NetBSD__)
diff --git a/multimedia/avidemux/patches/patch-ac b/multimedia/avidemux/patches/patch-ac
deleted file mode 100644
index 287de4eb697..00000000000
--- a/multimedia/avidemux/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2009/06/07 11:49:25 hasso Exp $
-
-Fix a build with cmake 2.6.4. The patch is borrowed from Gentoo bugzilla:
-http://bugs.gentoo.org/show_bug.cgi?id=268618
-
---- avidemux/CMakeLists.txt.orig	2008-10-03 14:05:09 +0300
-+++ avidemux/CMakeLists.txt	2009-06-07 13:52:15 +0300
-@@ -84,7 +84,6 @@ ADM_audiocodec 

- ADM_audio

- ADM_script 

- ADM_videoFilter

--ADM_filter

- ADM_video 

- ADM_audiodevice

- ADM_ocr  

-@@ -93,6 +92,24 @@ ADM_colorspace 

- 

- FOREACH(_current ${ADM_SUBDIR})

- 	ADD_SUBDIRECTORY(${_current})

-+ENDFOREACH(_current ${ADM_SUBDIR})

-+

-+SET(ADM_SUBDIR 

-+ADM_filter

-+ADM_audiofilter 

-+ADM_editor

-+ADM_audiocodec 

-+ADM_audio

-+ADM_script 

-+ADM_videoFilter

-+ADM_filter

-+ADM_video 

-+ADM_audiodevice

-+ADM_ocr  

-+ADM_colorspace 

-+)

-+

-+FOREACH(_current ${ADM_SUBDIR})

- 	add_libs_all_targets(${_current})

- ENDFOREACH(_current ${ADM_SUBDIR})

- 

diff --git a/multimedia/avidemux/patches/patch-addons_avsfilter_CMakeLists.txt b/multimedia/avidemux/patches/patch-addons_avsfilter_CMakeLists.txt
new file mode 100644
index 00000000000..fc1924b644b
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-addons_avsfilter_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-addons_avsfilter_CMakeLists.txt,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+Dont assume tar will automatically uncompress
+
+--- addons/avsfilter/CMakeLists.txt.orig	2010-09-09 14:36:36.000000000 +0000
++++ addons/avsfilter/CMakeLists.txt
+@@ -4,6 +4,6 @@ IF (NOT WIN32)
+     set(addonesInstallDir ${CMAKE_INSTALL_PREFIX}/share/ADM_addons/avsfilter)
+     set(tempAvsFilterUnpackDir ${CMAKE_BINARY_DIR}/addons/avsfilter)
+     find_package(Tar)
+-    execute_process(COMMAND ${TAR_EXECUTABLE} xvf ${AVSFILTER_WINE_BINARY_ARCHIVE} -C ${tempAvsFilterUnpackDir})
++    execute_process(COMMAND ${TAR_EXECUTABLE} jxvf ${AVSFILTER_WINE_BINARY_ARCHIVE} -C ${tempAvsFilterUnpackDir})
+     install(FILES ${tempAvsFilterUnpackDir}/avsload.exe ${tempAvsFilterUnpackDir}/pipe_source.dll DESTINATION ${addonesInstallDir})
+ endif (NOT WIN32)
diff --git a/multimedia/avidemux/patches/patch-as b/multimedia/avidemux/patches/patch-as
index 6c1a1c6ad13..574b11b6de2 100644
--- a/multimedia/avidemux/patches/patch-as
+++ b/multimedia/avidemux/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
+$NetBSD: patch-as,v 1.2 2011/02/17 09:20:17 markd Exp $
 
---- avidemux/main.cpp.orig	2008-02-19 09:54:01.000000000 +0100
-+++ avidemux/main.cpp	2008-02-19 09:54:14.000000000 +0100
-@@ -53,7 +53,7 @@
+--- avidemux/main.cpp.orig	2010-09-29 19:43:13.000000000 +0000
++++ avidemux/main.cpp
+@@ -41,7 +41,7 @@ extern "C" {
  
  #ifdef USE_SDL
  extern "C" {
@@ -10,4 +10,4 @@ $NetBSD: patch-as,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
 +	#include <SDL/SDL.h>
  }
  
- #include "ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.h"
+ #include "ADM_userInterfaces/ADM_render/GUI_sdlRender.h"
diff --git a/multimedia/avidemux/patches/patch-at b/multimedia/avidemux/patches/patch-at
deleted file mode 100644
index 6a06db004eb..00000000000
--- a/multimedia/avidemux/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
-
---- avidemux/ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.cpp.orig	2008-02-19 09:52:42.000000000 +0100
-+++ avidemux/ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.cpp	2008-02-19 09:53:06.000000000 +0100
-@@ -34,8 +34,8 @@
- #undef HAVE_STDLIB_H

- #undef HAVE_STRING_H

- #undef HAVE_SYS_TYPES_H

--#include "SDL.h"

--#include "SDL_syswm.h"

-+#include <SDL/SDL.h>

-+#include <SDL/SDL_syswm.h>

- }

- 

- #include "ADM_colorspace/colorspace.h"

diff --git a/multimedia/avidemux/patches/patch-au b/multimedia/avidemux/patches/patch-au
deleted file mode 100644
index 928595a91d6..00000000000
--- a/multimedia/avidemux/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.2 2008/09/18 13:23:03 joerg Exp $
-
---- avidemux/ADM_osSupport/ADM_crashdump.cpp.orig	2008-02-19 09:47:11.000000000 +0100
-+++ avidemux/ADM_osSupport/ADM_crashdump.cpp	2008-02-19 09:48:44.000000000 +0100
-@@ -45,7 +45,7 @@
- extern char *ADM_getBaseDir(void);

- extern void A_parseECMAScript(const char *name);

- 

--#ifdef __APPLE__

-+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)

- void installSigHandler() {}

- 

- void ADM_backTrack(int lineno,const char *file)

diff --git a/multimedia/avidemux/patches/patch-av b/multimedia/avidemux/patches/patch-av
deleted file mode 100644
index 07c431363f5..00000000000
--- a/multimedia/avidemux/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
-
---- avidemux/ADM_osSupport/ADM_cpuCap.cpp.orig	2008-02-19 09:44:35.000000000 +0100
-+++ avidemux/ADM_osSupport/ADM_cpuCap.cpp	2008-02-19 09:46:49.000000000 +0100
-@@ -195,7 +195,7 @@
- {
- #if defined(ADM_WIN32)
-     return pthread_num_processors_np();
--#elif !defined(__APPLE__) && !defined(ADM_BSD_FAMILY)
-+#elif !defined(__APPLE__) && !defined(__NetBSD__) && !defined(ADM_BSD_FAMILY)
-     unsigned int bit;
-     int np;
- 
diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM_core_src_ADM_cpuCap.cpp b/multimedia/avidemux/patches/patch-avidemux_ADM_core_src_ADM_cpuCap.cpp
new file mode 100644
index 00000000000..dfc72eb6089
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM_core_src_ADM_cpuCap.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-avidemux_ADM_core_src_ADM_cpuCap.cpp,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+--- avidemux/ADM_core/src/ADM_cpuCap.cpp.orig	2009-04-02 13:24:10.000000000 +0000
++++ avidemux/ADM_core/src/ADM_cpuCap.cpp
+@@ -15,6 +15,9 @@
+ #include <pthread.h>
+ #elif defined(__APPLE__) || defined(ADM_BSD_FAMILY)
+ #include <sys/types.h>
++#ifdef free
++#undef free
++#endif
+ #include <sys/sysctl.h>
+ #else
+ #include <string.h>
diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM_core_src_ADM_crashdump.cpp b/multimedia/avidemux/patches/patch-avidemux_ADM_core_src_ADM_crashdump.cpp
new file mode 100644
index 00000000000..f9c2ae9f9bc
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM_core_src_ADM_crashdump.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-avidemux_ADM_core_src_ADM_crashdump.cpp,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+--- avidemux/ADM_core/src/ADM_crashdump.cpp.orig	2009-09-25 07:16:58.000000000 +0000
++++ avidemux/ADM_core/src/ADM_crashdump.cpp
+@@ -47,7 +47,7 @@ void ADM_setCrashHook(ADM_saveFunction *
+ extern char *ADM_getBaseDir(void);

+ extern void A_parseECMAScript(const char *name);

+ 

+-#ifdef __APPLE__

++#if defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)

+ void installSigHandler() {}

+ 

+ void ADM_backTrack(const char *info,int lineno,const char *file)

diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp b/multimedia/avidemux/patches/patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp
new file mode 100644
index 00000000000..fcf47531d1e
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+--- ./avidemux/ADM_userInterfaces/ADM_render/GUI_sdlRender.cpp.orig	2010-09-12 19:22:15.000000000 +0000
++++ ./avidemux/ADM_userInterfaces/ADM_render/GUI_sdlRender.cpp
+@@ -29,8 +29,8 @@ extern "C" {

+ #undef HAVE_MALLOC_H

+ #undef HAVE_STDINT_H

+ #undef HAVE_SYS_TYPES_H

+-#include "SDL.h"

+-#include "SDL_syswm.h"

++#include <SDL/SDL.h>

++#include <SDL/SDL_syswm.h>

+ }

+ 

+ #include "ADM_colorspace.h"

diff --git a/multimedia/avidemux/patches/patch-avidemux_CMakeLists.txt b/multimedia/avidemux/patches/patch-avidemux_CMakeLists.txt
new file mode 100644
index 00000000000..a30a9c91a6f
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-avidemux_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-avidemux_CMakeLists.txt,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+"ln -t" not portable - this is slightly more so.
+
+--- avidemux/CMakeLists.txt.orig	2010-09-29 19:01:12.000000000 +0000
++++ avidemux/CMakeLists.txt
+@@ -494,7 +494,7 @@ MACRO (ADM_SYMLINK_LIBS)

+              ADD_CUSTOM_COMMAND(TARGET ${t}

+                       POST_BUILD

+                       COMMAND mkdir -p ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}

+-                      COMMAND find ${CMAKE_BINARY_DIR}/avidemux -name '*.so*' | xargs ln -sft ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}

++                      COMMAND find ${CMAKE_BINARY_DIR}/avidemux -name '*.so*' | xargs -I XXX ln -sf XXX ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}

+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

+                       COMMENT "Creating temporary lib directory for proper plugins linking")

+        ENDFOREACH (t )

diff --git a/multimedia/avidemux/patches/patch-aw b/multimedia/avidemux/patches/patch-aw
deleted file mode 100644
index 64898666ba0..00000000000
--- a/multimedia/avidemux/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
-
---- avidemux/ADM_audiodevice/ADM_deviceSDL.cpp.orig	2008-02-19 09:23:10.000000000 +0100
-+++ avidemux/ADM_audiodevice/ADM_deviceSDL.cpp	2008-02-19 09:23:28.000000000 +0100
-@@ -23,7 +23,7 @@
- #include "fourcc.h" 
-  
- #ifdef USE_SDL
--#include "SDL.h"
-+#include <SDL/SDL.h>
- 
- 
- #include "ADM_toolkit/toolkit.hxx"
diff --git a/multimedia/avidemux/patches/patch-ay b/multimedia/avidemux/patches/patch-ay
deleted file mode 100644
index 10d48054279..00000000000
--- a/multimedia/avidemux/patches/patch-ay
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2008/02/19 09:11:43 xtraeme Exp $
-
---- avidemux/ADM_audiofilter/audiofilter_normalize.cpp.orig	2008-02-18 21:14:29.000000000 +0100
-+++ avidemux/ADM_audiofilter/audiofilter_normalize.cpp	2008-02-18 21:15:32.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <sys/param.h>
- 
- #include <ADM_assert.h>
- 
-@@ -42,7 +43,7 @@
- 
- 
- #ifndef ADM_WIN32
--#ifdef ADM_BSD_FAMILY
-+#ifdef BSD
-                 #define POW10(x) powf(10.0,x)
- #else
-                 #define POW10(x)  pow10f(x)
diff --git a/multimedia/avidemux/patches/patch-cmake_admCheckMiscLibs.cmake b/multimedia/avidemux/patches/patch-cmake_admCheckMiscLibs.cmake
new file mode 100644
index 00000000000..2b63aba38c3
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-cmake_admCheckMiscLibs.cmake
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_admCheckMiscLibs.cmake,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+test for existence of JS_InitStandardClasses was failing but we
+know in pkgsrc context that it is good so dont bother testing
+
+--- cmake/admCheckMiscLibs.cmake.orig	2010-09-19 23:32:24.000000000 +0000
++++ cmake/admCheckMiscLibs.cmake
+@@ -96,7 +96,7 @@ MESSAGE(STATUS "Checking for SpiderMonke
+ MESSAGE(STATUS "*************************")

+ 

+ IF (USE_SYSTEM_SPIDERMONKEY)

+-	FIND_HEADER_AND_LIB(SPIDERMONKEY jsapi.h js JS_InitStandardClasses)

++	FIND_HEADER_AND_LIB(SPIDERMONKEY jsapi.h js)

+ 	PRINT_LIBRARY_INFO("SpiderMonkey" SPIDERMONKEY_FOUND "${SPIDERMONKEY_INCLUDE_DIR}" "${SPIDERMONKEY_LIBRARY_DIR}" FATAL_ERROR)

+ ELSE (USE_SYSTEM_SPIDERMONKEY)

+ 	MESSAGE("Skipping check and using bundled version.")

diff --git a/multimedia/avidemux/patches/patch-cmake_admFFmpegPrepareTar.cmake b/multimedia/avidemux/patches/patch-cmake_admFFmpegPrepareTar.cmake
new file mode 100644
index 00000000000..bb4dd046cd9
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-cmake_admFFmpegPrepareTar.cmake
@@ -0,0 +1,31 @@
+$NetBSD: patch-cmake_admFFmpegPrepareTar.cmake,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+Dont assume tar will automatically uncompress
+
+--- cmake/admFFmpegPrepareTar.cmake.orig	2011-02-08 11:17:55.000000000 +0000
++++ cmake/admFFmpegPrepareTar.cmake
+@@ -9,7 +9,7 @@ if (EXISTS "${LIBRARY_SOURCE_DIR}/${FFMP
+ 	if (NOT EXISTS "${FFMPEG_SOURCE_DIR}/ffmpeg.c" OR NOT ${LAST_FFMPEG_VERSION} EQUAL ${FFMPEG_VERSION})

+ 		find_package(Tar)

+ 

+-		execute_process(COMMAND ${TAR_EXECUTABLE} xvf ${FFMPEG_SOURCE_ARCHIVE}

++		execute_process(COMMAND ${TAR_EXECUTABLE} zxvf ${FFMPEG_SOURCE_ARCHIVE}

+ 					WORKING_DIRECTORY "${LIBRARY_SOURCE_DIR}"

+ 					${ffmpegExtractOutput})

+ 

+@@ -20,7 +20,7 @@ if (EXISTS "${LIBRARY_SOURCE_DIR}/${FFMP
+ 	if (NOT EXISTS "${FFMPEG_SOURCE_DIR}/libswscale/swscale.c" OR NOT ${LAST_SWSCALE_VERSION} EQUAL ${SWSCALE_VERSION})

+ 		find_package(Tar)

+ 

+-		execute_process(COMMAND ${TAR_EXECUTABLE} xvf ../${SWSCALE_SOURCE_ARCHIVE}

++		execute_process(COMMAND ${TAR_EXECUTABLE} zxvf ../${SWSCALE_SOURCE_ARCHIVE}

+ 					WORKING_DIRECTORY "${FFMPEG_SOURCE_DIR}"

+ 					${ffmpegExtractOutput})

+ 

+@@ -31,4 +31,4 @@ if (EXISTS "${LIBRARY_SOURCE_DIR}/${FFMP
+ 	set(FFMPEG_PREPARED 1)

+ 	set(LAST_FFMPEG_VERSION "${FFMPEG_VERSION}" CACHE STRING "" FORCE)

+ 	set(LAST_SWSCALE_VERSION "${SWSCALE_VERSION}" CACHE STRING "" FORCE)

+-endif (EXISTS "${LIBRARY_SOURCE_DIR}/${FFMPEG_SOURCE_ARCHIVE}" AND EXISTS "${LIBRARY_SOURCE_DIR}/${SWSCALE_SOURCE_ARCHIVE}")
+\ No newline at end of file
++endif (EXISTS "${LIBRARY_SOURCE_DIR}/${FFMPEG_SOURCE_ARCHIVE}" AND EXISTS "${LIBRARY_SOURCE_DIR}/${SWSCALE_SOURCE_ARCHIVE}")
diff --git a/multimedia/avidemux/patches/patch-da b/multimedia/avidemux/patches/patch-da
deleted file mode 100644
index cd962d77e46..00000000000
--- a/multimedia/avidemux/patches/patch-da
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-da,v 1.1 2008/09/18 13:23:03 joerg Exp $
-
---- ConfigureChecks.cmake.orig	2008-09-18 13:18:17 +0300
-+++ ConfigureChecks.cmake	2008-09-18 13:18:51 +0300
-@@ -122,6 +122,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- 	SET(ADM_BSD_FAMILY 1)
- ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- 
-+IF(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
-+	SET(ADM_BSD_FAMILY 1)
-+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
- 
- 
- ########################################
diff --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-plugins_ADM_audioDevices_Oss_ADM_deviceoss.cpp
index 03989969125..7cfe89920dd 100644
--- a/multimedia/avidemux/patches/patch-aa
+++ b/multimedia/avidemux/patches/patch-plugins_ADM_audioDevices_Oss_ADM_deviceoss.cpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2008/09/18 13:23:03 joerg Exp $
+$NetBSD: patch-plugins_ADM_audioDevices_Oss_ADM_deviceoss.cpp,v 1.1 2011/02/17 09:20:17 markd Exp $
 
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig	2007-09-25 22:01:54 +0300
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp	2008-09-18 14:08:20 +0300
+--- plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp.orig	2007-09-25 22:01:54 +0300
++++ plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp	2008-09-18 14:08:20 +0300
 @@ -26,9 +26,10 @@
  #include <fcntl.h>
  #include <sys/ioctl.h>
diff --git a/multimedia/avidemux/patches/patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp b/multimedia/avidemux/patches/patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp
new file mode 100644
index 00000000000..a7b413a464a
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp,v 1.1 2011/02/17 09:20:17 markd Exp $
+
+--- plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp.orig	2008-07-03 19:29:34.000000000 +0000
++++ plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp
+@@ -12,7 +12,7 @@
+ 
+ 
+ #include "ADM_default.h"
+-#include "SDL.h"
++#include <SDL/SDL.h>
+ 
+ #include  "ADM_audiodevice.h"
+ #include  "ADM_audioDeviceInternal.h"