transcode: 1.0.5 -> 1.0.6

5 files changed, 74 insertions, 24 deletions

diff --git a/transcode/.footprint b/transcode/.footprint
index 7bccf6a41..d0b3cce81 100644
--- a/transcode/.footprint
+++ b/transcode/.footprint
@@ -29,8 +29,6 @@ drwxr-xr-x	root/root	usr/lib/transcode/
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ac3.la
 -rw-r--r--	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_af6.la
--rw-r--r--	root/root	usr/lib/transcode/export_af6.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_debugppm.la
 -rw-r--r--	root/root	usr/lib/transcode/export_debugppm.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_divx4.la
@@ -45,6 +43,8 @@ drwxr-xr-x	root/root	usr/lib/transcode/
 -rw-r--r--	root/root	usr/lib/transcode/export_dv.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_dvraw.la
 -rw-r--r--	root/root	usr/lib/transcode/export_dvraw.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_fame.la
+-rw-r--r--	root/root	usr/lib/transcode/export_fame.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ffmpeg.la
 -rw-r--r--	root/root	usr/lib/transcode/export_ffmpeg.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_im.la
@@ -67,6 +67,8 @@ drwxr-xr-x	root/root	usr/lib/transcode/
 -rw-r--r--	root/root	usr/lib/transcode/export_mp2enc.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_mpeg2enc.la
 -rw-r--r--	root/root	usr/lib/transcode/export_mpeg2enc.so
+-rwxr-xr-x	root/root	usr/lib/transcode/export_net.la
+-rw-r--r--	root/root	usr/lib/transcode/export_net.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_null.la
 -rw-r--r--	root/root	usr/lib/transcode/export_null.so
 -rwxr-xr-x	root/root	usr/lib/transcode/export_ogg.la
@@ -221,8 +223,6 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rw-r--r--	root/root	usr/lib/transcode/filter_yuy2toyv12.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_ac3.la
 -rw-r--r--	root/root	usr/lib/transcode/import_ac3.so
--rwxr-xr-x	root/root	usr/lib/transcode/import_af6.la
--rw-r--r--	root/root	usr/lib/transcode/import_af6.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_avi.la
 -rw-r--r--	root/root	usr/lib/transcode/import_avi.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_bsdav.la
@@ -255,6 +255,8 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rw-r--r--	root/root	usr/lib/transcode/import_mpeg2.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_mplayer.la
 -rw-r--r--	root/root	usr/lib/transcode/import_mplayer.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_net.la
+-rw-r--r--	root/root	usr/lib/transcode/import_net.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_null.la
 -rw-r--r--	root/root	usr/lib/transcode/import_null.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_nuv.la
@@ -271,6 +273,10 @@ lrwxrwxrwx	root/root	usr/lib/transcode/export_xvid.so -> export_xvid4.so
 -rw-r--r--	root/root	usr/lib/transcode/import_rawlist.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_sh.la
 -rw-r--r--	root/root	usr/lib/transcode/import_sh.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_v4l.la
+-rw-r--r--	root/root	usr/lib/transcode/import_v4l.so
+-rwxr-xr-x	root/root	usr/lib/transcode/import_v4l2.la
+-rw-r--r--	root/root	usr/lib/transcode/import_v4l2.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_vdrac3.la
 -rw-r--r--	root/root	usr/lib/transcode/import_vdrac3.so
 -rwxr-xr-x	root/root	usr/lib/transcode/import_vnc.la
diff --git a/transcode/.md5sum b/transcode/.md5sum
index 10a55e667..000ec7332 100644
--- a/transcode/.md5sum
+++ b/transcode/.md5sum
@@ -1,3 +1,4 @@
-e2343d44e73c8b6dd98482aa3fd848cb  ImageMagick-library-rename-fix.patch
 c0bd49a88f667c68c4430ad25bbed510  subtitleripper-0.3-4.tgz
-124a6055d304fa2d8577d7380e2bcb0c  transcode-1.0.5.tar.bz2
+eceddd2e0c178149e575fb7e7d246da3  transcode-1.0.6-ffmpeg-directory-include.patch
+71de9beef2ff270c265b2869baa75e9f  transcode-1.0.6-imagemagick-detection.patch
+7c3a341b0e4540e34ef50c66b0ab751d  transcode-1.0.6.tar.bz2
diff --git a/transcode/Pkgfile b/transcode/Pkgfile
index 04855a34d..da766e64c 100644
--- a/transcode/Pkgfile
+++ b/transcode/Pkgfile
@@ -2,40 +2,50 @@
 # URL: http://www.transcoding.org/cgi-bin/transcode
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Martin Opel, mo at obbl-net dot de
-# Depends on: libdvdnav mpeg2dec
+# Depends on: imagemagick liba52 libdvdnav libfame libtheora lzo mjpegtools mpeg2dec
 
 name=transcode
-version=1.0.5
+version=1.0.6
 release=1
