- Update to 0.6.12

- Add WITH_LIBTHEORA knob (submitted by Michael Johnson)
- Don't build WITH_NASM if it's installed

PR:		ports/63402
Submitted by:	Hendrik Scholz <hendrik@scholz.net> (maintainer)

5 files changed, 41 insertions, 36 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 5ec16059b0cc..2f1734c27948 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	transcode
-PORTVERSION=	0.6.10
-PORTREVISION=	1
+PORTVERSION=	0.6.12
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.zebra.fh-weingarten.de/~transcode/pre/
 
@@ -26,7 +25,7 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
-CONFIGURE_ARGS=	--program-transform-name=""
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
@@ -37,18 +36,14 @@ MAN1=	avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+.if exists(${LOCALBASE}/lib/libtheora.so)
+WITH_LIBTHEORA=		yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libMagick.so)
 WITH_IMAGEMAGICK=	yes
 .endif
 
-.if exists(${LOCALBASE}/bin/nasm)
-WITH_NASM=	yes
-.endif
-
 .if exists(${LOCALBASE}/lib/libaviplay.so)
 WITH_AVIFILE=	yes
 .endif
@@ -110,6 +105,12 @@ WITH_LZO=	yes
 WITH_DIVX5=	yes
 .endif
 
+.if defined(WITH_LIBTHEORA)
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/graphics/libtheora
+.else
+CONFIGURE_ARGS+=	--with-theora=no
+.endif
+
 .if defined(WITH_IMAGEMAGICK)
 LIB_DEPENDS+=	Magick.6:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
@@ -246,6 +247,10 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS."
 .endif
+.if !defined(WITH_LIBTHEORA)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable Libtheora by defining WITH_LIBTHEORA."
+.endif
 .if !defined(WITH_IMAGEMAGICK)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable ImageMagick-dependent modules by defining WITH_IMAGEMAGICK."
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index 69080622120f..084513f43ea5 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1 +1,2 @@
-MD5 (transcode-0.6.10.tar.gz) = eaa65eb3f6cc548cab5d1d26aba79aa5
+MD5 (transcode-0.6.12.tar.gz) = 550214ed9f85224423ca8c7308ed96ce
+SIZE (transcode-0.6.12.tar.gz) = 3454807
diff --git a/multimedia/transcode/files/patch-filter:subtitles:frame_list.c b/multimedia/transcode/files/patch-filter:subtitles:frame_list.c
new file mode 100644
index 000000000000..f78ab71331ad
--- /dev/null
+++ b/multimedia/transcode/files/patch-filter:subtitles:frame_list.c
@@ -0,0 +1,13 @@
+--- filter/subtitler/frame_list.c.orig	Thu Feb 26 17:30:59 2004
++++ filter/subtitler/frame_list.c	Thu Feb 26 17:36:19 2004
+@@ -33,8 +33,8 @@
+ 
+ char *strsave(char *s) /*save char array s somewhere*/
+ {
+-char *p, *malloc();
+-if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
++char *p;
++if(p = (char *)malloc( strlen(s) +  1) ) strcpy(p, s);
+ return(p);
+ }
+ 
diff --git a/multimedia/transcode/files/patch-libtool b/multimedia/transcode/files/patch-libtool
deleted file mode 100644
index 09726a809477..000000000000
--- a/multimedia/transcode/files/patch-libtool
+++ /dev/null
@@ -1,24 +0,0 @@
---- libtool.orig	Sun Jun  1 11:30:47 2003
-+++ libtool	Sun Jun  1 11:31:28 2003
-@@ -2730,7 +2730,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4499,10 +4499,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist
index 3b362acd5569..df6311bafe74 100644
--- a/multimedia/transcode/pkg-plist
+++ b/multimedia/transcode/pkg-plist
@@ -14,6 +14,7 @@ bin/tcmodinfo
 bin/tcmp3cut
 bin/tcmplex
 bin/tcprobe
+bin/tcrequant
 bin/tcscan
 bin/tcxmlcheck
 bin/tcxpm2rgb
