3 files changed, 130 insertions, 1 deletions
diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index 0aff5b7fb0fb..525ed84a5f3b 100644
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/tovid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.19 2009/01/03 13:41:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.20 2009/12/22 11:32:20 ssuominen Exp $
+
+*tovid-0.31-r2 (22 Dec 2009)
+
+  22 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> +tovid-0.31-r2.ebuild,
+  +files/tovid-0.31-transcode-1.1.5.patch:
+  Fix compability with Transcode 1.1.5 wrt #294492 by Salah Coronya.
 
   03 Jan 2009; Alexis Ballier <aballier@gentoo.org> tovid-0.31-r1.ebuild:
   dont install desktop entries when not installing the guis, by
diff --git a/media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch b/media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch
new file mode 100644
index 000000000000..78e70d578ad3
--- /dev/null
+++ b/media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/show_bug.cgi?id=294492
+
+--- src/todisc
++++ src/todisc
+@@ -3965,7 +3965,7 @@
+                 NAV_SEEK[i]="--nav_seek"
+                 NAVSEEK[i]=${IN_FILES[i]}.nav_log
+             fi
+-            TRANSCODE_CMD2=(nice transcode --print_status 10 \
++            TRANSCODE_CMD2=(nice transcode --progress_meter 1 --progress_rate 10 \
+             --write_pid $WORK_DIR/tcode$i.pid -q 1 -i "${IN_FILES[i]}" \
+             -c ${SEEK_FRAMES[i]}-$((${SEEK_FRAMES[i]} + $FRAMES)) ${NAV_SEEK[i]} "${NAVSEEK[i]}" \
+             -o "$WORK_DIR/pics/$i/" -f $FRAME_RATE  -Z $THUMB_SIZE $EXPORT)
+@@ -4438,7 +4438,7 @@
+         yecho "Creating $TOTAL_JPEGS chapter images for "${IN_FILES[i]}""
+         yecho
+         for t in "${cmd[@]}"; do
+-            TCODE_CMD=(nice transcode --print_status 10 --write_pid $WORK_DIR/tcode$i.pid \
++            TCODE_CMD=(nice transcode --progress_meter 1 --progress_rate 10 --write_pid $WORK_DIR/tcode$i.pid \
+             -q 1 -i "${IN_FILES[i]}"  ${NAV_SEEK[i]} "${NAVSEEK[i]}" \
+             -o "${PICS_OUT[@]}" -f $FRAME_RATE -Z ${GEO_ARRAY[C]},fast -c $t -y $SM_IMG_FMT,null)
+             echo "Running ${TCODE_CMD[@]}" |
diff --git a/media-video/tovid/tovid-0.31-r2.ebuild b/media-video/tovid/tovid-0.31-r2.ebuild
new file mode 100644
index 000000000000..257b62e31106
--- /dev/null
+++ b/media-video/tovid/tovid-0.31-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.31-r2.ebuild,v 1.1 2009/12/22 11:32:20 ssuominen Exp $
+
+inherit eutils python
+
+DESCRIPTION="Video conversion and DVD authoring tools"
+HOMEPAGE="http://tovid.wikia.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+IUSE="tk wxwindows"
+DEPEND="media-video/mplayer
+	app-text/txt2tags"
+RDEPEND="media-video/mjpegtools
+	media-video/ffmpeg
+	>=media-video/transcode-1.1.5
+	media-sound/normalize
+	media-gfx/imagemagick
+	media-sound/sox
+	media-video/dvdauthor
+	media-video/vcdimager
+	media-video/lsdvd
+	virtual/cdrtools
+	dev-python/pycairo
+	wxwindows? ( =dev-python/wxpython-2.6* )
+	app-cdr/dvd+rw-tools
+	app-cdr/cdrdao
+	dev-python/imaging
+	sys-devel/bc"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+pkg_setup() {
+	if use tk && ( ! built_with_use dev-lang/python tk ); then
+		eerror "Please emerge python with useflag 'tk' enabled."
+		die "Fix USE flags and re-emerge"
+	elif ! use tk; then
+		ewarn "If you want to use 'todiscgui', then emerge"
+		ewarn "dev-lang/python and this package with the 'tk' use flag"
+	fi
+	if ! built_with_use media-video/mplayer encode; then
+		eerror "Please emerge media-video/mplayer with useflag 'encode'."
+		die "Fix USE flags and re-emerge"
+	fi
+	if ! use wxwindows; then
+		ewarn "You have choosen to disable all tovidgui interface."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.30-configure.patch \
+		"${FILESDIR}"/${P}-todisc.patch \
+		"${FILESDIR}"/${P}-sox.patch \
+		"${FILESDIR}"/${P}-transcode-1.1.5.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install died"
+	dodoc AUTHORS ChangeLog NEWS README
+
+	python_version
+	# remove wxgtk components
+	if ! use wxwindows; then
+		rm -f "${D}/usr/bin/tovidgui"
+		rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/libtovid/gui"
+		rm -f "${D}/usr/share/applications/tovidgui.desktop"
+	fi
+
+	# remove tk components
+	if ! use tk; then
+		rm -f "${D}/usr/bin/todiscgui"
+		rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/libtovid/metagui"
+		rm -f "${D}/usr/share/applications/todiscgui.desktop"
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "List of suite components:"
+	elog "   idvid:       Identifies video format, resolution, and length"
+	elog "   makemenu:    Creates (S)VCD/DVD menus"
+	elog "   makeslides:  Creates mpeg still slides for (S)VCD"
+	elog "   makexml:     Creates XML specification for an (S)VCD or DVD navigation hierarchy"
+	elog "   makedvd:     Creates the DVD structure and/or iso image"
+	elog "   postproc:    Adjusts A/V sync and does shrinking of encoded video"
+	elog "   tovid:       Converts video to (S)VCD or DVD mpeg format"
+	if use wxwindows; then
+		elog "   tovidgui:    The tovid GUI"
+	fi
+	elog "   pytovid:     The new (experimental) python based tovid script"
+	elog "   todisc:      Create a DVD with animated menus"
+	if use tk; then
+		elog "   todiscgui:   Experimental gui for todisc"
+	fi
+	elog ""
+	elog "Please check out the tovid documentation on the web:"
+	elog "   http://tovid.wikia.com/"
+	elog ""
+}