-source=(http://transcode.kabewm.com/transcode-$version.tar.bz2 \
-	http://dl.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz \
-	ImageMagick-library-rename-fix.patch)
+source=(http://fromani.exit1.org/$name-$version.tar.bz2
+	http://dl.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz
+	$name-$version-imagemagick-detection.patch
+	$name-$version-ffmpeg-directory-include.patch)
 
 build() {
-	cd transcode-$version
-	patch -p 1 -i $SRC/ImageMagick-library-rename-fix.patch
+	cd $name-$version
+	patch -p 1 -i $SRC/$name-$version-imagemagick-detection.patch
+	patch -p 1 -i $SRC/$name-$version-ffmpeg-directory-include.patch
+	aclocal
+	autoconf
+	libtoolize --force --copy
+	autoheader
+	automake --gnu --add-missing --copy
 	export CFLAGS="`echo $CFLAGS | sed -e 's/-O[s0-3]/-O3/'`"
 
 	./configure \
 		--prefix=/usr \
-		--with-lzo-includes='/usr/include/lzo' \
-		--with-imagemagick-includes='/usr/include/ImageMagick' \
-		--enable-libpostproc \
-		--enable-freetype2 \
+		--with-default-xvid=xvid4 \
 		--enable-a52 \
 		--enable-a52-default-decoder \
-		--enable-ogg \
-		--enable-vorbis \
-		--enable-libxml2 \
-		--enable-sdl \
 		--enable-avifile \
-		--enable-theora \
+		--enable-libfame \
+		--enable-freetype2 \
+		--enable-imagemagick \
 		--enable-libdv \
+		--enable-libpostproc \
 		--enable-libquicktime \
+		--enable-libxml2 \
 		--enable-lzo \
 		--enable-mjpegtools \
-		--enable-fame \
-		--enable-imagemagick
+		--enable-netstream \
+		--enable-ogg \
+		--enable-sdl \
+		--enable-theora \
+		--enable-v4l \
+		--enable-vorbis \
+		--disable-avifile \
+		--disable-xio
 
 	make
 	make DESTDIR=$PKG install
diff --git a/transcode/transcode-1.0.6-ffmpeg-directory-include.patch b/transcode/transcode-1.0.6-ffmpeg-directory-include.patch
new file mode 100644
index 000000000..c647075d1
--- /dev/null
+++ b/transcode/transcode-1.0.6-ffmpeg-directory-include.patch
@@ -0,0 +1,13 @@
+diff -pruN transcode-1.0.6.orig/configure.in transcode-1.0.6/configure.in
+--- transcode-1.0.6.orig/configure.in	2008-08-02 14:28:07.908141711 +0000
++++ transcode-1.0.6/configure.in	2008-08-02 14:48:25.502143264 +0000
+@@ -834,6 +834,9 @@ LIBPOSTPROC_EXTRA_LIBS="$LIBPOSTPROC_EXT
+ TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, [libpostproc/postprocess.h],
+   postproc, pp_postprocess, libpostproc, [http://www.ffmpeg.org/])
+ TC_PKG_HAVE(libpostproc, LIBPOSTPROC)
++if test x"$have_libpostproc" = x"yes" ; then
++  CPPFLAGS="$CPPFLAGS -I/usr/include/libpostproc"
++fi
+ 
+ dnl
+ dnl freetype2
diff --git a/transcode/transcode-1.0.6-imagemagick-detection.patch b/transcode/transcode-1.0.6-imagemagick-detection.patch
new file mode 100644
index 000000000..a5773cb2a
--- /dev/null
+++ b/transcode/transcode-1.0.6-imagemagick-detection.patch
@@ -0,0 +1,20 @@
+diff -pruN transcode-1.0.6.orig/configure.in transcode-1.0.6/configure.in
+--- transcode-1.0.6.orig/configure.in	2008-08-01 19:13:15.202141197 +0000
++++ transcode-1.0.6/configure.in	2008-08-01 19:20:27.310143367 +0000
+@@ -28,7 +28,6 @@ AM_PROG_AS
+ AS=$CC
+ CCAS='$(CC)'
+ AC_SUBST(CCAS)
+-AC_PROG_CC
+ AC_SUBST(CCASFLAGS)
+ ASFLAGS="$CCASFLAGS"
+ AC_SUBST(ASFLAGS)
+@@ -1247,7 +1246,7 @@ dnl
+ IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS -lz -lm"
+ dnl MagickWand libraries/headers always (?) are a superset of MagickCore ones.
+ TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, Wand-config, [magick/api.h],
+- Magick, InitializeMagick, Wand, [http://www.imagemagick.org/])
++ MagickCore, InitializeMagick, Wand, [http://www.imagemagick.org/])
+ TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
+ if test x"$have_imagemagick" = x"yes" ; then
+   AC_CHECK_HEADER([wand/magick-wand.h],