transcode: 20070625 -> 1.0.5

4 files changed, 174 insertions, 79 deletions

diff --git a/transcode/.footprint b/transcode/.footprint
index 37b6e03e8..ac8ad96e1 100644
--- a/transcode/.footprint
+++ b/transcode/.footprint
@@ -19,44 +19,44 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/tcscan
 -rwxr-xr-x	root/root	usr/bin/tcxmlcheck
 -rwxr-xr-x	root/root	usr/bin/tcxpm2rgb
--rwxr-xr-x	root/root	usr/bin/tcyait
 -rwxr-xr-x	root/root	usr/bin/transcode
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/transcode/
 -rwxr-xr-x	root/root	usr/lib/transcode/a52_decore.la
 -rwxr-xr-x	root/root	usr/lib/transcode/a52_decore.so
--rw-r--r--	root/root	usr/lib/transcode/dvd-ntsc.cfg
--rw-r--r--	root/root	usr/lib/transcode/dvd-pal.cfg
+-rwxr-xr-x	root/root	usr/lib/transcode/af6_decore.la
+-rwxr-xr-x	root/root	usr/lib/transcode/af6_decore.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ac3.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ac3.so
+-rw-r--r--	root/root	usr/lib/transcode/export_af6.conf
+-rwxr-xr-x	root/root	usr/lib/transcode/export_debugppm.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_debugppm.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_divx4.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_divx4.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_divx4raw.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_divx4raw.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_divx5.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_divx5.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_dv.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_dv.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_dvraw.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_dvraw.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_divx5raw.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_divx5raw.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ffmpeg.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ffmpeg.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_im.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_im.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_jpg.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_jpg.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_lame.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_lame.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_lzo.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_lzo.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_mov.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_mov.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_mjpeg.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_mjpeg.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_mp1e.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_mp1e.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_mp2.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_mp2.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_mp2enc.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_mp2enc.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_mpeg2enc.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_mpeg2enc.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_null.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_null.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ogg.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ogg.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_pcm.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_pcm.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ppm.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ppm.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_pvn.la
@@ -68,10 +68,12 @@ drwxr-xr-x	root/root	usr/lib/transcode/
 -rwxr-xr-x	root/root	usr/lib/transcode/export_wav.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_wav.so
 lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_xvid2.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_xvid2.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_xvid3.la
+-rwxr-xr-x	root/root	usr/lib/transcode/export_xvid3.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_xvid4.la
 -rwxr-xr-x	root/root	usr/lib/transcode/export_xvid4.so
--rwxr-xr-x	root/root	usr/lib/transcode/export_yuv4mpeg.la
--rwxr-xr-x	root/root	usr/lib/transcode/export_yuv4mpeg.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_29to23.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_29to23.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_32detect.la
@@ -84,12 +86,16 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_ascii.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_astat.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_astat.so
--rwxr-xr-x	root/root	usr/lib/transcode/filter_compare.la
--rwxr-xr-x	root/root	usr/lib/transcode/filter_compare.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_clone.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_clone.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_control.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_control.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_cpaudio.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_cpaudio.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_cshift.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_cshift.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_cut.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_cut.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_decimate.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_decimate.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_denoise3d.la
@@ -98,6 +104,8 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_detectclipping.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_detectsilence.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_detectsilence.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_dilyuvmmx.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_dilyuvmmx.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_divxkey.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_divxkey.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_dnr.la
@@ -125,10 +133,6 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_levels.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_levels.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_list.awk
--rwxr-xr-x	root/root	usr/lib/transcode/filter_logo.la
--rwxr-xr-x	root/root	usr/lib/transcode/filter_logo.so
--rwxr-xr-x	root/root	usr/lib/transcode/filter_logoaway.la
--rwxr-xr-x	root/root	usr/lib/transcode/filter_logoaway.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_lowpass.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_lowpass.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_mask.la
@@ -137,14 +141,14 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_modfps.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_msharpen.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_msharpen.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_nored.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_nored.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_normalize.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_normalize.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_null.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_null.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_pp.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_pp.so
--rwxr-xr-x	root/root	usr/lib/transcode/filter_preview.la
--rwxr-xr-x	root/root	usr/lib/transcode/filter_preview.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_pv.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_pv.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_resample.la
@@ -161,8 +165,12 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_smartyuv.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_smooth.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_smooth.so
--rwxr-xr-x	root/root	usr/lib/transcode/filter_subtitler.la
--rwxr-xr-x	root/root	usr/lib/transcode/filter_subtitler.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_tc_audio.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_tc_audio.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_tc_video.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_tc_video.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_test.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_test.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_testframe.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_testframe.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_text.la
@@ -171,38 +179,38 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_tomsmocomp.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_unsharp.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_unsharp.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_videocore.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_videocore.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_whitebalance.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_whitebalance.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_xsharpen.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_xsharpen.so
--rwxr-xr-x	root/root	usr/lib/transcode/filter_yait.la
--rwxr-xr-x	root/root	usr/lib/transcode/filter_yait.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_yuvdenoise.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_yuvdenoise.so
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_yuvmedian.la
 -rwxr-xr-x	root/root	usr/lib/transcode/filter_yuvmedian.so
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_yuy2toyv12.la
+-rwxr-xr-x	root/root	usr/lib/transcode/filter_yuy2toyv12.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ac3.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ac3.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_alsa.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_alsa.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_avi.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_avi.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_bsdav.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_bsdav.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_divx.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_divx.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_dv.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_dv.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_dvd.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_dvd.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_ffbin.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_ffbin.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ffmpeg.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ffmpeg.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_im.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_im.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_imlist.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_imlist.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_lzo.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_lzo.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_mov.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_mov.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_fraps.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_fraps.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_lav.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_lav.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_mp3.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_mp3.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_mpeg2.la
@@ -211,31 +219,35 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_mplayer.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_null.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_null.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_nuv.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_nuv.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_nvrec.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_nvrec.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ogg.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ogg.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_pvn.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_pvn.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_raw.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_raw.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_vag.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_vag.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_rawlist.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_rawlist.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_sh.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_sh.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_vdrac3.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_vdrac3.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_vnc.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_vnc.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_vob.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_vob.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_x11.la
--rwxr-xr-x	root/root	usr/lib/transcode/import_x11.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_xml.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_xml.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_xvid.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_xvid.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_yuv.la
+-rwxr-xr-x	root/root	usr/lib/transcode/import_yuv.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_yuv4mpeg.la
 -rwxr-xr-x	root/root	usr/lib/transcode/import_yuv4mpeg.so
 -rwxr-xr-x	root/root	usr/lib/transcode/parse_csv.awk
