summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/mlt/Makefile16
-rw-r--r--multimedia/mlt/PLIST172
-rw-r--r--multimedia/mlt/distinfo19
-rw-r--r--multimedia/mlt/patches/patch-aa40
-rw-r--r--multimedia/mlt/patches/patch-ab15
-rw-r--r--multimedia/mlt/patches/patch-ac15
-rw-r--r--multimedia/mlt/patches/patch-ad15
-rw-r--r--multimedia/mlt/patches/patch-ae15
-rw-r--r--multimedia/mlt/patches/patch-af43
-rw-r--r--multimedia/mlt/patches/patch-ag16
-rw-r--r--multimedia/mlt/patches/patch-ah15
-rw-r--r--multimedia/mlt/patches/patch-ai15
-rw-r--r--multimedia/mlt/patches/patch-configure15
-rw-r--r--multimedia/mlt/patches/patch-src_modules_videostab_stab_estimate.c16
14 files changed, 211 insertions, 216 deletions
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 3f9d095b72c..2cacdf0d78c 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 23:02:11 adam Exp $
-#
+# $NetBSD: Makefile,v 1.18 2012/11/21 22:24:27 abs Exp $
-DISTNAME= mlt-0.5.10
-PKGREVISION= 14
+DISTNAME= mlt-0.8.6
CATEGORIES= multimedia
MASTER_SITES= http://downloads.sourceforge.net/project/mlt/mlt/
-MAINTAINER= abs@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.mltframework.org/twiki/bin/view/MLT/
COMMENT= Open source multimedia framework
LICENSE= gnu-gpl-v2
@@ -16,19 +14,19 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-gpl
-PKGCONFIG_OVERRIDE+= mlt-0.5.10/mlt++.pc.in
-PKGCONFIG_OVERRIDE+= mlt-0.5.10/mlt-framework.pc.in
+PKGCONFIG_OVERRIDE+= mlt-0.8.6/mlt++.pc.in
+PKGCONFIG_OVERRIDE+= mlt-0.8.6/mlt-framework.pc.in
-.include "../../audio/ladspa/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/sox/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../multimedia/ffmpeg/buildlink3.mk"
.include "../../multimedia/libdv/buildlink3.mk"
+.include "../../multimedia/swfdec/buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mlt/PLIST b/multimedia/mlt/PLIST
index 2864af874f7..1777010f02f 100644
--- a/multimedia/mlt/PLIST
+++ b/multimedia/mlt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/11/21 22:24:27 abs Exp $
bin/melt
include/mlt++/Mlt.h
include/mlt++/MltConsumer.h
@@ -49,46 +49,97 @@ include/mlt/framework/mlt_tokeniser.h
include/mlt/framework/mlt_tractor.h
include/mlt/framework/mlt_transition.h
include/mlt/framework/mlt_types.h
+include/mlt/framework/mlt_version.h
lib/libmlt++.so
-lib/libmlt++.so.0.5.10
+lib/libmlt++.so.${PKGVERSION}
lib/libmlt++.so.3
lib/libmlt.so
-lib/libmlt.so.0.5.10
-lib/libmlt.so.2
+lib/libmlt.so.${PKGVERSION}
+lib/libmlt.so.5
lib/mlt/libmltavformat.so
lib/mlt/libmltcore.so
+lib/mlt/libmltdecklink.so
lib/mlt/libmltdgraft.so
lib/mlt/libmltdv.so
lib/mlt/libmlteffectv.so
lib/mlt/libmltgtk2.so
lib/mlt/libmltkdenlive.so
lib/mlt/libmltkino.so
-lib/mlt/libmltmelt.so
+lib/mlt/libmltlinsys.so
lib/mlt/libmltmotion_est.so
lib/mlt/libmltnormalize.so
lib/mlt/libmltoldfilm.so
lib/mlt/libmltplus.so
lib/mlt/libmltqimage.so
lib/mlt/libmltresample.so
+lib/mlt/libmltrotoscoping.so
lib/mlt/libmltsdl.so
lib/mlt/libmltsox.so
+lib/mlt/libmltswfdec.so
+lib/mlt/libmltvideostab.so
lib/mlt/libmltvmfx.so
lib/mlt/libmltvorbis.so
lib/mlt/libmltxine.so
lib/mlt/libmltxml.so
lib/pkgconfig/mlt++.pc
lib/pkgconfig/mlt-framework.pc
+share/mlt/avformat/consumer_avformat.yml
share/mlt/avformat/producer_avformat.yml
+share/mlt/core/consumer_multi.yml
share/mlt/core/data_fx.properties
+share/mlt/core/filter_audiowave.yml
+share/mlt/core/filter_brightness.yml
+share/mlt/core/filter_channelcopy.yml
+share/mlt/core/filter_crop.yml
+share/mlt/core/filter_data_show.yml
+share/mlt/core/filter_fieldorder.yml
+share/mlt/core/filter_gamma.yml
+share/mlt/core/filter_greyscale.yml
+share/mlt/core/filter_luma.yml
+share/mlt/core/filter_mirror.yml
+share/mlt/core/filter_mono.yml
+share/mlt/core/filter_obscure.yml
+share/mlt/core/filter_region.yml
+share/mlt/core/filter_rescale.yml
+share/mlt/core/filter_resize.yml
+share/mlt/core/filter_transition.yml
+share/mlt/core/filter_watermark.yml
share/mlt/core/loader.dict
share/mlt/core/loader.ini
+share/mlt/core/producer_colour.yml
+share/mlt/core/producer_consumer.yml
+share/mlt/core/producer_hold.yml
+share/mlt/core/producer_loader.yml
+share/mlt/core/producer_melt.yml
+share/mlt/core/producer_melt_file.yml
+share/mlt/core/producer_noise.yml
+share/mlt/core/transition_composite.yml
+share/mlt/core/transition_luma.yml
+share/mlt/core/transition_mix.yml
+share/mlt/core/transition_region.yml
+share/mlt/decklink/consumer_decklink.yml
+share/mlt/decklink/producer_decklink.yml
+share/mlt/dv/consumer_libdv.yml
+share/mlt/dv/producer_libdv.yml
+share/mlt/effectv/filter_burningtv.yml
share/mlt/feeds/NTSC/data_fx.properties
+share/mlt/feeds/NTSC/etv.properties
share/mlt/feeds/NTSC/obscure.properties
share/mlt/feeds/PAL/border.properties
share/mlt/feeds/PAL/data_fx.properties
share/mlt/feeds/PAL/etv.properties
share/mlt/feeds/PAL/example.properties
share/mlt/feeds/PAL/obscure.properties
+share/mlt/gtk2/consumer_gtk2_preview.yml
+share/mlt/gtk2/filter_dynamictext.yml
+share/mlt/gtk2/filter_rescale.yml
+share/mlt/gtk2/producer_pango.yml
+share/mlt/gtk2/producer_pixbuf.yml
+share/mlt/kdenlive/filter_boxblur.yml
+share/mlt/kdenlive/filter_freeze.yml
+share/mlt/kdenlive/filter_wave.yml
+share/mlt/kdenlive/producer_framebuffer.yml
+share/mlt/linsys/consumer_sdi.yml
share/mlt/lumas/NTSC/luma01.pgm
share/mlt/lumas/NTSC/luma02.pgm
share/mlt/lumas/NTSC/luma03.pgm
@@ -134,6 +185,12 @@ share/mlt/lumas/PAL/luma20.pgm
share/mlt/lumas/PAL/luma21.pgm
share/mlt/lumas/PAL/luma22.pgm
share/mlt/metaschema.yaml
+share/mlt/motion_est/filter_autotrack_rectangle.yml
+share/mlt/motion_est/filter_motion_est.yml
+share/mlt/motion_est/filter_vismv.yml
+share/mlt/motion_est/producer_slowmotion.yml
+share/mlt/normalize/filter_audiolevel.yml
+share/mlt/normalize/filter_volume.yml
share/mlt/oldfilm/dust1.svg
share/mlt/oldfilm/dust2.svg
share/mlt/oldfilm/dust3.svg
@@ -151,6 +208,83 @@ share/mlt/oldfilm/lines.svg
share/mlt/oldfilm/oldfilm.svg
share/mlt/oldfilm/tcolor.svg
share/mlt/oldfilm/vignette.svg
+share/mlt/plus/filter_affine.yml
+share/mlt/plus/filter_charcoal.yml
+share/mlt/plus/filter_invert.yml
+share/mlt/plus/filter_sepia.yml
+share/mlt/plus/transition_affine.yml
+share/mlt/presets/consumer/avformat/AAC
+share/mlt/presets/consumer/avformat/Flash
+share/mlt/presets/consumer/avformat/MJPEG
+share/mlt/presets/consumer/avformat/MP3
+share/mlt/presets/consumer/avformat/MPEG-2
+share/mlt/presets/consumer/avformat/MPEG-4
+share/mlt/presets/consumer/avformat/MPEG-4-ASP
+share/mlt/presets/consumer/avformat/Sony-PSP
+share/mlt/presets/consumer/avformat/Vorbis
+share/mlt/presets/consumer/avformat/WAV
+share/mlt/presets/consumer/avformat/XDCAM-HD422
+share/mlt/presets/consumer/avformat/atsc_1080i_50/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080i_5994/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_2398/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_24/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_25/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_2997/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_30/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_50/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_5994/DNxHD
+share/mlt/presets/consumer/avformat/atsc_1080p_60/DNxHD
+share/mlt/presets/consumer/avformat/atsc_720p_2398/DNxHD
+share/mlt/presets/consumer/avformat/atsc_720p_50/DNxHD
+share/mlt/presets/consumer/avformat/atsc_720p_5994/DNxHD
+share/mlt/presets/consumer/avformat/atsc_720p_60/DNxHD
+share/mlt/presets/consumer/avformat/dv_ntsc/D10
+share/mlt/presets/consumer/avformat/dv_ntsc/DV
+share/mlt/presets/consumer/avformat/dv_ntsc/DVCPRO50
+share/mlt/presets/consumer/avformat/dv_ntsc/DVD
+share/mlt/presets/consumer/avformat/dv_ntsc_wide/D10
+share/mlt/presets/consumer/avformat/dv_ntsc_wide/DV
+share/mlt/presets/consumer/avformat/dv_ntsc_wide/DVCPRO50
+share/mlt/presets/consumer/avformat/dv_ntsc_wide/DVD
+share/mlt/presets/consumer/avformat/dv_pal/D10
+share/mlt/presets/consumer/avformat/dv_pal/DV
+share/mlt/presets/consumer/avformat/dv_pal/DVCPRO50
+share/mlt/presets/consumer/avformat/dv_pal/DVD
+share/mlt/presets/consumer/avformat/dv_pal_wide/D10
+share/mlt/presets/consumer/avformat/dv_pal_wide/DV
+share/mlt/presets/consumer/avformat/dv_pal_wide/DVCPRO50
+share/mlt/presets/consumer/avformat/dv_pal_wide/DVD
+share/mlt/presets/consumer/avformat/hdv_1080_25p/HDV
+share/mlt/presets/consumer/avformat/hdv_1080_30p/HDV
+share/mlt/presets/consumer/avformat/hdv_1080_50i/HDV
+share/mlt/presets/consumer/avformat/hdv_1080_60i/HDV
+share/mlt/presets/consumer/avformat/hdv_720_25p/HDV
+share/mlt/presets/consumer/avformat/hdv_720_30p/HDV
+share/mlt/presets/consumer/avformat/hdv_720_50p/HDV
+share/mlt/presets/consumer/avformat/hdv_720_60p/HDV
+share/mlt/presets/consumer/avformat/lossless/FFV1
+share/mlt/presets/consumer/avformat/lossless/H.264
+share/mlt/presets/consumer/avformat/lossless/HuffYUV
+share/mlt/presets/consumer/avformat/lossless/MJPEG
+share/mlt/presets/consumer/avformat/lossless/MPEG-2
+share/mlt/presets/consumer/avformat/lossless/MPEG-4
+share/mlt/presets/consumer/avformat/lossless/ProRes
+share/mlt/presets/consumer/avformat/stills/BMP
+share/mlt/presets/consumer/avformat/stills/DPX
+share/mlt/presets/consumer/avformat/stills/JPEG
+share/mlt/presets/consumer/avformat/stills/PNG
+share/mlt/presets/consumer/avformat/stills/PPM
+share/mlt/presets/consumer/avformat/stills/TGA
+share/mlt/presets/consumer/avformat/stills/TIFF
+share/mlt/presets/consumer/avformat/webm
+share/mlt/presets/consumer/avformat/x264-medium
+share/mlt/presets/consumer/avformat/x264-medium-baseline
+share/mlt/presets/consumer/avformat/x264-medium-main
+share/mlt/presets/consumer/avformat/x264-medium-pass1
+share/mlt/presets/filter/brightness/from_black
+share/mlt/presets/filter/brightness/to_black
+share/mlt/presets/filter/volume/fade_in
+share/mlt/presets/filter/volume/fade_out
share/mlt/profiles/atsc_1080i_50
share/mlt/profiles/atsc_1080i_5994
share/mlt/profiles/atsc_1080i_60
@@ -159,6 +293,9 @@ share/mlt/profiles/atsc_1080p_24
share/mlt/profiles/atsc_1080p_25
share/mlt/profiles/atsc_1080p_2997
share/mlt/profiles/atsc_1080p_30
+share/mlt/profiles/atsc_1080p_50
+share/mlt/profiles/atsc_1080p_5994
+share/mlt/profiles/atsc_1080p_60
share/mlt/profiles/atsc_720p_2398
share/mlt/profiles/atsc_720p_24
share/mlt/profiles/atsc_720p_25
@@ -193,6 +330,7 @@ share/mlt/profiles/quarter_ntsc_wide
share/mlt/profiles/quarter_pal
share/mlt/profiles/quarter_pal_wide
share/mlt/profiles/sdi_486i_5994
+share/mlt/profiles/sdi_486p_2398
share/mlt/profiles/square_ntsc
share/mlt/profiles/square_ntsc_wide
share/mlt/profiles/square_pal
@@ -203,4 +341,28 @@ share/mlt/profiles/svcd_pal
share/mlt/profiles/svcd_pal_wide
share/mlt/profiles/vcd_ntsc
share/mlt/profiles/vcd_pal
+share/mlt/qimage/producer_kdenlivetitle.yml
+share/mlt/qimage/producer_qimage.yml
+share/mlt/qimage/transition_vqm.yml
+share/mlt/resample/filter_resample.yml
+share/mlt/rotoscoping/filter_rotoscoping.yml
+share/mlt/sdl/consumer_sdl.yml
+share/mlt/sdl/consumer_sdl_audio.yml
+share/mlt/sdl/consumer_sdl_preview.yml
+share/mlt/sdl/consumer_sdl_still.yml
+share/mlt/sdl/producer_sdl_image.yml
+share/mlt/sox/filter_sox.yml
+share/mlt/sox/filter_sox_effect.yml
+share/mlt/swfdec/producer_swfdec.yml
+share/mlt/videostab/filter_videostab.yml
+share/mlt/videostab/filter_videostab2.yml
+share/mlt/vmfx/filter_chroma.yml
+share/mlt/vmfx/filter_chroma_hold.yml
+share/mlt/vmfx/filter_mono.yml
+share/mlt/vmfx/filter_shape.yml
+share/mlt/vmfx/producer_pgm.yml
+share/mlt/vorbis/producer_vorbis.yml
+share/mlt/xml/consumer_xml.yml
share/mlt/xml/mlt-xml.dtd
+share/mlt/xml/producer_xml-string.yml
+share/mlt/xml/producer_xml.yml
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 9d7d8246339..13a026c92e1 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.3 2012/09/01 11:18:53 marino Exp $
+$NetBSD: distinfo,v 1.4 2012/11/21 22:24:27 abs Exp $
-SHA1 (mlt-0.5.10.tar.gz) = e0b3d8f77ad6d97d6495614e78dfbbb531e70f77
-RMD160 (mlt-0.5.10.tar.gz) = 015053ddb98175adc905d2ccf29ae962f295a9bb
-Size (mlt-0.5.10.tar.gz) = 819471 bytes
-SHA1 (patch-aa) = 15678a43add7566921aebe8079a9d3ae96f134c8
-SHA1 (patch-ab) = 61ce1f1324ee475d45f429c2cf4d8563140e8a66
-SHA1 (patch-ac) = 43fc78584d94200c808738e8eeb1005c64609d45
-SHA1 (patch-ad) = 8cbc98971731d84c5681a6249e5f3020be830903
-SHA1 (patch-ae) = b74fdcb11bd69299ca090f6228f37fb548e53066
-SHA1 (patch-af) = 1f7182398c6c5631f719539d72c29c87f5e42e34
-SHA1 (patch-ag) = 938d553380c8370d8ac8dad1d47008d0ff216f7c
-SHA1 (patch-ah) = 5d1f7f0323aa50e53602008d402193e8a19ddf72
-SHA1 (patch-ai) = fbac0f478a950e31791a63ad52604ae212c386ee
+SHA1 (mlt-0.8.6.tar.gz) = 616e807ba9f8fd8d6c9f87cb04416885c471596c
+RMD160 (mlt-0.8.6.tar.gz) = 354130bdd1d42e55f01703d2eac25a947d86f377
+Size (mlt-0.8.6.tar.gz) = 1104163 bytes
+SHA1 (patch-configure) = 52cc702fd561d45699bb7d5dce2b43a80fb9d474
+SHA1 (patch-src_modules_videostab_stab_estimate.c) = 58549c2ee2780604c043637a25dd39e92f90b7ce
diff --git a/multimedia/mlt/patches/patch-aa b/multimedia/mlt/patches/patch-aa
deleted file mode 100644
index 55c08763201..00000000000
--- a/multimedia/mlt/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2012/09/01 11:18:54 marino Exp $
-
-# Add support for NetBSD - copy of FreeBSD except for uname -m amd64 vs x86_64
-# Add support for DragonFly
-
---- configure.orig 2010-09-14 06:00:09.000000000 +0000
-+++ configure
-@@ -89,7 +89,7 @@ build_config()
- echo "RDYNAMIC=-rdynamic"
- echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
- ;;
-- FreeBSD)
-+ FreeBSD|DragonFly)
- [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
- echo "OPTIMISATIONS+=-ffast-math"
- echo "CFLAGS+=-pthread"
-@@ -97,6 +97,14 @@ build_config()
- echo "RDYNAMIC=-rdynamic"
- echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
- ;;
-+ NetBSD)
-+ [ "$(uname -m)" = "amd64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
-+ echo "OPTIMISATIONS+=-ffast-math"
-+ echo "CFLAGS+=-pthread"
-+ echo "SHFLAGS=-shared"
-+ echo "RDYNAMIC=-rdynamic"
-+ echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
-+ ;;
- *)
- ;;
- esac
-@@ -171,7 +179,7 @@ case $targetos in
- Darwin)
- LIBSUF=".dylib"
- ;;
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD|DragonFly)
- LIBSUF=".so"
- ;;
- *)
diff --git a/multimedia/mlt/patches/patch-ab b/multimedia/mlt/patches/patch-ab
deleted file mode 100644
index 3778ef8d3e7..00000000000
--- a/multimedia/mlt/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2012/09/01 11:18:54 marino Exp $
-
-# Add support for NetBSD & DragonFly - match FreeBSD
-
---- src/mlt++/configure.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/mlt++/configure
-@@ -11,7 +11,7 @@ case $targetos in
- echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC"
- echo "LIBFLAGS=-dynamiclib -single_module"
- ;;
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD|DragonFly)
- echo LIBSUF=.so
- echo "CXXFLAGS+=-Wall $WARNINGS -fPIC -DPIC"
- echo "LIBFLAGS=-shared"
diff --git a/multimedia/mlt/patches/patch-ac b/multimedia/mlt/patches/patch-ac
deleted file mode 100644
index b38e5dd75af..00000000000
--- a/multimedia/mlt/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2012/09/01 11:18:54 marino Exp $
-
-# Add support for NetBSD & DragonFly - match FreeBSD
-
---- src/modules/avformat/configure.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/avformat/configure
-@@ -34,7 +34,7 @@ else
- Darwin)
- export LIBSUF=.dylib
- ;;
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD|DragonFly)
- export LIBSUF=.so
- ;;
- *)
diff --git a/multimedia/mlt/patches/patch-ad b/multimedia/mlt/patches/patch-ad
deleted file mode 100644
index e34f4b4bbd0..00000000000
--- a/multimedia/mlt/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2012/09/01 11:18:54 marino Exp $
-
-# Add support for NetBSD & DragonFly - match FreeBSD
-
---- src/modules/qimage/configure.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/qimage/configure
-@@ -24,7 +24,7 @@ else
- Darwin)
- export LIBSUF=.dylib
- ;;
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD|DragonFly)
- export LIBSUF=.so
- ;;
- *)
diff --git a/multimedia/mlt/patches/patch-ae b/multimedia/mlt/patches/patch-ae
deleted file mode 100644
index 988280b0e18..00000000000
--- a/multimedia/mlt/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2012/09/01 11:18:54 marino Exp $
-
-# Add support for NetBSD & DragonFly - match FreeBSD
-
---- src/modules/sox/configure.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/sox/configure
-@@ -8,7 +8,7 @@ then
- Darwin)
- LDD="otool -L"
- ;;
-- Linux|FreeBSD)
-+ Linux|FreeBSD|NetBSD|DragonFly)
- LDD="ldd"
- ;;
- *)
diff --git a/multimedia/mlt/patches/patch-af b/multimedia/mlt/patches/patch-af
deleted file mode 100644
index ca1a2b16077..00000000000
--- a/multimedia/mlt/patches/patch-af
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-af,v 1.3 2012/09/01 11:18:54 marino Exp $
-
-# Add NetBSD support (same as FreeBSD) and clean up *BSD ifdefs
-# Add DragonFly support (same as FreeBSD)
-
---- src/modules/kino/endian_types.h.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/kino/endian_types.h
-@@ -28,30 +28,26 @@
- #define _ENDIAN_TYPES_H
-
- /* Needed for BYTE_ORDER and BIG/LITTLE_ENDIAN macros. */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- #ifndef _BSD_SOURCE
- # define _BSD_SOURCE
--#ifndef __FreeBSD__
- # include <endian.h>
--#else
--# include <sys/endian.h>
--#endif /* __FreeBSD__ */
- # undef _BSD_SOURCE
- #else
--#ifndef __FreeBSD__
- # include <endian.h>
-+#endif
- #else
- # include <sys/endian.h>
--#endif /* __FreeBSD__ */
--#endif
-+#endif /* !defined __FreeBSD__ || __NetBSD__ || __DragonFly__ */
-
- #include <sys/types.h>
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- #include <byteswap.h>
- #else
- #define bswap_16(x) bswap16(x)
- #define bswap_32(x) bswap32(x)
- #define bswap_64(x) bswap64(x)
--#endif /* __FreeBSD__ */
-+#endif /* !defined __FreeBSD__ || __NetBSD__ || __DragonFly__ */
-
- static inline int8_t bswap(const int8_t& x)
- {
diff --git a/multimedia/mlt/patches/patch-ag b/multimedia/mlt/patches/patch-ag
deleted file mode 100644
index aaa1f7f01ee..00000000000
--- a/multimedia/mlt/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/10/19 16:41:31 abs Exp $
-
-# Remove unnecessary byteswap.h as we later include riff.h which includes byteswap.h as needed
-
---- src/modules/kino/riff.cc.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/kino/riff.cc
-@@ -25,9 +25,6 @@
- //#include <stdio.h>
- #include <iostream>
- #include <iomanip>
--#ifndef __FreeBSD__
--#include <byteswap.h>
--#endif /* __FreeBSD__ */
-
- using std::cout;
- using std::hex;
diff --git a/multimedia/mlt/patches/patch-ah b/multimedia/mlt/patches/patch-ah
deleted file mode 100644
index f14883651ae..00000000000
--- a/multimedia/mlt/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2010/10/19 16:41:31 abs Exp $
-
-# Use CXX rather than CC to link c++, to ensure correct handling on more platforms
-
---- src/modules/kino/Makefile.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/kino/Makefile
-@@ -30,7 +30,7 @@ SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cc)
- all: $(TARGET)
-
- $(TARGET): $(OBJS) $(CPPOBJS)
-- $(CC) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
-+ $(CXX) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
-
- depend: $(SRCS)
- $(CC) -MM $(CFLAGS) $^ 1>.depend
diff --git a/multimedia/mlt/patches/patch-ai b/multimedia/mlt/patches/patch-ai
deleted file mode 100644
index ea2702fa08e..00000000000
--- a/multimedia/mlt/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2010/10/19 16:41:31 abs Exp $
-
-# Use CXX rather than CC to link c++, to ensure correct handling on more platforms
-
---- src/modules/qimage/Makefile.orig 2010-09-14 06:00:09.000000000 +0000
-+++ src/modules/qimage/Makefile
-@@ -24,7 +24,7 @@ SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp)
- all: $(TARGET)
-
- $(TARGET): $(OBJS) $(CPPOBJS)
-- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
-+ $(CXX) $(SHFLAGS) -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
-
- depend: $(SRCS)
- $(CC) -MM $(CFLAGS) $(QTCXXFLAGS) $^ 1>.depend
diff --git a/multimedia/mlt/patches/patch-configure b/multimedia/mlt/patches/patch-configure
new file mode 100644
index 00000000000..15d615d90d0
--- /dev/null
+++ b/multimedia/mlt/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2012/11/21 22:24:27 abs Exp $
+
+* Like most other Operating Systems, NetBSD needs -fPIC with -DPIC
+
+--- configure.orig 2012-11-15 03:05:11.000000000 +0000
++++ configure
+@@ -111,7 +111,7 @@ build_config()
+ NetBSD)
+ [ "$optimisations" = "true" ] &&
+ echo "OPTIMISATIONS+=-ffast-math"
+- echo "CFLAGS+=-pthread"
++ echo "CFLAGS+=-fPIC -pthread"
+ echo "SHFLAGS=-shared"
+ echo "RDYNAMIC=-rdynamic"
+ echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
diff --git a/multimedia/mlt/patches/patch-src_modules_videostab_stab_estimate.c b/multimedia/mlt/patches/patch-src_modules_videostab_stab_estimate.c
new file mode 100644
index 00000000000..e7106249d39
--- /dev/null
+++ b/multimedia/mlt/patches/patch-src_modules_videostab_stab_estimate.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_modules_videostab_stab_estimate.c,v 1.1 2012/11/21 22:24:27 abs Exp $
+
+* Add !defined(__NetBSD__) to a list of OS types #if
+
+--- src/modules/videostab/stab/estimate.c.orig 2012-11-15 03:05:11.000000000 +0000
++++ src/modules/videostab/stab/estimate.c
+@@ -18,7 +18,8 @@
+ #include <stdlib.h>
+ #include <math.h>
+ #include <string.h>
+-#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(WIN32)
++/* XXX should probably be "if defined..." not "if !defined..." */
++#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(WIN32)
+ #include <values.h>
+ #endif
+