Fix compability with Transcode 1.1.5 wrt #294492 by Salah Coronya.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 133 insertions, 12 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/Manifest b/media-video/tovid/Manifest
index 10ededf605f1..8ace69dadf39 100644
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tovid-0.30-configure.patch 263 RMD160 fb74007a796ace83357ae304fe70afd6cb104f99 SHA1 884a64a84a0bc13f375926897dec5752d5cf7ab2 SHA256 bad68a1a8afca29440156f3d1cc38fb2718151170d46407a503ad5b0b13b57ae
 AUX tovid-0.31-sox.patch 2377 RMD160 603b8696d6eaa63ff1d4785e509cf9e7bb0650fe SHA1 a98793d85e93eee171c57eade94396a94f9a2e75 SHA256 adc3e8d7e5162376106b7513af3cd917962fe4e12a49db81e195a330b618ab0e
 AUX tovid-0.31-todisc.patch 510 RMD160 18a88e357370d633037154f3e01a6ce397010635 SHA1 905417a98c5d4ba51bcef26ca54a96188ea9cd24 SHA256 0ee1b00f1c42926fb2dc7da840992a1f300c762274d835c7f96ac7a9e25dda18
+AUX tovid-0.31-transcode-1.1.5.patch 1176 RMD160 7e1ebed4eb6ce3851a4944324f86f7cb8b250dc4 SHA1 a9a195057ad6dfbfebf60b864413653470962c67 SHA256 02c106d6a817243da30dfeb75fbc218c4abb1ffbdcf7ddc495de8f2c4f327e41
 DIST tovid-0.31.tar.gz 415625 RMD160 c79e7fe566256699e65cc4bd94cf5a1f98503502 SHA1 1c3ec16a7654e7f1248da2fc666b797efa29d0ae SHA256 e51e38c3f2da9898a8c2466b0ef3298519300e274568097388b7a0d066400d23
 EBUILD tovid-0.31-r1.ebuild 3094 RMD160 76e9da3578e2adc3c4fa7725a3b87265b948994e SHA1 861be4bafb5ee9a14009fa8c488669c4024703ff SHA256 c695f327c17e83673a0826e25e1734d35d6a010d00eb485d7c1fdde9a661727f
-MISC ChangeLog 3031 RMD160 047cf70f643f9602eb0e1991ccb72684c83ac931 SHA1 2e765e88d90f3b076681ccf7caae4a1fd115f470 SHA256 a4a50b4f63d88c079a09ab21e4610d9ffc66cd59f837616d40c3c1c8fd8a0086
+EBUILD tovid-0.31-r2.ebuild 3150 RMD160 7ef35e053c65af242b716fbddc0c5010c1dd699a SHA1 3311a0f60126904ca53647940c0cce1f40358f4f SHA256 61cfef41f6f6538fa63290053b689f03c0fc769390f5883315ff22ab5d85f1d0
+MISC ChangeLog 3252 RMD160 7cc86afdaa5cf5268c924be9f690f06b594d7e71 SHA1 b9d23ab45088f9cfb8b7f22bef3049a37c7976f6 SHA256 bd23595f33832363547d8e3a6a0556ac22e45604199643be0cb6685ab2e6a138
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklfaxIACgkQvFcC4BYPU0qdFwCgxUlVIXu7+P4OPBwnvwsA9XVP
-J+QAn26/X8kR1oJSVNikr6i1YoTufVab
-=MnuS
------END PGP SIGNATURE-----
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 ""
+}