--rw-r--r--	root/root	usr/lib/transcode/svcd-ntsc.cfg
--rw-r--r--	root/root	usr/lib/transcode/svcd-pal.cfg
--rw-r--r--	root/root	usr/lib/transcode/vcd-ntsc.cfg
--rw-r--r--	root/root	usr/lib/transcode/vcd-pal.cfg
--rw-r--r--	root/root	usr/lib/transcode/xvcd-ntsc.cfg
--rw-r--r--	root/root	usr/lib/transcode/xvcd-pal.cfg
+-rw-r--r--	root/root	usr/lib/transcode/xvid2.cfg
+-rw-r--r--	root/root	usr/lib/transcode/xvid3.cfg
 -rw-r--r--	root/root	usr/lib/transcode/xvid4.cfg
diff --git a/transcode/.md5sum b/transcode/.md5sum
index 9691487c2..10a55e667 100644
--- a/transcode/.md5sum
+++ b/transcode/.md5sum
@@ -1,2 +1,3 @@
+e2343d44e73c8b6dd98482aa3fd848cb  ImageMagick-library-rename-fix.patch
 c0bd49a88f667c68c4430ad25bbed510  subtitleripper-0.3-4.tgz
-abe0785ebe05a9ae26f6d004319de27a  transcode-snapshot-20070625.tar.bz2
+124a6055d304fa2d8577d7380e2bcb0c  transcode-1.0.5.tar.bz2
diff --git a/transcode/ImageMagick-library-rename-fix.patch b/transcode/ImageMagick-library-rename-fix.patch
new file mode 100644
index 000000000..21fca5ada
--- /dev/null
+++ b/transcode/ImageMagick-library-rename-fix.patch
@@ -0,0 +1,47 @@
+diff -pruN transcode-1.0.5.orig/configure transcode-1.0.5/configure
+--- transcode-1.0.5.orig/configure	2008-03-03 20:36:05.000000000 +0000
++++ transcode-1.0.5/configure	2008-03-03 20:37:48.000000000 +0000
+@@ -1909,7 +1909,7 @@ Optional Packages:
+                           are installed (/usr/include)
+   --with-imagemagick-libs=DIR
+                           directory where imagemagick libararies
+-                          (libMagick.so) are installed (/usr/lib)
++                          (libMagickCore.so) are installed (/usr/lib)
+   --with-libjpegmmx-prefix=PFX
+                           prefix where libjpegmmx is installed (/usr)
+   --with-libjpegmmx-includes=DIR
+@@ -41233,7 +41233,7 @@ echo "${ECHO_T}default" >&6; }
+   for l in $imagemagick_ll ; do
+     case $l in
+       -L*) lpaths="$lpaths $l" ;;
+-      -l*) test x"$l" != x"-lMagick" && xlibs="$xlibs $l" ;;
++      -l*) test x"$l" != x"-lMagickCore" && xlibs="$xlibs $l" ;;
+         *) xlf="$xlf $l" ;;
+     esac
+   done
+@@ -41249,13 +41249,13 @@ echo "${ECHO_T}default" >&6; }
+   if test x"Magick" != x"none" ; then
+     save_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$LDFLAGS $imagemagick_ll"
+-    { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagick" >&5
+-echo $ECHO_N "checking for InitializeMagick in -lMagick... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagickCore" >&5
++echo $ECHO_N "checking for InitializeMagick in -lMagickCore... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Magick_InitializeMagick+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lMagick $IMAGEMAGICK_EXTRA_LIBS $LIBS"
++LIBS="-lMagickCore $IMAGEMAGICK_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41311,7 +41311,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_Magick_InitializeMagick" >&5
+ echo "${ECHO_T}$ac_cv_lib_Magick_InitializeMagick" >&6; }
+ if test $ac_cv_lib_Magick_InitializeMagick = yes; then
+-  IMAGEMAGICK_LIBS="$imagemagick_ll -lMagick $IMAGEMAGICK_EXTRA_LIBS"
++  IMAGEMAGICK_LIBS="$imagemagick_ll -lMagickCore $IMAGEMAGICK_EXTRA_LIBS"
+ else
+ 
+ tc_pkg_err="yes"
diff --git a/transcode/Pkgfile b/transcode/Pkgfile
index 0d6081063..3253d552b 100644
--- a/transcode/Pkgfile
+++ b/transcode/Pkgfile
@@ -2,47 +2,82 @@
 # URL: http://www.transcoding.org/cgi-bin/transcode
 # Maintainer: Danny Rawlins, romster at shortcircuit dot net dot au
 # Packager: Martin Opel, mo at obbl-net dot de
