From 1f4d970edef9704cd13e6fcda43d2133d2c7be6d Mon Sep 17 00:00:00 2001 From: xtraeme Date: Tue, 19 Feb 2008 09:11:43 +0000 Subject: Update to 2.4.1. A short changelog compared to 2.3: * Input and output support for MKV and FLV containers * Rewritten MP4/MOV/3GP reader * Support for Nellymoser codec * New DV video output support * New MPEG-TS support including H.264 Elementary Stream * OCR support for MPEG-TS subtitles * New video bitstream unpacker (improved compatibility) * Capability to pack video bitstreams * New Yadif filter (ported from Avisynth) * Video filters can be loaded as external plug-ins (sample plug-in included) * Three interfaces now offered: command line, GTK+ and Qt4 (Qt4 is still incomplete) * Several key dialogs have been revamped (GTK+ user interface only) * Preview system refactored * Priority control added for encoding and video playback (Win32 only) * New Jog Shuttle control (GTK+ user interface only) * Support for Jog Shuttle hardware (Linux & GTK+ only) * New iPod and PlayStation Portable profiles * New Glyph Editor * Improved Bitrate Histogram * JACK support (Linux only) * DirectX support (Win32 only) * New Avisynth Proxy GUI (Win32 only) * Improved crash recovery - session settings are saved and reloaded upon application start * Numerous bugs fixed ...and more, see the changelog for more info. --- multimedia/avidemux/Makefile | 60 ++++---------------------- multimedia/avidemux/PLIST | 17 +++++++- multimedia/avidemux/distinfo | 23 +++++----- multimedia/avidemux/patches/patch-aa | 21 ++++----- multimedia/avidemux/patches/patch-ab | 14 +++--- multimedia/avidemux/patches/patch-ac | 42 ------------------ multimedia/avidemux/patches/patch-ad | 22 ---------- multimedia/avidemux/patches/patch-ae | 15 ------- multimedia/avidemux/patches/patch-af | 82 ------------------------------------ multimedia/avidemux/patches/patch-as | 13 ++++++ multimedia/avidemux/patches/patch-at | 15 +++++++ multimedia/avidemux/patches/patch-au | 13 ++++++ multimedia/avidemux/patches/patch-av | 13 ++++++ multimedia/avidemux/patches/patch-aw | 13 ++++++ multimedia/avidemux/patches/patch-ax | 46 ++++++++++++++++++++ multimedia/avidemux/patches/patch-ay | 21 +++++++++ 16 files changed, 185 insertions(+), 245 deletions(-) delete mode 100644 multimedia/avidemux/patches/patch-ac delete mode 100644 multimedia/avidemux/patches/patch-ad delete mode 100644 multimedia/avidemux/patches/patch-ae delete mode 100644 multimedia/avidemux/patches/patch-af create mode 100644 multimedia/avidemux/patches/patch-as create mode 100644 multimedia/avidemux/patches/patch-at create mode 100644 multimedia/avidemux/patches/patch-au create mode 100644 multimedia/avidemux/patches/patch-av create mode 100644 multimedia/avidemux/patches/patch-aw create mode 100644 multimedia/avidemux/patches/patch-ax create mode 100644 multimedia/avidemux/patches/patch-ay diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 17325d5c03e..0f629e197be 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.44 2007/12/28 12:15:38 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2008/02/19 09:11:43 xtraeme Exp $ # -DISTNAME= avidemux_2.3.0 +DISTNAME= avidemux_2.4.1 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 +#PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.berlios.de/avidemux/ @@ -14,65 +14,20 @@ COMMENT= Graphical video editing program PKG_DESTDIR_SUPPORT= user-destdir GCC_REQD+= 3.0 -GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl pkg-config msgfmt +USE_TOOLS+= cmake pkg-config msgfmt +USE_CMAKE= yes CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" LIBS+= ${LIBOSSAUDIO} -CONFIGURE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} -CONFIGURE_ENV+= ac_cv_path_ART_CONFIG=no -CONFIGURE_ARGS+= \ - --with-jsapi-include=${BUILDLINK_PREFIX.spidermonkey}/include - -.include "../../mk/bsd.prefs.mk" - -PKG_OPTIONS_VAR= PKG_OPTIONS.avidemux -PKG_SUPPORTED_OPTIONS= faad -.if ${MACHINE_ARCH} == "i386" -PKG_SUPPORTED_OPTIONS+= mmx -.endif - -.if ${OPSYS} == "Darwin" -CPPFLAGS+= -D__maxosx__ - -.if ${MACHINE_ARCH} == "powerpc" -CONFIGURE_ARGS+= --enable-altivec -CONFIGURE_ENV+= CCAS=${CC} -.endif -.endif - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mfaad) -. include "../../audio/faad2/buildlink3.mk" -CPPFLAGS+= -I${BUILDLINK_PREFIX.faad2}/include/faad2 -CONFIGURE_ARGS+= --with-faad2 -RESTRICTED= Dolby doesn't allow binary distributions (FAAD) -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} -.else -CONFIGURE_ARGS+= --without-newfaad -CONFIGURE_ARGS+= --disable-faad -.endif - -.if empty(PKG_OPTIONS:Mmmx) -CONFIGURE_ARGS+= --disable-mmx - -post-configure: - ${MV} ${WRKSRC}/avidemux/ADM_lavcodec/config.mak \ - ${WRKSRC}/avidemux/ADM_lavcodec/config.mak.in - ${SED} -e 's/TARGET_MMX=yes/TARGET_MMX=no/g' \ - < ${WRKSRC}/avidemux/ADM_lavcodec/config.mak.in \ - > ${WRKSRC}/avidemux/ADM_lavcodec/config.mak -.endif - .include "../../audio/faac/buildlink3.mk" +.include "../../audio/faad2/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" +.include "../../audio/libsamplerate/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" @@ -83,6 +38,7 @@ post-configure: .include "../../multimedia/x264-devel/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/avidemux/PLIST b/multimedia/avidemux/PLIST index d0be81d2eb1..ca9b3a87edf 100644 --- a/multimedia/avidemux/PLIST +++ b/multimedia/avidemux/PLIST @@ -1,7 +1,20 @@ -@comment $NetBSD: PLIST,v 1.5 2007/08/28 18:50:00 jlam Exp $ -bin/avidemux2 +@comment $NetBSD: PLIST,v 1.6 2008/02/19 09:11:43 xtraeme Exp $ +bin/avidemux2_cli +bin/avidemux2_gtk +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/it/LC_MESSAGES/avidemux.mo +share/locale/ja/LC_MESSAGES/avidemux.mo share/locale/klingon/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 +@dirrm share/locale/sr@latin/LC_MESSAGES +@dirrm share/locale/sr@latin +@dirrm share/locale/klingon/LC_MESSAGES diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo index 50afdd2e9f8..1c9f670b8c9 100644 --- a/multimedia/avidemux/distinfo +++ b/multimedia/avidemux/distinfo @@ -1,11 +1,14 @@ -$NetBSD: distinfo,v 1.13 2008/01/05 21:14:10 tron Exp $ +$NetBSD: distinfo,v 1.14 2008/02/19 09:11:43 xtraeme Exp $ -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) = c032d5bfe7641b89ee5f0adb65e75f1b0b31035e -SHA1 (patch-ab) = f6e79bf9dfbae621c6fd07499ff74bfd14a57150 -SHA1 (patch-ac) = 7872afd5a1eebd6bd57de65a1cfac1ac4e3149ee -SHA1 (patch-ad) = 3a0b32c90471d4589f50afca9495eff2b2b74fcb -SHA1 (patch-ae) = 275ffd524e25fd9f3d3f27b503eb092857a6045a -SHA1 (patch-af) = afa0e400f628aae53087307894979b3278eca87b +SHA1 (avidemux_2.4.1.tar.gz) = 6bbf542bab73d91cb73f198d2d8afe10d83b2821 +RMD160 (avidemux_2.4.1.tar.gz) = 8149eb62cb4f3196d98b8c2707a4252f06e198cf +Size (avidemux_2.4.1.tar.gz) = 5788014 bytes +SHA1 (patch-aa) = eeee381ed62b8a2c81963f5e5d6adbf69acdf642 +SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303 +SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6 +SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b +SHA1 (patch-au) = 98fd766da4424cfd183e4a4b4e1892f2ab17c491 +SHA1 (patch-av) = 68e40fff1eaa735b9ac36556f308ed9a45316911 +SHA1 (patch-aw) = 2f89f7d2beb7863a831bb7ae6e539ecc2cadcb21 +SHA1 (patch-ax) = 42b2d2bbc57a6979fd0858a1eef671545682276b +SHA1 (patch-ay) = 7bfde827e20a9546d9a533293e6d9519b166bb95 diff --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-aa index 5d6a69b9658..b486536f023 100644 --- a/multimedia/avidemux/patches/patch-aa +++ b/multimedia/avidemux/patches/patch-aa @@ -1,17 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2006/12/08 22:06:28 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2008/02/19 09:11:43 xtraeme Exp $ ---- 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 -@@ -26,9 +26,10 @@ - #include - #include - --#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) -+#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__DragonFly__) +--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig 2008-02-18 21:20:28.000000000 +0100 ++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2008-02-18 21:21:09.000000000 +0100 +@@ -29,6 +29,7 @@ + #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__) #include -- const char *dsp = DEVOSSAUDIO;; -+ const char *dsp = DEVOSSAUDIO; + const char *dsp = DEVOSSAUDIO;; + const char *device_mixer = "/dev/mixer"; - #else - #include + #elif defined(__OpenBSD__) + #include diff --git a/multimedia/avidemux/patches/patch-ab b/multimedia/avidemux/patches/patch-ab index 6b183e1a4cd..8948f54f602 100644 --- a/multimedia/avidemux/patches/patch-ab +++ b/multimedia/avidemux/patches/patch-ab @@ -1,15 +1,15 @@ -$NetBSD: patch-ab,v 1.5 2006/12/08 22:06:28 joerg Exp $ +$NetBSD: patch-ab,v 1.6 2008/02/19 09:11:43 xtraeme Exp $ ---- 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,7 +325,9 @@ JSBool systemExecute(JSContext *cx, JSOb +--- 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 @@ // clear file descriptor table of forked process and fork - #if defined( __linux__) || defined(__maxosx__) + #if defined( __linux__) || defined(__macosx__) || defined(__APPLE__) pid_t pidRtn = fork(); --#elif __FreeBSD__ +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__NetBSD__) + pid_t pidRtn = vfork(); -+#elif defined(__FreeBSD__) || defined(__DragonFly__) ++#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 237cc4d8550..00000000000 --- a/multimedia/avidemux/patches/patch-ac +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2006/12/05 14:26:28 tron Exp $ - ---- avidemux/ADM_script/DirectorySearch.h.orig 2006-10-08 15:40:42.000000000 +0100 -+++ avidemux/ADM_script/DirectorySearch.h 2006-12-05 13:58:39.000000000 +0000 -@@ -14,7 +14,9 @@ - #if _MSC_VER > 1000 - #pragma once - #endif // _MSC_VER > 1000 --#if !defined( __unix__) && !defined(__maxosx__) -+#include -+#include -+#if !defined(BSD) && !defined( __unix__) && !defined(__macosx__) - #include - #else - #include -@@ -26,7 +28,7 @@ - // create a non file bit for unix - #define _A_NONFILE 0x03 - --#if defined( __unix__) && !defined(__maxosx__) -+#if (defined(__unix__) || defined(BSD)) && !defined(__macosx__) - - // wrap the file mode bits - #define _A_NORMAL 0x00 -@@ -50,6 +52,7 @@ - - class CDirectorySearch - { -+private: - public: - const char * GetExtension(); - bool IsExtension(const char *pExtension); -@@ -102,8 +105,7 @@ - long m_hSearch; - _finddata_t m_fdData; - std::string m_sDirectory; --private: --#ifdef __unix__ -+#if defined(__unix__) || defined(BSD) - // prototypes - int _findfirst(const char *path,_finddata_t *pfdData); - int _findnext(unsigned long int hDir,_finddata_t *pfdData); diff --git a/multimedia/avidemux/patches/patch-ad b/multimedia/avidemux/patches/patch-ad deleted file mode 100644 index ebe1fc60db1..00000000000 --- a/multimedia/avidemux/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/12/05 14:26:28 tron Exp $ - ---- avidemux/ADM_script/DirectorySearch.cpp.orig 2006-10-08 15:40:42.000000000 +0100 -+++ avidemux/ADM_script/DirectorySearch.cpp 2006-12-05 14:05:00.000000000 +0000 -@@ -14,7 +14,7 @@ - // Construction/Destruction - ////////////////////////////////////////////////////////////////////// - --#ifdef __unix__ -+#if defined(__unix__) || defined(BSD) - int CDirectorySearch::_findnext(unsigned long int hDir,_finddata_t *pfdData) - {// begin _findnext - if(!hDir || hDir == 0xFFFFFFFF) -@@ -29,7 +29,7 @@ - strncpy(pfdData->name,pEntry->d_name,pEntry->d_reclen); - // append NULL terminator - pfdData->name[pEntry->d_reclen] = '\0'; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__NetBSD__) - strncpy(pfdData->name,pEntry->d_name,pEntry->d_namlen); - // append NULL terminator - pfdData->name[pEntry->d_namlen] = '\0'; diff --git a/multimedia/avidemux/patches/patch-ae b/multimedia/avidemux/patches/patch-ae deleted file mode 100644 index 1ed73e0d967..00000000000 --- a/multimedia/avidemux/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/12/05 18:31:07 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 -+#endif -+ - #ifndef always_inline - #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) - # define always_inline __attribute__((always_inline)) inline diff --git a/multimedia/avidemux/patches/patch-af b/multimedia/avidemux/patches/patch-af deleted file mode 100644 index dc07c4d8716..00000000000 --- a/multimedia/avidemux/patches/patch-af +++ /dev/null @@ -1,82 +0,0 @@ -$NetBSD: patch-af,v 1.2 2008/01/05 21:14:10 tron Exp $ - ---- configure.orig 2006-11-25 21:02:18.000000000 +0000 -+++ configure 2008-01-05 20:21:50.000000000 +0000 -@@ -18971,7 +18971,7 @@ - if test "x$use_cygwin" = "xyes"; then - LDFLAGS="$LDFLAGS -lpthreadGC1 " - else -- LDFLAGS="$LDFLAGS -lpthread -lX11 -lXext -L/usr/X11R6/lib" -+ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lX11 -lXext ${X11_LDFLAGS}" - fi - - -@@ -25269,6 +25269,20 @@ - - have_little_endian=yes; - -+case $host_os in -+darwin*) -+cat >>confdefs.h <<\_ACEOF -+#define FPM_INTEL 1 -+_ACEOF -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define RUNTIME_CPUDETECT 1 -+_ACEOF -+ -+ -+ ;; -+*) - cat >>confdefs.h <<\_ACEOF - #define ARCH_X86 1 - _ACEOF -@@ -25290,6 +25304,8 @@ - - use_mmx=1 - echo "X86 is ON" -+ ;; -+esac - ;; - x86_64|amd64) - have_little_endian=yes; -@@ -25715,7 +25731,7 @@ - - #include - -- #if !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) -+ #if !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) - #error - #endif - -@@ -26637,6 +26653,14 @@ - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; -@@ -28340,6 +28364,14 @@ - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; diff --git a/multimedia/avidemux/patches/patch-as b/multimedia/avidemux/patches/patch-as new file mode 100644 index 00000000000..6c1a1c6ad13 --- /dev/null +++ b/multimedia/avidemux/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2008/02/19 09:11:43 xtraeme 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 @@ + + #ifdef USE_SDL + extern "C" { +- #include "SDL.h" ++ #include + } + + #include "ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.h" diff --git a/multimedia/avidemux/patches/patch-at b/multimedia/avidemux/patches/patch-at new file mode 100644 index 00000000000..6a06db004eb --- /dev/null +++ b/multimedia/avidemux/patches/patch-at @@ -0,0 +1,15 @@ +$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 ++#include + } + + #include "ADM_colorspace/colorspace.h" diff --git a/multimedia/avidemux/patches/patch-au b/multimedia/avidemux/patches/patch-au new file mode 100644 index 00000000000..fa2384267fd --- /dev/null +++ b/multimedia/avidemux/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD: patch-au,v 1.1 2008/02/19 09:11:43 xtraeme 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__) + void installSigHandler() {} + + void ADM_backTrack(int lineno,const char *file) diff --git a/multimedia/avidemux/patches/patch-av b/multimedia/avidemux/patches/patch-av new file mode 100644 index 00000000000..07c431363f5 --- /dev/null +++ b/multimedia/avidemux/patches/patch-av @@ -0,0 +1,13 @@ +$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-aw b/multimedia/avidemux/patches/patch-aw new file mode 100644 index 00000000000..64898666ba0 --- /dev/null +++ b/multimedia/avidemux/patches/patch-aw @@ -0,0 +1,13 @@ +$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 + + + #include "ADM_toolkit/toolkit.hxx" diff --git a/multimedia/avidemux/patches/patch-ax b/multimedia/avidemux/patches/patch-ax new file mode 100644 index 00000000000..36246e41ff3 --- /dev/null +++ b/multimedia/avidemux/patches/patch-ax @@ -0,0 +1,46 @@ +$NetBSD: patch-ax,v 1.1 2008/02/19 09:11:43 xtraeme Exp $ + +--- avidemux/ADM_videoFilter/ADM_vidParticle.cpp.orig 2008-02-19 09:16:00.000000000 +0100 ++++ avidemux/ADM_videoFilter/ADM_vidParticle.cpp 2008-02-19 09:21:40.000000000 +0100 +@@ -797,8 +797,13 @@ + + if (my_outImage) + { ++#ifdef __NetBSD__ ++ uint32_t px = static_cast (rintf (my_particle.centroidX)); ++ uint32_t py = static_cast (rintf (my_particle.centroidY)); ++#else + uint32_t px = static_cast (nearbyintf (my_particle.centroidX)); + uint32_t py = static_cast (nearbyintf (my_particle.centroidY)); ++#endif + if (validPixel (px, py)) + outPixel (px, py) = 255; + else +@@ -1157,8 +1162,13 @@ + char & pixel_char (vector & grid, int16_t xbase, int16_t ybase, + float cX, float cY, float dX, float dY) + { ++#ifdef __NetBSD__ ++ uint16_t x = static_cast (rintf (cX + dX)); ++ uint16_t y = static_cast (rintf (cY + dY)); ++#else + uint16_t x = static_cast (nearbyintf (cX + dX)); + uint16_t y = static_cast (nearbyintf (cY + dY)); ++#endif + return grid [y - ybase][x - xbase]; + } + +@@ -1319,8 +1329,13 @@ + ++plit; + } + ++#ifdef __NetBSD__ ++ uint32_t px = static_cast (rintf (my_particle.centroidX)); ++ uint32_t py = static_cast (rintf (my_particle.centroidY)); ++#else + uint32_t px = static_cast (nearbyintf (my_particle.centroidX)); + uint32_t py = static_cast (nearbyintf (my_particle.centroidY)); ++#endif + char & ch = grid [py - ybase][px - xbase]; + if (ch == 'x') + ch = 'X'; diff --git a/multimedia/avidemux/patches/patch-ay b/multimedia/avidemux/patches/patch-ay new file mode 100644 index 00000000000..10d48054279 --- /dev/null +++ b/multimedia/avidemux/patches/patch-ay @@ -0,0 +1,21 @@ +$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 + #include + #include ++#include + + #include + +@@ -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) -- cgit v1.2.3