summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2006-01-24 05:33:21 +0000
committerxtraeme <xtraeme>2006-01-24 05:33:21 +0000
commitd5b092ddb700927f71b09a38ef0acd35ad7b34de (patch)
treea3df6e18c9b22fec7b17bc09476b8cfb33e15eb0 /multimedia
parent0887d5e9ca3e9d28eedeb47b2950e9e3ec0f989b (diff)
downloadpkgsrc-d5b092ddb700927f71b09a38ef0acd35ad7b34de.tar.gz
Welcome to transcode-1.0.2.
The list of changes is very very large... please see the NEWS/Changelog file or use the webbrowser, google... Now transcode uses bsd.options.mk for some dependencies: * liba52 (enabled) * freetype2 (enabled) * mjpegtools (enabled) * mpeg3 (enabled) * lzo (disabled) * libxml2 (enabled) * libdv (disabled) * gtk (disabled) * imagemagick (enabled) Enjoy it! I've used this version on my NetBSD/i386 -current and it worked correctly.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/transcode/Makefile66
-rw-r--r--multimedia/transcode/PLIST61
-rw-r--r--multimedia/transcode/PLIST.i3862
-rw-r--r--multimedia/transcode/distinfo35
-rwxr-xr-xmultimedia/transcode/files/strip_fPIC.sh18
-rw-r--r--multimedia/transcode/options.mk93
-rw-r--r--multimedia/transcode/patches/patch-ad22
-rw-r--r--multimedia/transcode/patches/patch-ae22
-rw-r--r--multimedia/transcode/patches/patch-af13
-rw-r--r--multimedia/transcode/patches/patch-ag22
-rw-r--r--multimedia/transcode/patches/patch-ah22
-rw-r--r--multimedia/transcode/patches/patch-ai22
-rw-r--r--multimedia/transcode/patches/patch-aj22
-rw-r--r--multimedia/transcode/patches/patch-ak22
-rw-r--r--multimedia/transcode/patches/patch-al22
-rw-r--r--multimedia/transcode/patches/patch-an39
-rw-r--r--multimedia/transcode/patches/patch-ao19
-rw-r--r--multimedia/transcode/patches/patch-ap16
-rw-r--r--multimedia/transcode/patches/patch-as55
-rw-r--r--multimedia/transcode/patches/patch-at33
-rw-r--r--multimedia/transcode/patches/patch-au31
-rw-r--r--multimedia/transcode/patches/patch-av18
-rw-r--r--multimedia/transcode/patches/patch-aw32
-rw-r--r--multimedia/transcode/patches/patch-ax141
-rw-r--r--multimedia/transcode/patches/patch-ay32
-rw-r--r--multimedia/transcode/patches/patch-ba49
-rw-r--r--multimedia/transcode/patches/patch-bb49
-rw-r--r--multimedia/transcode/patches/patch-bc13
-rw-r--r--multimedia/transcode/patches/patch-bd13
-rw-r--r--multimedia/transcode/patches/patch-be22
-rw-r--r--multimedia/transcode/patches/patch-bf22
31 files changed, 153 insertions, 895 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index ad9f8482a15..dbc9042ce7e 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,60 +1,42 @@
-# $NetBSD: Makefile,v 1.18 2006/01/09 17:37:46 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 05:33:21 xtraeme Exp $
+#
-DISTNAME= transcode-0.6.12
-PKGREVISION= 9
+DISTNAME= transcode-1.0.2
CATEGORIES= multimedia
MASTER_SITES= http://dl.fkb.wormulon.net/transcode/ \
- http://dl.kel.wormulon.net/transcode/
+ http://dl.kel.wormulon.net/transcode/ \
+ http://kraymer.de/mirroring/ \
+ http://www.jakemsr.com/transcode/
MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.transcoding.org/cgi-bin/transcode
+HOMEPAGE= http://www.transcoding.org/
COMMENT= Command line video-stream processing tool
-BUILD_DEPENDS+= nasm>=0.98.36:../../devel/nasm
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake pkg-config
-USE_TOOLS+= automake gmake
+CONFIGURE_ARGS+= --disable-libpostproc
+CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg-devel}
+CONFIGURE_ARGS+= --enable-oss
+CONFIGURE_ARGS+= --disable-xio
-USE_LIBTOOL= yes
-SHLIBTOOL_OVERRIDE= libtool
+LIBS+= ${LIBOSSAUDIO}
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-qt
-# when libmpeg3 is a shlib.
-CONFIGURE_ARGS+= --without-libmpeg3
-CONFIGURE_ARGS+= --with-default-xvid=xvid4
-CONFIGURE_ARGS+= --with-ft-prefix=${BUILDLINK_PREFIX.freetype2}
-
-# this used to operate on acinclude.m4 and run aclocal, but running
-# aclocal here breaks due to missing DLFCN checking
-post-patch:
- -cd ${WRKSRC} && aclocal && autoconf && automake
- cd ${WRKSRC} && \
- ${SED} "s|/usr/local|${PREFIX}|g; s|include/libmpeg3|include/mpeg3|g; s|-ldl -lm|-lm|g" configure > configure.new && \
- ${MV} configure.new configure && ${CHMOD} a+x configure
- ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
-
-.if ${MACHINE_ARCH} == "i386"
-post-install:
- ${LN} -sf ../libxvidcore.so.4 ${PREFIX}/lib/transcode/libxvidcore.so.4
-.endif
-
-.include "../../archivers/liblzo/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
+.include "options.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
-.include "../../multimedia/libmpeg3/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../multimedia/xvidcore/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../multimedia/libdvdcss/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
index 0577bd9a6dd..c4fe7bc5977 100644
--- a/multimedia/transcode/PLIST
+++ b/multimedia/transcode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/27 12:03:09 veego Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/01/24 05:33:21 xtraeme Exp $
bin/avifix
bin/aviindex
bin/avimerge
@@ -10,14 +10,13 @@ bin/tcdemux
bin/tcextract
bin/tcmodinfo
bin/tcmp3cut
-bin/tcmplex
bin/tcprobe
bin/tcrequant
bin/tcscan
bin/tcxmlcheck
bin/tcxpm2rgb
bin/transcode
-lib/transcode/a52_decore.la
+${A52}lib/transcode/a52_decore.la
lib/transcode/af6_decore.la
lib/transcode/export_ac3.la
lib/transcode/export_af6.conf
@@ -27,20 +26,19 @@ lib/transcode/export_divx4raw.la
lib/transcode/export_divx5.la
lib/transcode/export_divx5raw.la
lib/transcode/export_ffmpeg.la
-lib/transcode/export_im.la
+${IMAGEMAGICK}lib/transcode/export_im.la
lib/transcode/export_jpg.la
lib/transcode/export_lame.la
-lib/transcode/export_lzo.la
lib/transcode/export_mjpeg.la
-lib/transcode/export_mp2enc.la
lib/transcode/export_mp1e.la
-lib/transcode/export_mpeg.la
-lib/transcode/export_mpeg2enc.la
-lib/transcode/export_net.la
+lib/transcode/export_mp2.la
+${IMAGEMAGICK}lib/transcode/export_mp2enc.la
+${IMAGEMAGICK}lib/transcode/export_mpeg2enc.la
lib/transcode/export_null.la
lib/transcode/export_ogg.la
lib/transcode/export_pcm.la
lib/transcode/export_ppm.la
+lib/transcode/export_pvn.la
lib/transcode/export_raw.la
lib/transcode/export_toolame.la
lib/transcode/export_wav.la
@@ -53,9 +51,10 @@ lib/transcode/filter_29to23.la
lib/transcode/filter_32detect.la
lib/transcode/filter_32drop.la
lib/transcode/filter_aclip.la
+lib/transcode/filter_ascii.la
lib/transcode/filter_astat.la
lib/transcode/filter_clone.la
-lib/transcode/filter_compare.la
+${IMAGEMAGICK}lib/transcode/filter_compare.la
lib/transcode/filter_control.la
lib/transcode/filter_cpaudio.la
lib/transcode/filter_cshift.la
@@ -70,14 +69,17 @@ lib/transcode/filter_dnr.la
lib/transcode/filter_doublefps.la
lib/transcode/filter_extsub.la
lib/transcode/filter_extsub2.la
+lib/transcode/filter_facemask.la
+lib/transcode/filter_fieldanalysis.la
lib/transcode/filter_fields.la
lib/transcode/filter_fps.la
lib/transcode/filter_hqdn3d.la
lib/transcode/filter_invert.la
lib/transcode/filter_ivtc.la
+lib/transcode/filter_levels.la
lib/transcode/filter_list.awk
-lib/transcode/filter_logo.la
-lib/transcode/filter_logoaway.la
+${IMAGEMAGICK}lib/transcode/filter_logo.la
+${IMAGEMAGICK}lib/transcode/filter_logoaway.la
lib/transcode/filter_lowpass.la
lib/transcode/filter_mask.la
lib/transcode/filter_modfps.la
@@ -85,7 +87,6 @@ lib/transcode/filter_msharpen.la
lib/transcode/filter_nored.la
lib/transcode/filter_normalize.la
lib/transcode/filter_null.la
-lib/transcode/filter_pp.la
lib/transcode/filter_pv.la
lib/transcode/filter_resample.la
lib/transcode/filter_skip.la
@@ -94,12 +95,13 @@ lib/transcode/filter_smartbob.la
lib/transcode/filter_smartdeinter.la
lib/transcode/filter_smartyuv.la
lib/transcode/filter_smooth.la
-lib/transcode/filter_subtitler.la
+${MJPEGTOOLS}lib/transcode/filter_subtitler.la
lib/transcode/filter_tc_audio.la
lib/transcode/filter_tc_video.la
lib/transcode/filter_test.la
lib/transcode/filter_testframe.la
-lib/transcode/filter_text.la
+${FREETYPE2}lib/transcode/filter_text.la
+lib/transcode/filter_tomsmocomp.la
lib/transcode/filter_unsharp.la
lib/transcode/filter_videocore.la
lib/transcode/filter_whitebalance.la
@@ -109,23 +111,24 @@ lib/transcode/filter_yuvmedian.la
lib/transcode/filter_yuy2toyv12.la
lib/transcode/import_ac3.la
lib/transcode/import_avi.la
+lib/transcode/import_bsdav.la
lib/transcode/import_divx.la
lib/transcode/import_dv.la
lib/transcode/import_dvd.la
+lib/transcode/import_ffbin.la
lib/transcode/import_ffmpeg.la
lib/transcode/import_fraps.la
-lib/transcode/import_im.la
-lib/transcode/import_imlist.la
lib/transcode/import_lav.la
-lib/transcode/import_lzo.la
lib/transcode/import_mp3.la
lib/transcode/import_mpeg2.la
+${MPEG3}lib/transcode/import_mpeg3.la
lib/transcode/import_mplayer.la
-lib/transcode/import_net.la
lib/transcode/import_null.la
lib/transcode/import_nuv.la
lib/transcode/import_nvrec.la
lib/transcode/import_ogg.la
+lib/transcode/import_oss.la
+lib/transcode/import_pvn.la
lib/transcode/import_raw.la
lib/transcode/import_rawlist.la
lib/transcode/import_sh.la
@@ -156,9 +159,11 @@ man/man1/tcscan.1
man/man1/tcxmlcheck.1
man/man1/transcode.1
share/doc/transcode/ChangeLog
+share/doc/transcode/DV-to-DVD-HOWTO.txt
share/doc/transcode/OPTIMIZERS
share/doc/transcode/README.Inverse.Telecine.txt
share/doc/transcode/README.cluster
+share/doc/transcode/README.dv
share/doc/transcode/README.filter.modfps
share/doc/transcode/README.rip
share/doc/transcode/README.sync
@@ -169,8 +174,10 @@ share/doc/transcode/avi_comments.txt
share/doc/transcode/clone.txt
share/doc/transcode/export-API.txt
share/doc/transcode/export_ffmpeg.txt
+share/doc/transcode/export_mp2.txt
share/doc/transcode/export_mpeg.txt
share/doc/transcode/export_pvm.txt
+share/doc/transcode/faq
share/doc/transcode/filter-API.txt
share/doc/transcode/filter-socket.txt
share/doc/transcode/filter_dnr.txt
@@ -179,26 +186,15 @@ share/doc/transcode/filter_logoaway.txt
share/doc/transcode/filter_text.txt
share/doc/transcode/filter_yuvdenoise.txt
share/doc/transcode/framerate.txt
-share/doc/transcode/html/about.html
-share/doc/transcode/html/anim.html
-share/doc/transcode/html/cluster_guide.txt
-share/doc/transcode/html/core.html
share/doc/transcode/html/dv.html
share/doc/transcode/html/dvd.html
-share/doc/transcode/html/export_af6.html
share/doc/transcode/html/export_divx.html
share/doc/transcode/html/export_divx4.php
share/doc/transcode/html/export_divx5.php
share/doc/transcode/html/export_fame.php
-share/doc/transcode/html/export_iv50.html
-share/doc/transcode/html/export_null.html
share/doc/transcode/html/export_ogg.php
share/doc/transcode/html/export_opendivx.php
-share/doc/transcode/html/export_raw.html
share/doc/transcode/html/export_xvid.php
-share/doc/transcode/html/faq.html
-share/doc/transcode/html/filter.html
-share/doc/transcode/html/import_ac3.html
share/doc/transcode/html/import_avi.html
share/doc/transcode/html/import_dv.html
share/doc/transcode/html/import_dvd.html
@@ -222,7 +218,6 @@ share/doc/transcode/html/misc.html
share/doc/transcode/html/modules.html
share/doc/transcode/html/mpeg.html
share/doc/transcode/html/new.png
-share/doc/transcode/html/options.html
share/doc/transcode/html/other.html
share/doc/transcode/html/post.html
share/doc/transcode/html/pre.html
@@ -235,12 +230,16 @@ share/doc/transcode/html/sub3-00000.png
share/doc/transcode/html/subtitles.html
share/doc/transcode/html/table.php
share/doc/transcode/html/tc.png
+share/doc/transcode/ibp_support.txt
share/doc/transcode/import-API.txt
share/doc/transcode/import-xml.txt
share/doc/transcode/import_nvrec.txt
share/doc/transcode/import_v4l2.txt
+share/doc/transcode/import_yuv.txt
share/doc/transcode/pvm.cfg
+share/doc/transcode/release-notes/README-0.6.13
share/doc/transcode/template.cfg.txt
+@dirrm share/doc/transcode/release-notes
@dirrm share/doc/transcode/html
@dirrm share/doc/transcode
@dirrm lib/transcode
diff --git a/multimedia/transcode/PLIST.i386 b/multimedia/transcode/PLIST.i386
deleted file mode 100644
index 98c1e1fd300..00000000000
--- a/multimedia/transcode/PLIST.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2005/02/27 12:03:09 veego Exp $
-lib/transcode/libxvidcore.so.4
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index 01538fab544..867c3f018a3 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,30 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/10/10 21:23:24 joerg Exp $
+$NetBSD: distinfo,v 1.8 2006/01/24 05:33:21 xtraeme Exp $
-SHA1 (transcode-0.6.12.tar.gz) = 3d9b223f804253a6a76d9645feb86609b0a2499a
-RMD160 (transcode-0.6.12.tar.gz) = 81d2d70fdb9398f97aa5b59b31ff4243c8f31b2f
-Size (transcode-0.6.12.tar.gz) = 3454807 bytes
-SHA1 (patch-ad) = dc3777cbfd86eba3d62c0bfa947e9877c6c44fea
-SHA1 (patch-ae) = f49a155b84edbeb3c93705e6ab15e80f48adbdb1
-SHA1 (patch-af) = 88d2209445c4011f400ae2dd79d9e285aecd3f0a
-SHA1 (patch-ag) = 85c3f8cd84ce0cfaf3aa70c044ba5eaa96267ea4
-SHA1 (patch-ah) = 7c401876c7f74dfd62edfb39575eebbf130cad42
-SHA1 (patch-ai) = 8437ea9d0bd0b08f0e8156e373f338084d68f2cd
-SHA1 (patch-aj) = f62d0e1e23868b290221cffc367c3f0a5cc5cbc6
-SHA1 (patch-ak) = add9a293ddb73e3f82982d2021a6310f742e45f1
-SHA1 (patch-al) = 797bd770565263452d47e2f4d8942974ef153553
-SHA1 (patch-an) = ee416096f1fc6b8ff74f80f93cc5e40d4ad49223
-SHA1 (patch-ao) = e6f1006e5aa4663259e1e2fd2355dbfc32bda8f5
-SHA1 (patch-ap) = fb393e3400423a5d4225fb31afabfbcaa265a35b
-SHA1 (patch-as) = d673ec6009d96f55afcf8382f834edc2cadd2ae3
-SHA1 (patch-at) = f598541e1ea9c7e6fcd93d7f2704397b5bdb5cd8
-SHA1 (patch-au) = 0e9731f693f209d1c2bd4b28e71c03cab94020ea
-SHA1 (patch-av) = 54ddd6059718a25ec9fdd6635c320f9e22d3ba1e
-SHA1 (patch-aw) = 67eec98cc21459a133cae1d0a3297201e93657e9
-SHA1 (patch-ax) = 6392a3c76ca1bd83cea9b41966820f159ff33a50
-SHA1 (patch-ay) = 1e827c6f88d8347521e8b16629b013d87d3539ec
-SHA1 (patch-ba) = 65d1dfbbce181941d145359ef32f8d8c28adce3e
-SHA1 (patch-bb) = 2bec18cdca63ef4d0cc6c1caf8837890c9e116c6
-SHA1 (patch-bc) = f6a0f0dd550d798bb8919f40dea7df899beac3a1
-SHA1 (patch-bd) = ffca7a74422e0dac82d1a728b9c6ceef24f744cb
-SHA1 (patch-be) = 05bece81e5d45fd493ce6d5cbeda97226f363237
-SHA1 (patch-bf) = b0a7e5353578ef82f8113b4938ecf81708bf2b8a
+SHA1 (transcode-1.0.2.tar.gz) = 831a55a0218913e43261eb614ccca34a0d1b3d0d
+RMD160 (transcode-1.0.2.tar.gz) = 5a07777093b3d395180396a662dc765c179cd687
+Size (transcode-1.0.2.tar.gz) = 2347861 bytes
+SHA1 (patch-aa) = 01c2093ff606b4a0744dd0b8e5422277d081b8f2
+SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2
diff --git a/multimedia/transcode/files/strip_fPIC.sh b/multimedia/transcode/files/strip_fPIC.sh
deleted file mode 100755
index 007c94fb0a5..00000000000
--- a/multimedia/transcode/files/strip_fPIC.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# libtool assumes that the compiler can handle the -fPIC flag
-# This isn't always true (for example, nasm can't handle it)
-command=""
-while [ $# -gt 0 ]; do
- case "$1" in
- -?PIC)
- # Ignore -fPIC and -DPIC options
- ;;
- *)
- command="$command $1"
- ;;
- esac
- shift
-done
-echo $command
-exec $command
diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk
new file mode 100644
index 00000000000..5a28f71c0aa
--- /dev/null
+++ b/multimedia/transcode/options.mk
@@ -0,0 +1,93 @@
+# $NetBSD: options.mk,v 1.1 2006/01/24 05:33:21 xtraeme Exp $
+#
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.transcode
+PKG_SUPPORTED_OPTIONS= a52 freetype2 mjpegtools mpeg3 lzo libxml2
+PKG_SUPPORTED_OPTIONS+= libdv gtk imagemagick
+
+PKG_SUGGESTED_OPTIONS= a52 freetype2 mjpegtools mpeg3 libxml2 imagemagick
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Ma52)
+. include "../../audio/liba52/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-a52
+CONFIGURE_ARGS+= --enable-a52-default-decoder
+PLIST_SUBST+= A52=
+.else
+PLIST_SUBST+= A52='@comment '
+CONFIGURE_ARGS+= --disable-a52
+.endif
+
+.if !empty(PKG_OPTIONS:Mfreetype2)
+. include "../../graphics/freetype2/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-freetype2
+PLIST_SUBST+= FREETYPE2=
+.else
+PLIST_SUBST+= FREETYPE2='@comment '
+CONFIGURE_ARGS+= --disable-freetype2
+.endif
+
+.if !empty(PKG_OPTIONS:Mmjpegtools)
+. include "../../multimedia/mjpegtools/buildlink3.mk"
+PLIST_SUBST+= MJPEGTOOLS=
+CONFIGURE_ARGS+= --enable-mjpegtools
+.else
+PLIST_SUBST+= MJPEGTOOLS='@comment '
+CONFIGURE_ARGS+= --disable-mjpegtools
+.endif
+
+.if !empty(PKG_OPTIONS:Mmpeg3)
+PLIST_SUBST+= MPEG3=
+. include "../../multimedia/libmpeg3/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-libmpeg3
+.else
+PLIST_SUBST+= MPEG3='@comment '
+CONFIGURE_ARGS+= --disable-libmpeg3
+.endif
+
+.if !empty(PKG_OPTIONS:Mlzo)
+PLIST_SUBST+= LZO=
+. include "../../archivers/lzo/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-lzo
+CONFIGURE_ARGS+= --with-lzo-includes=${BUILDLINK_PREFIX.lzo}/include/lzo
+.else
+PLIST_SUBST+= LZO='@comment '
+CONFIGURE_ARGS+= --disable-lzo
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibxml2)
+PLIST_SUBST+= LIBXML2=
+. include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-libxml2
+.else
+PLIST_SUBST+= LIBXML2='@comment '
+CONFIGURE_ARGS+= --disable-libxml2
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibdv)
+CONFIGURE_ARGS+= LIBDV=
+. include "../../multimedia/libdv/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-libdv
+.else
+CONFIGURE_ARGS+= LIBDV='@comment '
+CONFIGURE_ARGS+= --disable-libdv
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+PLIST_SUBST+= GTK=
+. include "../../x11/gtk/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-gtk
+.else
+PLIST_SUBST+= GTK='@comment '
+CONFIGURE_ARGS+= --disable-gtk
+.endif
+
+.if !empty(PKG_OPTIONS:Mimagemagick)
+PLIST_SUBST+= IMAGEMAGICK=
+. include "../../graphics/ImageMagick/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-imagemagick
+.else
+PLIST_SUBST+= IMAGEMAGICK='@comment '
+CONFIGURE_ARGS+= --disable-imagemagick
+.endif
diff --git a/multimedia/transcode/patches/patch-ad b/multimedia/transcode/patches/patch-ad
deleted file mode 100644
index 3414245e3ec..00000000000
--- a/multimedia/transcode/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp filter/yuvdenoise/mjpeg_types.h filter/yuvdenoise/mjpeg_types.h
-*** filter/yuvdenoise/mjpeg_types.h Fri Mar 14 22:12:41 2003
---- filter/yuvdenoise/mjpeg_types.h Mon Jun 9 17:48:25 2003
-*************** typedef u_int64_t uint64_t;
-*** 58,64 ****
- /* fixme */
- #endif /* HAVE_STDINT_H */
-
-! #if defined(__FreeBSD__)
- #include <sys/types.h> /* FreeBSD - ssize_t */
- #endif
-
---- 58,64 ----
- /* fixme */
- #endif /* HAVE_STDINT_H */
-
-! #if defined(__FreeBSD__)|| defined(__NetBSD__)
- #include <sys/types.h> /* FreeBSD - ssize_t */
- #endif
-
diff --git a/multimedia/transcode/patches/patch-ae b/multimedia/transcode/patches/patch-ae
deleted file mode 100644
index 23bfd21d4f4..00000000000
--- a/multimedia/transcode/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp import/import_divx.c import/import_divx.c
-*** import/import_divx.c Mon May 12 16:46:50 2003
---- import/import_divx.c Mon Jun 9 17:46:50 2003
-*************** static unsigned char *bufalloc(size_t si
-*** 158,164 ****
- }
-
- static int divx_init(char *path) {
-! #ifdef __FreeBSD__
- const
- #endif
- char *error;
---- 158,164 ----
- }
-
- static int divx_init(char *path) {
-! #if defined(__FreeBSD__) || defined(__NetBSD__)
- const
- #endif
- char *error;
diff --git a/multimedia/transcode/patches/patch-af b/multimedia/transcode/patches/patch-af
deleted file mode 100644
index 3559faba71d..00000000000
--- a/multimedia/transcode/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- import/import_xvid.c 2004-03-26 19:12:32.000000000 +0000
-+++ import/import_xvid.c 2004-03-26 19:12:42.000000000 +0000
-@@ -67,7 +67,7 @@
- #define XVID_SHARED_LIB_NAME "libxvidcore.so"
-
- static int xvid2_init(char *path) {
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
- const
- #endif
- char *error;
diff --git a/multimedia/transcode/patches/patch-ag b/multimedia/transcode/patches/patch-ag
deleted file mode 100644
index 53e5f9f5243..00000000000
--- a/multimedia/transcode/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/10/10 21:23:24 joerg Exp $
-
-diff -rcp import/iodump.c import/iodump.c
-*** import/iodump.c Wed Apr 2 19:03:05 2003
---- import/iodump.c Mon Jun 9 17:47:23 2003
-***************
-*** 37,43 ****
- #include "dvd_reader.h"
- #endif
-
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__)
- typedef off_t off64_t;
- #define lseek64 lseek
- #endif
---- 37,43 ----
- #include "dvd_reader.h"
- #endif
-
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
- typedef off_t off64_t;
- #define lseek64 lseek
- #endif
diff --git a/multimedia/transcode/patches/patch-ah b/multimedia/transcode/patches/patch-ah
deleted file mode 100644
index 5099edd2a05..00000000000
--- a/multimedia/transcode/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/10/10 21:23:24 joerg Exp $
-
-diff -rcp import/nuv/rtjpeg_aud_plugin.c import/nuv/rtjpeg_aud_plugin.c
-*** import/nuv/rtjpeg_aud_plugin.c Tue Apr 8 20:50:11 2003
---- import/nuv/rtjpeg_aud_plugin.c Mon Jun 9 17:47:33 2003
-*************** int rtjpeg_aud_open(char *tplorg)
-*** 108,114 ****
- regions[0].end = -1;
- }
-
-! #if defined(__FreeBSD__) || defined(__APPLE__)
- rtjpeg_aud_file=open(tplorg, O_RDONLY);
- #else
- rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
---- 108,114 ----
- regions[0].end = -1;
- }
-
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
- rtjpeg_aud_file=open(tplorg, O_RDONLY);
- #else
- rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/multimedia/transcode/patches/patch-ai b/multimedia/transcode/patches/patch-ai
deleted file mode 100644
index a8c2fbf45ff..00000000000
--- a/multimedia/transcode/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/10/10 21:23:24 joerg Exp $
-
-diff -rcp import/nuv/rtjpeg_vid_plugin.c import/nuv/rtjpeg_vid_plugin.c
-*** import/nuv/rtjpeg_vid_plugin.c Tue Apr 8 20:50:11 2003
---- import/nuv/rtjpeg_vid_plugin.c Mon Jun 9 17:47:40 2003
-*************** int rtjpeg_vid_open(char *tplorg)
-*** 108,114 ****
- regions[0].end = -1;
- }
-
-! #if defined(__FreeBSD__) || defined(__APPLE__)
- rtjpeg_vid_file=open(tplorg, O_RDONLY);
- #else
- rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
---- 108,114 ----
- regions[0].end = -1;
- }
-
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
- rtjpeg_vid_file=open(tplorg, O_RDONLY);
- #else
- rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/multimedia/transcode/patches/patch-aj b/multimedia/transcode/patches/patch-aj
deleted file mode 100644
index 99152d60581..00000000000
--- a/multimedia/transcode/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp src/dl_loader.c src/dl_loader.c
-*** src/dl_loader.c Wed Apr 30 18:14:28 2003
---- src/dl_loader.c Mon Jun 9 17:45:34 2003
-*************** int tca_import(int opt, void *para1, voi
-*** 128,134 ****
-
- void *load_module(char *mod_name, int mode)
- {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
- const
- #endif
- char *error;
---- 128,134 ----
-
- void *load_module(char *mod_name, int mode)
- {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
- const
- #endif
- char *error;
diff --git a/multimedia/transcode/patches/patch-ak b/multimedia/transcode/patches/patch-ak
deleted file mode 100644
index a6eb4f54924..00000000000
--- a/multimedia/transcode/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp src/filter.c src/filter.c
-*** src/filter.c Mon May 12 05:03:00 2003
---- src/filter.c Mon Jun 9 17:45:39 2003
-*************** int filter_unquote_options(char *options
-*** 127,133 ****
- }
-
- int load_plugin(char *path) {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
- const
- #endif
- char *error;
---- 127,133 ----
- }
-
- int load_plugin(char *path) {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
- const
- #endif
- char *error;
diff --git a/multimedia/transcode/patches/patch-al b/multimedia/transcode/patches/patch-al
deleted file mode 100644
index 926f66304db..00000000000
--- a/multimedia/transcode/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp src/iodir.c src/iodir.c
-*** src/iodir.c Sun Mar 9 00:42:49 2003
---- src/iodir.c Mon Jun 9 17:45:31 2003
-***************
-*** 25,31 ****
- #include <dirent.h>
- #include "ioaux.h"
-
-! #if defined(__bsdi__) || defined(__FreeBSD__)
- typedef off_t off64_t;
- #define lseek64 lseek
- #endif
---- 25,31 ----
- #include <dirent.h>
- #include "ioaux.h"
-
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
- typedef off_t off64_t;
- #define lseek64 lseek
- #endif
diff --git a/multimedia/transcode/patches/patch-an b/multimedia/transcode/patches/patch-an
deleted file mode 100644
index 01df579f652..00000000000
--- a/multimedia/transcode/patches/patch-an
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp tools/tcmodinfo.c tools/tcmodinfo.c
-*** tools/tcmodinfo.c Mon May 12 19:44:12 2003
---- tools/tcmodinfo.c Mon Jun 9 17:48:49 2003
-*************** void tc_error(char *string)
-*** 102,108 ****
-
- void *load_module(char *mod_name, char *mod_path, int mode)
- {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
- const
- #endif
- char *error;
---- 102,108 ----
-
- void *load_module(char *mod_name, char *mod_path, int mode)
- {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
- const
- #endif
- char *error;
-*************** void *load_module(char *mod_name, char *
-*** 186,192 ****
-
-
- int load_plugin(char *path, int id) {
-! #if defined(__FreeBSD__) || defined(__APPLE__)
- const
- #endif
- char *error;
---- 186,192 ----
-
-
- int load_plugin(char *path, int id) {
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
- const
- #endif
- char *error;
diff --git a/multimedia/transcode/patches/patch-ao b/multimedia/transcode/patches/patch-ao
deleted file mode 100644
index 94e7bbb718c..00000000000
--- a/multimedia/transcode/patches/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- avilib/Makefile.am 2004-03-26 19:14:20.000000000 +0000
-+++ avilib/Makefile.am 2004-03-26 19:14:30.000000000 +0000
-@@ -3,12 +3,12 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
-
--noinst_LIBRARIES = libavi.a
-+noinst_LTLIBRARIES = libavi.la
-
- INCLUDES = -I./
-
- CFLAGS=-funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
--libavi_a_SOURCES = avilib.c avidump.c avimisc.c
-+libavi_la_SOURCES = avilib.c avidump.c avimisc.c
-
- EXTRA_DIST = avilib.h README.avilib os.h
-
diff --git a/multimedia/transcode/patches/patch-ap b/multimedia/transcode/patches/patch-ap
deleted file mode 100644
index 62b884e9049..00000000000
--- a/multimedia/transcode/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- ffmpeg/libavcodec/Makefile.am 2004-03-26 19:15:46.000000000 +0000
-+++ ffmpeg/libavcodec/Makefile.am 2004-03-26 19:15:58.000000000 +0000
-@@ -34,9 +34,9 @@
-
- AM_CFLAGS = -O2 -g -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
-
--noinst_LIBRARIES = libtcavcodec.a
-+noinst_LTLIBRARIES = libtcavcodec.la
-
--libtcavcodec_a_SOURCES = \
-+libtcavcodec_la_SOURCES = \
- common.c utils.c mem.c allcodecs.c \
- mpegvideo.c jrevdct.c jfdctfst.c jfdctint.c \
- mpegaudio.c ac3enc.c mjpeg.c resample.c dsputil.c \
diff --git a/multimedia/transcode/patches/patch-as b/multimedia/transcode/patches/patch-as
deleted file mode 100644
index 45a67428be4..00000000000
--- a/multimedia/transcode/patches/patch-as
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2004/05/10 13:47:09 wiz Exp $
-
---- src/decoder.c.orig 2003-12-20 11:49:22.000000000 +0000
-+++ src/decoder.c 2004-03-28 09:16:35.000000000 +0000
-@@ -119,16 +119,12 @@
- }
-
- //wait for threads to terminate
--#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
- pthread_cond_signal(&vframe_list_full_cv);
--#endif
- cc1=pthread_join(vthread, &status);
-
- if(verbose & TC_DEBUG) fprintf(stderr, "(%s) video thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc1, (int) status);
-
--#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
- pthread_cond_signal(&aframe_list_full_cv);
--#endif
- cc2=pthread_join(athread, &status);
-
- if(verbose & TC_DEBUG) fprintf(stderr, "(%s) audio thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc2, (int) status);
-@@ -467,6 +463,7 @@
- pthread_testcancel();
-
- //check buffer fill level
-+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
- pthread_mutex_lock(&vframe_list_lock);
-
- while(vframe_fill_level(TC_BUFFER_FULL)) {
-@@ -481,7 +478,9 @@
- pthread_exit( (int *) 11);
- }
- }
-+
- pthread_mutex_unlock(&vframe_list_lock);
-+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-
- // get a frame buffer or wait
- while((ptr = vframe_register(i))==NULL) {
-@@ -655,6 +654,7 @@
- pthread_testcancel();
-
- //check buffer fill level
-+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
- pthread_mutex_lock(&aframe_list_lock);
-
- while(aframe_fill_level(TC_BUFFER_FULL)) {
-@@ -671,6 +671,7 @@
- }
-
- pthread_mutex_unlock(&aframe_list_lock);
-+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-
- // get a frame buffer or wait
- while((ptr = aframe_register(i))==NULL) {
diff --git a/multimedia/transcode/patches/patch-at b/multimedia/transcode/patches/patch-at
deleted file mode 100644
index 89ca3d9e45b..00000000000
--- a/multimedia/transcode/patches/patch-at
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/05/12 16:19:32 drochner Exp $
-
---- bbmpeg/Makefile.am.orig 2003-09-15 16:30:20.000000000 +0200
-+++ bbmpeg/Makefile.am 2004-05-12 18:38:26.000000000 +0200
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
-
--noinst_LIBRARIES = libbbmpeg.a
-+noinst_LTLIBRARIES = libbbmpeg.la
-
- if HAVE_ASM_NASM
- BB_SRC2 = fdct_mmx.s idct_mmx.s quant_mmx.s motion_mmx.s variance_mmx.s
-@@ -20,7 +20,7 @@
-
- CFLAGS = -funroll-loops -ffast-math @CFLAGS@ $(MMX)
-
--libbbmpeg_a_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
-+libbbmpeg_la_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
-
- noinst_HEADERS = mtable.h mplex.h mmx.h main.h imgresample.h gmo_read.h encaudio.h consts.h consts1.h common.h bbencode.h
-
-@@ -60,7 +60,9 @@
- ASM = @NASM@
- ASMFLAGS = @NASMFLAGS@
-
--%.o: %.s ; $(ASM) -g $(ASMFLAGS) -o $@ $<
-+STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
-+
-+%.lo: %.s ; $(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(ASM) $(ASMFLAGS) -o $@ $<
-
-
-
diff --git a/multimedia/transcode/patches/patch-au b/multimedia/transcode/patches/patch-au
deleted file mode 100644
index edf7804d0d0..00000000000
--- a/multimedia/transcode/patches/patch-au
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/05/12 16:19:32 drochner Exp $
-
---- aclib/Makefile.am.orig 2003-09-15 16:30:20.000000000 +0200
-+++ aclib/Makefile.am 2004-05-12 18:27:06.000000000 +0200
-@@ -2,7 +2,7 @@
-
- AUTOMAKE_OPTIONS = 1.3 foreign
-
--noinst_LIBRARIES = libac.a
-+noinst_LTLIBRARIES = libac.la
-
- if HAVE_ASM_NASM
- ASM_SRC = memcpy.s rescale.s average.s swap.s asm_io.s
-@@ -10,7 +10,7 @@
-
- CFLAGS = -funroll-loops -ffast-math -DLINUX @CFLAGS@
-
--libac_a_SOURCES = cputest.c $(ASM_SRC)
-+libac_la_SOURCES = cputest.c $(ASM_SRC)
-
- EXTRA_DIST = \
- ac.h \
-@@ -26,5 +26,7 @@
- ASM = @NASM@
- ASMFLAGS = @NASMFLAGS@ -g
-
--%.o: %.s ; $(ASM) $(ASMFLAGS) -o $@ $<
-+STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
-+
-+%.lo: %.s ; $(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(ASM) $(ASMFLAGS) -o $@ $<
-
diff --git a/multimedia/transcode/patches/patch-av b/multimedia/transcode/patches/patch-av
deleted file mode 100644
index 488d5604e74..00000000000
--- a/multimedia/transcode/patches/patch-av
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/06/06 02:28:33 sekiya Exp $
-
---- filter/filter_modfps.c.orig 2003-08-19 01:08:57.000000000 +0900
-+++ filter/filter_modfps.c 2004-06-02 21:26:24.000000000 +0900
-@@ -77,6 +77,13 @@
- #include "framebuffer.h"
- #include "optstr.h"
-
-+#if !defined(HAVE_LRINTF)
-+static inline long int lrint(double x)
-+{
-+ return (long)(rint(x));
-+}
-+#endif
-+
- static int show_results=0;
-
- /*-------------------------------------------------
diff --git a/multimedia/transcode/patches/patch-aw b/multimedia/transcode/patches/patch-aw
deleted file mode 100644
index 6e5d3fa738d..00000000000
--- a/multimedia/transcode/patches/patch-aw
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- import/Makefile.am.orig 2003-12-20 20:49:13.000000000 +0900
-+++ import/Makefile.am 2004-08-29 09:15:09.000000000 +0900
-@@ -124,11 +124,11 @@
-
- import_ac3_la_SOURCES = import_ac3.c ioaux.c ac3scan.c
- import_ac3_la_LDFLAGS = -module -avoid-version
--import_ac3_la_LIBADD = $(AC3_LIB) -lm
-+import_ac3_la_LIBADD = -lm
-
- import_vdrac3_la_SOURCES = import_vdrac3.c ioaux.c ac3scan.c
- import_vdrac3_la_LDFLAGS = -module -avoid-version
--import_vdrac3_la_LIBADD = $(AC3_LIB) -lm
-+import_vdrac3_la_LIBADD = -lm
-
- a52_decore_la_SOURCES = a52_decore.c ioaux.c
- a52_decore_la_LDFLAGS = -module -avoid-version
-@@ -148,11 +148,11 @@
-
- import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
- import_vob_la_LDFLAGS = -module -avoid-version
--import_vob_la_LIBADD = $(AC3_LIB) -lm
-+import_vob_la_LIBADD = -lm
-
- import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
- import_dvd_la_LDFLAGS = -module -avoid-version
--import_dvd_la_LIBADD = @DVDREAD_LIBS@ $(AC3_LIB) -lm
-+import_dvd_la_LIBADD = @DVDREAD_LIBS@ -lm
-
- import_dv_la_SOURCES = import_dv.c
- import_dv_la_LDFLAGS = -module -avoid-version
diff --git a/multimedia/transcode/patches/patch-ax b/multimedia/transcode/patches/patch-ax
deleted file mode 100644
index f06b7f33e1f..00000000000
--- a/multimedia/transcode/patches/patch-ax
+++ /dev/null
@@ -1,141 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- export/Makefile.am.orig 2003-12-20 20:49:11.000000000 +0900
-+++ export/Makefile.am 2004-08-29 09:25:46.000000000 +0900
-@@ -3,7 +3,6 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
-
--AC3_LIB=-L../libac3 -lac3_tc
- AC3_INC=-I../libac3 -I$(srcdir)/../libac3
-
- INCLUDES = -I./ -I../ -I$(srcdir)/.. -I../src -I$(srcdir)/../src -I../avilib -I$(srcdir)/../avilib @AVIFILE_CFLAGS@ @LAME_CFLAGS@ $(AC3_INC) @QT_CFLAGS@ -Wall @DV_CFLAGS@ -I../libvo -I$(srcdir)/../libvo @MJPEG_CFLAGS@ @LIBFAME_CFLAGS@ @MAGICK_CFLAGS@ @LIBJPEG_CFLAGS@ -I../libioaux -I$(srcdir)/../libioaux @LZO_CFLAGS@ @PVM3_CFLAGS@ -I../pvm3
-@@ -106,7 +105,7 @@
-
- export_mp1e_la_SOURCES = export_mp1e.c vid_aux.c
- export_mp1e_la_LDFLAGS = -module -avoid-version
--export_mp1e_la_LIBADD = -L../libvo -lvout -lm
-+export_mp1e_la_LIBADD = -lm
-
- export_ogg_la_SOURCES = export_ogg.c
- export_ogg_la_LDFLAGS = -module -avoid-version
-@@ -129,7 +128,7 @@
-
- export_fame_la_SOURCES = export_fame.c aud_aux.c
- export_fame_la_LDFLAGS = -module -avoid-version
--export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ $(AC3_LIB) -lm
-+export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ -lm
-
- export_lame_la_SOURCES = export_lame.c
- export_lame_la_LDFLAGS = -module -avoid-version
-@@ -137,55 +136,55 @@
-
- export_af6_la_SOURCES = export_af6.cpp af6_aux.cpp aud_aux.c
- export_af6_la_LDFLAGS = -module -avoid-version
--export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ $(AC3_LIB) -lm
-+export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ -lm
-
- export_divx4_la_SOURCES = export_divx4.c aud_aux.c divx4_vbr.c
- export_divx4_la_LDFLAGS = -module -avoid-version
--export_divx4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx4_la_LIBADD = @LAME_LIBS@ -lm
-
- export_divx5_la_SOURCES = export_divx5.c aud_aux.c divx4_vbr.c
- export_divx5_la_LDFLAGS = -module -avoid-version
--export_divx5_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx5_la_LIBADD = @LAME_LIBS@ -lm
-
- export_divx5raw_la_SOURCES = export_divx5raw.c aud_aux.c divx4_vbr.c
- export_divx5raw_la_LDFLAGS = -module -avoid-version
--export_divx5raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx5raw_la_LIBADD = @LAME_LIBS@ -lm
-
- export_ffmpeg_la_SOURCES = export_ffmpeg.c aud_aux.c ffmpeg_cfg.c vid_aux.c
- export_ffmpeg_la_LDFLAGS = -module -avoid-version
--export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
-+export_ffmpeg_la_LIBADD = @LAME_LIBS@ -lm
-
- export_divx4raw_la_SOURCES = export_divx4raw.c aud_aux.c divx4_vbr.c
- export_divx4raw_la_LDFLAGS = -module -avoid-version
--export_divx4raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx4raw_la_LIBADD = @LAME_LIBS@ -lm
-
- export_xvid2_la_SOURCES = export_xvid2.c aud_aux.c xvid_vbr.c
- export_xvid2_la_LDFLAGS = -module -avoid-version
--export_xvid2_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_xvid2_la_LIBADD = @LAME_LIBS@ -lm
-
- export_xvid3_la_SOURCES = export_xvid3.c aud_aux.c xvid_vbr.c
- export_xvid3_la_LDFLAGS = -module -avoid-version
--export_xvid3_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_xvid3_la_LIBADD = @LAME_LIBS@ -lm
-
- export_xvid4_la_SOURCES = export_xvid4.c aud_aux.c
- export_xvid4_la_LDFLAGS = -module -avoid-version
--export_xvid4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_xvid4_la_LIBADD = @LAME_LIBS@ -lm
-
- export_raw_la_SOURCES = export_raw.c aud_aux.c
- export_raw_la_LDFLAGS = -module -avoid-version
--export_raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_raw_la_LIBADD = @LAME_LIBS@ -lm
-
- export_lzo_la_SOURCES = export_lzo.c aud_aux.c
- export_lzo_la_LDFLAGS = -module -avoid-version
--export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ $(AC3_LIB) -lm
-+export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ -lm
-
- export_debugppm_la_SOURCES = export_debugppm.c aud_aux.c
- export_debugppm_la_LDFLAGS = -module -avoid-version
--export_debugppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
-+export_debugppm_la_LIBADD = @LAME_LIBS@ -lm
-
- export_ppm_la_SOURCES = export_ppm.c aud_aux.c
- export_ppm_la_LDFLAGS = -module -avoid-version
--export_ppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
-+export_ppm_la_LIBADD = @LAME_LIBS@ -lm
-
- export_mov_la_SOURCES = export_mov.c
- export_mov_la_LDFLAGS = -module -avoid-version
-@@ -193,34 +192,34 @@
-
- export_dvraw_la_SOURCES = export_dvraw.c vid_aux.c
- export_dvraw_la_LDFLAGS = -module -avoid-version
--export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -L../libvo -lvout -lm
-+export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -lm
-
- export_dv_la_SOURCES = export_dv.c aud_aux.c vid_aux.c
- export_dv_la_LDFLAGS = -module -avoid-version
--export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
-+export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ -lm
-
- export_yuv4mpeg_la_SOURCES = export_yuv4mpeg.c aud_aux.c vid_aux.c
- export_yuv4mpeg_la_LDFLAGS = -module -avoid-version
--export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
-+export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -lm
-
- export_mpeg_la_SOURCES = export_mpeg.c vid_aux.c
- export_mpeg_la_LDFLAGS = -module -avoid-version
--export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -L../libvo -lvout -lm
-+export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -lm
-
- export_pvm_la_SOURCES = export_pvm.c ../pvm3/pvm_interface.c ../pvm3/pvm_parser.c ../pvm3/external_codec.c ../pvm3/vob_pack_unpack.c
- export_pvm_la_LDFLAGS = -module -avoid-version
-
- export_mjpeg_la_SOURCES = export_mjpeg.c vid_aux.c aud_aux.c
- export_mjpeg_la_LDFLAGS = -module -avoid-version
--export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
-+export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -lm
-
- export_mpeg2enc_la_SOURCES = export_mpeg2enc.c vid_aux.c
- export_mpeg2enc_la_LDFLAGS = -module -avoid-version
--export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -L../libvo -lvout -lm
-+export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -lm
-
- export_im_la_SOURCES = export_im.c vid_aux.c
- export_im_la_LDFLAGS = -module -avoid-version
--export_im_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout -lm
-+export_im_la_LIBADD = @MAGICK_LIBS@ -lm
-
- pkg_DATA = export_af6.conf xvid2.cfg xvid3.cfg xvid4.cfg
-
diff --git a/multimedia/transcode/patches/patch-ay b/multimedia/transcode/patches/patch-ay
deleted file mode 100644
index 2005ea70710..00000000000
--- a/multimedia/transcode/patches/patch-ay
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- import/Makefile.in.orig 2004-01-07 05:39:15.000000000 +0900
-+++ import/Makefile.in 2004-08-29 09:15:42.000000000 +0900
-@@ -413,11 +413,11 @@
-
- import_ac3_la_SOURCES = import_ac3.c ioaux.c ac3scan.c
- import_ac3_la_LDFLAGS = -module -avoid-version
--import_ac3_la_LIBADD = $(AC3_LIB) -lm
-+import_ac3_la_LIBADD = -lm
-
- import_vdrac3_la_SOURCES = import_vdrac3.c ioaux.c ac3scan.c
- import_vdrac3_la_LDFLAGS = -module -avoid-version
--import_vdrac3_la_LIBADD = $(AC3_LIB) -lm
-+import_vdrac3_la_LIBADD = -lm
-
- a52_decore_la_SOURCES = a52_decore.c ioaux.c
- a52_decore_la_LDFLAGS = -module -avoid-version
-@@ -437,11 +437,11 @@
-
- import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
- import_vob_la_LDFLAGS = -module -avoid-version
--import_vob_la_LIBADD = $(AC3_LIB) -lm
-+import_vob_la_LIBADD = -lm
-
- import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
- import_dvd_la_LDFLAGS = -module -avoid-version
--import_dvd_la_LIBADD = @DVDREAD_LIBS@ $(AC3_LIB) -lm
-+import_dvd_la_LIBADD = @DVDREAD_LIBS@ -lm
-
- import_dv_la_SOURCES = import_dv.c
- import_dv_la_LDFLAGS = -module -avoid-version
diff --git a/multimedia/transcode/patches/patch-ba b/multimedia/transcode/patches/patch-ba
deleted file mode 100644
index c119afc6d2d..00000000000
--- a/multimedia/transcode/patches/patch-ba
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- filter/Makefile.am.orig 2004-08-29 09:04:39.000000000 +0900
-+++ filter/Makefile.am 2004-08-29 09:05:27.000000000 +0900
-@@ -168,11 +168,11 @@
-
- filter_smartbob_la_SOURCES = filter_smartbob.c
- filter_smartbob_la_LDFLAGS = -module -avoid-version
--filter_smartbob_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartbob_la_LIBADD = ../export/vid_aux.lo
-
- filter_smartdeinter_la_SOURCES = filter_smartdeinter.c
- filter_smartdeinter_la_LDFLAGS = -module -avoid-version
--filter_smartdeinter_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartdeinter_la_LIBADD = ../export/vid_aux.lo
-
- filter_normalize_la_SOURCES = filter_normalize.c
- filter_normalize_la_LDFLAGS = -module -avoid-version
-@@ -180,18 +180,18 @@
-
- filter_compare_la_SOURCES = filter_compare.c
- filter_compare_la_LDFLAGS = -module -avoid-version
--filter_compare_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_compare_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
-
- filter_logo_la_SOURCES = filter_logo.c
- filter_logo_la_LDFLAGS = -module -avoid-version
--filter_logo_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_logo_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
-
- filter_xsharpen_la_SOURCES = filter_xsharpen.c
- filter_xsharpen_la_LDFLAGS = -module -avoid-version
-
- filter_msharpen_la_SOURCES = filter_msharpen.c
- filter_msharpen_la_LDFLAGS = -module -avoid-version
--filter_msharpen_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_msharpen_la_LIBADD = ../export/vid_aux.lo
-
- filter_logoaway_la_SOURCES = filter_logoaway.c
- filter_logoaway_la_LDFLAGS = -module -avoid-version
-@@ -217,7 +217,7 @@
-
- filter_whitebalance_la_SOURCES = filter_whitebalance.c
- filter_whitebalance_la_LDFLAGS = -module -avoid-version
--filter_whitebalance_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo -lm
-+filter_whitebalance_la_LIBADD = ../export/vid_aux.lo -lm
-
- EXTRA_DIST = parse_csv.awk filter_list.awk mmx.h
-
diff --git a/multimedia/transcode/patches/patch-bb b/multimedia/transcode/patches/patch-bb
deleted file mode 100644
index e64adda7c6c..00000000000
--- a/multimedia/transcode/patches/patch-bb
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- filter/Makefile.in.orig 2004-08-29 09:04:45.000000000 +0900
-+++ filter/Makefile.in 2004-08-29 09:05:59.000000000 +0900
-@@ -468,11 +468,11 @@
-
- filter_smartbob_la_SOURCES = filter_smartbob.c
- filter_smartbob_la_LDFLAGS = -module -avoid-version
--filter_smartbob_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartbob_la_LIBADD = ../export/vid_aux.lo
-
- filter_smartdeinter_la_SOURCES = filter_smartdeinter.c
- filter_smartdeinter_la_LDFLAGS = -module -avoid-version
--filter_smartdeinter_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartdeinter_la_LIBADD = ../export/vid_aux.lo
-
- filter_normalize_la_SOURCES = filter_normalize.c
- filter_normalize_la_LDFLAGS = -module -avoid-version
-@@ -480,18 +480,18 @@
-
- filter_compare_la_SOURCES = filter_compare.c
- filter_compare_la_LDFLAGS = -module -avoid-version
--filter_compare_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_compare_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
-
- filter_logo_la_SOURCES = filter_logo.c
- filter_logo_la_LDFLAGS = -module -avoid-version
--filter_logo_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_logo_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
-
- filter_xsharpen_la_SOURCES = filter_xsharpen.c
- filter_xsharpen_la_LDFLAGS = -module -avoid-version
-
- filter_msharpen_la_SOURCES = filter_msharpen.c
- filter_msharpen_la_LDFLAGS = -module -avoid-version
--filter_msharpen_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_msharpen_la_LIBADD = ../export/vid_aux.lo
-
- filter_logoaway_la_SOURCES = filter_logoaway.c
- filter_logoaway_la_LDFLAGS = -module -avoid-version
-@@ -517,7 +517,7 @@
-
- filter_whitebalance_la_SOURCES = filter_whitebalance.c
- filter_whitebalance_la_LDFLAGS = -module -avoid-version
--filter_whitebalance_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo -lm
-+filter_whitebalance_la_LIBADD = ../export/vid_aux.lo -lm
-
- EXTRA_DIST = parse_csv.awk filter_list.awk mmx.h
-
diff --git a/multimedia/transcode/patches/patch-bc b/multimedia/transcode/patches/patch-bc
deleted file mode 100644
index cd987e8bbf4..00000000000
--- a/multimedia/transcode/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- src/Makefile.am.orig 2004-08-29 09:10:05.000000000 +0900
-+++ src/Makefile.am 2004-08-29 09:11:20.000000000 +0900
-@@ -13,7 +13,7 @@
-
- #AM_LDFLAGS=`ar t ../ffmpeg/libavcodec/libtcavcodec.a | sed -e '/^__/d' -e 's@^@../ffmpeg/libavcodec/@' | tr '\n' ' '` `ar t ../avilib/libavi.a | sed -e '/^__/d' -e 's@^@../avilib/@' | tr '\n' ' '`
-
--transcode_LDADD= @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -lm
-+transcode_LDADD= @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -L../libac3 -lac3_tc -lm
-
- EXTRA_DIST = \
- audio_trans.h \
diff --git a/multimedia/transcode/patches/patch-bd b/multimedia/transcode/patches/patch-bd
deleted file mode 100644
index 6cb280e9d1c..00000000000
--- a/multimedia/transcode/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- src/Makefile.in.orig 2004-08-29 09:10:12.000000000 +0900
-+++ src/Makefile.in 2004-08-29 09:11:41.000000000 +0900
-@@ -321,7 +321,7 @@
-
-
- #AM_LDFLAGS=`ar t ../ffmpeg/libavcodec/libtcavcodec.a | sed -e '/^__/d' -e 's@^@../ffmpeg/libavcodec/@' | tr '\n' ' '` `ar t ../avilib/libavi.a | sed -e '/^__/d' -e 's@^@../avilib/@' | tr '\n' ' '`
--transcode_LDADD = @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -lm
-+transcode_LDADD = @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -L../libac3 -lac3_tc -lm
-
- EXTRA_DIST = \
- audio_trans.h \
diff --git a/multimedia/transcode/patches/patch-be b/multimedia/transcode/patches/patch-be
deleted file mode 100644
index 490de1b81e1..00000000000
--- a/multimedia/transcode/patches/patch-be
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-be,v 1.1 2005/10/10 21:23:24 joerg Exp $
-
---- configure.in.orig 2005-07-10 17:19:18.000000000 +0000
-+++ configure.in
-@@ -147,7 +147,7 @@ AC_CHECK_LIB(m, lrintf, AC_DEFINE([HAVE_
-
- dnl Replace `main' with a function in pthread libs:
- case "$host" in
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
- pthread_lib="-pthread"
- ;;
-@@ -350,7 +350,7 @@ if test x$have_x86cpu = xtrue ; then
- AC_MSG_CHECKING(for CMOV support)
- if test "$enable_cmov_extension" != "no" ; then
- case "$host" in
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
- cpu_features=`grep -l CMOV /var/run/dmesg.boot`
- if test X"$cpu_features" = X"/var/run/dmesg.boot" ; then
- have_cmov=true
diff --git a/multimedia/transcode/patches/patch-bf b/multimedia/transcode/patches/patch-bf
deleted file mode 100644
index d4edcde2c9d..00000000000
--- a/multimedia/transcode/patches/patch-bf
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2005/10/10 21:23:24 joerg Exp $
-
---- filter/subtitler/frame_list.c.orig 2005-07-10 17:53:50.000000000 +0000
-+++ filter/subtitler/frame_list.c
-@@ -15,7 +15,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- */
-
- #include "subtitler.h"
--
-+#include <stdlib.h>
-
- int hash(s)/* form hash value for string s */
- char *s;
-@@ -33,7 +33,7 @@ return(hashval % FRAME_HASH_SIZE);
-
- char *strsave(char *s) /*save char array s somewhere*/
- {
--char *p, *malloc();
-+char *p;
- if(p = malloc( strlen(s) + 1) ) strcpy(p, s);
- return(p);
- }