-# Depends on: imagemagick avifile libdvdnav libfame lzo mjpegtools mpeg2dec mplayer xorg-libxaw xorg-libxpm xorg-libxv
+# Depends on: ffmpeg mpeg2dec libdvdnav liba52 xorg-libxv
+# Optional: avifile libtheora libdv libquicktime lzo mjpegtools libfame imagemagick
 
 name=transcode
-version=20070625
+version=1.0.5
 release=1
-source=(http://romster.shortcircuit.net.au/crux/source/transcode-snapshot-$version.tar.bz2 \
-	http://dl.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz)
+source=(http://transcode.kabewm.com/transcode-$version.tar.bz2 \
+	http://dl.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz \
+	ImageMagick-library-rename-fix.patch)
 
 build() {
-	cd transcode
-
-	./configure \
-		--prefix=/usr \
-		--disable-experimental \
-		--enable-alsa \
-		--enable-avifile \
-		--enable-ogg \
-		--enable-vorbis \
-		--enable-libdv \
-		--enable-libquicktime \
-		--enable-lzo \
-		--enable-a52 \
-		--enable-faac \
-		--enable-libxml2 \
-		--enable-mjpegtools \
-		--enable-libfame \
-		--enable-imagemagick \
-		--enable-netstream \
-		--enable-freetype2 \
-		--enable-libpostproc \
-		--enable-theora
+	local config
+	
+	cd transcode-$version
+
+	patch -p1 -i ../ImageMagick-library-rename-fix.patch
+
+	if pkginfo -i |grep '^avifile ' > /dev/null; then
+		config="--enable-avifile"
+	fi
+
+	if pkginfo -i |grep '^libtheora ' > /dev/null; then
+                config="$config --enable-theora"
+        fi
+
+	if pkginfo -i |grep '^libdv ' > /dev/null; then
+                config="$config --enable-libdv"
+        fi
+
+	if pkginfo -i |grep '^libquicktime ' > /dev/null; then
+                config="$config --enable-libquicktime"
+        fi
+
+	if pkginfo -i |grep '^lzo ' > /dev/null; then
+                config="$config --enable-lzo"
+		#config="$config  --with-lzo-includes='/usr/include/lzo'" # doesn't work? have to use the line below.
+		export CPPFLAGS="-I/usr/include/lzo"
+        fi
+
+	if pkginfo -i |grep '^mjpegtools ' > /dev/null; then
+                config="$config --enable-mjpegtools"
+        fi
+
+	if pkginfo -i |grep '^libfame ' > /dev/null; then
+                config="$config --enable-fame"
+        fi
+
+	if pkginfo -i |grep '^imagemagick ' > /dev/null; then
+                config="$config --enable-imagemagick"
+		#config="$config --with-imagemagick-includes='/usr/include/ImageMagick'" # doesn't work? have to use the line below.
+		export CPPFLAGS="$CPPFLAGS `pkg-config ImageMagick --cflags-only-I`"
+        fi
+
+	CFLAGS="-O3 `echo $CFLAGS |sed -e 's/-O[s0-3] //'`" \
+		./configure \
+			--prefix=/usr \
+			--enable-libpostproc \
+			--enable-freetype2 \
+			--enable-a52 \
+			--enable-a52-default-decoder \
+			--enable-ogg \
+			--enable-vorbis \
+			--enable-libxml2 \
+			--enable-sdl \
+			$config
 
 	make
 	make DESTDIR=$PKG install
+	if [ -n "$CPPFLAGS" ]; then unset CPPFLAGS; fi
 	rm -r $PKG/usr/share
 
 	# Subtitle support (Han Boetes)
 	mkdir -p contrib/subrip
 	cd contrib/subrip
 	cp ../../../subtitleripper/* .
-	sed -i 's|.*ppm.*||i' Makefile
+	sed -i Makefile -e 's|.*ppm.*||i'
 	make clean all
 	install -D srttool subtitle2pgm subtitle2vobsub $PKG/usr/bin
 }