@@ -31,13 +32,13 @@ lib/transcode/export_divx5raw.so
 lib/transcode/export_ffmpeg.so
 lib/transcode/export_jpg.so
 lib/transcode/export_lame.so
-lib/transcode/export_sampeg.so
 %%WITH_LIBDV%%lib/transcode/export_dv.so
 %%WITH_LIBDV%%lib/transcode/export_dvraw.so
 %%WITH_LZO%%lib/transcode/export_lzo.so
 %%WITH_FAME%%lib/transcode/export_fame.so
 %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so
 lib/transcode/export_mjpeg.so
+lib/transcode/export_mp1e.so
 %%WITH_NASM%%lib/transcode/export_mpeg.so
 %%WITH_MJPEG%%lib/transcode/export_mpeg2enc.so
 %%WITH_MJPEG%%lib/transcode/export_mp2enc.so
@@ -61,12 +62,14 @@ lib/transcode/filter_aclip.so
 lib/transcode/filter_astat.so
 lib/transcode/filter_clone.so
 %%WITH_IMAGEMAGICK%%lib/transcode/filter_compare.so
+lib/transcode/filter_control.so
 lib/transcode/filter_cpaudio.so
 lib/transcode/filter_cshift.so
 lib/transcode/filter_cut.so
 lib/transcode/filter_decimate.so
+lib/transcode/filter_denoise3d.so
+lib/transcode/filter_detectclipping.so
 lib/transcode/filter_detectsilence.so
-lib/transcode/filter_dilyuvmmx.so
 lib/transcode/filter_divxkey.so
 lib/transcode/filter_doublefps.so
 lib/transcode/filter_dnr.so
@@ -87,6 +90,7 @@ lib/transcode/filter_nored.so
 lib/transcode/filter_normalize.so
 lib/transcode/filter_null.so
 %%WITH_SDL%%lib/transcode/filter_preview.so
+lib/transcode/filter_pp.so
 lib/transcode/filter_pv.so
 lib/transcode/filter_resample.so
 lib/transcode/filter_skip.so
@@ -99,8 +103,10 @@ lib/transcode/filter_subtitler.so
 lib/transcode/filter_tc_audio.so
 lib/transcode/filter_tc_video.so
 lib/transcode/filter_test.so
+lib/transcode/filter_text.so
 lib/transcode/filter_testframe.so
 lib/transcode/filter_unsharp.so
+lib/transcode/filter_whitebalance.so
 lib/transcode/filter_xsharpen.so
 lib/transcode/filter_yuvdenoise.so
 lib/transcode/filter_yuy2toyv12.so
@@ -117,6 +123,7 @@ lib/transcode/import_dvd.so
 %%WITH_IMAGEMAGICK%%lib/transcode/import_im.so
 %%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
 lib/transcode/import_ffmpeg.so
+lib/transcode/import_fraps.so
 lib/transcode/import_lav.so
 %%WITH_LZO%%lib/transcode/import_lzo.so
 lib/transcode/import_mpeg2.so
@@ -129,6 +136,7 @@ lib/transcode/import_nvrec.so
 lib/transcode/import_ogg.so
 lib/transcode/import_raw.so
 lib/transcode/import_rawlist.so
+lib/transcode/import_sh.so
 lib/transcode/import_vdrac3.so
 lib/transcode/import_vnc.so
 lib/transcode/import_vob.so
@@ -141,6 +149,7 @@ lib/transcode/import_yuv4mpeg.so
 lib/transcode/xvid2.cfg
 lib/transcode/xvid3.cfg
 lib/transcode/xvid4.cfg
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.cluster
 %%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps
@@ -223,6 +232,7 @@ lib/transcode/xvid4.cfg
 %%PORTDOCS%%%%DOCSDIR%%/import-API.txt
 %%PORTDOCS%%%%DOCSDIR%%/import-xml.txt
 %%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt
+%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt
 %%PORTDOCS%%%%DOCSDIR%%/pvm.cfg
 %%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html