Backported patch from tovid subversion to support new sox wrt #251706, thanks to Salah Coronya.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27.7 i686
RepoMan-Options: --force

4 files changed, 171 insertions, 12 deletions

diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index 511bb747ec01..47c7919c1552 100644
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/tovid
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.16 2008/12/17 22:32:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.17 2008/12/20 08:57:19 ssuominen Exp $
+
+*tovid-0.31-r1 (20 Dec 2008)
+
+  20 Dec 2008; <ssuominen@gentoo.org> +files/tovid-0.31-sox.patch,
+  +tovid-0.31-r1.ebuild:
+  Backported patch from tovid subversion to support new sox wrt #251706,
+  thanks to Salah Coronya. Because we have this version of sox in stable,
+  and the fix is trivial push it straight to stable for amd64/x86.
 
   17 Dec 2008; Markus Meier <maekke@gentoo.org> tovid-0.31.ebuild:
   amd64 stable, bug #250804
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
index 90b25def09b1..c32eb9e702e2 100644
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tovid-0.30-configure.patch 263 RMD160 fb74007a796ace83357ae304fe70afd6cb104f99 SHA1 884a64a84a0bc13f375926897dec5752d5cf7ab2 SHA256 bad68a1a8afca29440156f3d1cc38fb2718151170d46407a503ad5b0b13b57ae
 AUX tovid-0.30-ffmpeg.patch 3552 RMD160 eb6ff38afb781791dab2a207b77d02af8393080e SHA1 16127bc0a996752f12bae347c34cdff0e16032b8 SHA256 8934dd9d0e90fca46a2176b02031632fb9dd68cbfc24610fbb957f5448f23b6a
 AUX tovid-0.30-tovid-init.patch 6723 RMD160 59016249843efc416b79ca6da3fce133f06358f7 SHA1 a263a146e00de688f7c1c927212d655f89928589 SHA256 a185ea4ca31ddfc1dc4daacf2a3abc6fc4e631b1416ad0faac121d1f08422625
+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
 DIST tovid-0.30.tar.gz 393084 RMD160 ef7e35e6553fddc4f601fd44b681b5afd643705a SHA1 70259c55a7da3b9a98fe8136470f5770d0923732 SHA256 fe30a4ef08d1aa15fcb811d123d14a7934a9f5180abbcaddafef1e543c42720f
 DIST tovid-0.31.tar.gz 415625 RMD160 c79e7fe566256699e65cc4bd94cf5a1f98503502 SHA1 1c3ec16a7654e7f1248da2fc666b797efa29d0ae SHA256 e51e38c3f2da9898a8c2466b0ef3298519300e274568097388b7a0d066400d23
 EBUILD tovid-0.30-r2.ebuild 2454 RMD160 f3583ca429282023c69dc000f038d359e05d0196 SHA1 33aaf4d08dd7fe7df8e7cc12bb777cf6a604fc39 SHA256 b83f6d5b2a1f02bf7c9abf041dc1b4a6dea4202b7d0a43c7f620249759699b87
+EBUILD tovid-0.31-r1.ebuild 2984 RMD160 904cabc6f6b6ec934217eeec44992c0966636188 SHA1 b8ce81c381ea72e8200b70ce52d5d2faeb1e3ec0 SHA256 aa8c71c6e5cbd3f690c2d98a6b8057a07716ac622bc3ee2e159855ad11a3e3fd
 EBUILD tovid-0.31.ebuild 2955 RMD160 962adc98306e367129c998355335a0c697df89c7 SHA1 1dbfabb89733da3792acf265a11dfc5b91f39d8f SHA256 6eaa08b991170247f6c2eda9616b5c3c894bae0fa48a999c9bb9b397dab56740
-MISC ChangeLog 2334 RMD160 82add4f6a817d42990238d59277715528b8a34e0 SHA1 a64917883e22d7f59b8c2574b461ed3b47f11c36 SHA256 bca6c9f878770bb1061ce8fc7b540ab5dcf25f120c5796af4dd9b66bf362715a
+MISC ChangeLog 2674 RMD160 ee8d86934c9cdc9ec431119ff617132683b84688 SHA1 02076974596a040ed7b68a5ae7e8bde75c2f4e46 SHA256 39879db54871f357032edf931931db9a0b3106e4f7a3c5286cb2b7b2b29fac4f
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklJffAACgkQkKaRLQcq0GIFIQCfTy9CZkLd0S3ZmnXEKEqIITg4
-tY8An2oi1ytoXiq40cSZpCIMnDm0FPH3
-=mH2R
------END PGP SIGNATURE-----
diff --git a/media-video/tovid/files/tovid-0.31-sox.patch b/media-video/tovid/files/tovid-0.31-sox.patch
new file mode 100644
index 000000000000..866a9a25ad88
--- /dev/null
+++ b/media-video/tovid/files/tovid-0.31-sox.patch
@@ -0,0 +1,61 @@
+diff -ur tovid-0.31.old/src/todisc tovid-0.31/src/todisc
+--- tovid-0.31.old/src/todisc	2008-12-20 00:39:06.000000000 -0600
++++ tovid-0.31/src/todisc	2008-12-20 00:51:58.000000000 -0600
+@@ -1189,6 +1189,14 @@
+ #    $VMGM_ONLY && $SKIP_VMGM && mv "$BASEDIR/dummy.mpg" "$BASEDIR/VMGM.mpg"
+ }
+ 
++get_sox_arg()
++{
++    sox_version=$(sox --version)
++    sox_version=${sox_version##*v}
++    test_version $sox_version 13.0.0 && echo '-2' || echo '-w'
++}
++
++
+ ##############################################################################
+ #                          	End of functions                                 #
+ ##############################################################################
+@@ -5240,9 +5248,10 @@
+ fi
+ BG_AUDIO_LENGTH="-t $MENU_ATIME"
+ # create audio background for the main menu
++sample_size=$(get_sox_arg)
+ if [[ -z "$BG_AUDIO" || "$BG_AUDIO" = "none" ]]; then # no audio: use silence
+-    cat /dev/zero 2>/dev/null | nice -n 0 sox -t raw -c 2 -r 48000 -w \
+-    -s - $WORK_DIR/intro.wav  trim 0 $MENU_ATIME
++        cat /dev/zero 2>/dev/null | nice -n 0 sox -t raw -c 2 -r 48000 \
++        $sample_size -s - $WORK_DIR/intro.wav  trim 0 $MENU_ATIME
+ # Make sure file exists
+ elif test ! -s "$BG_AUDIO"; then
+     runtime_error "Cannot find background audio file: $BG_AUDIO"
+diff -ur tovid-0.31.old/src/tovid-init.in tovid-0.31/src/tovid-init.in
+--- tovid-0.31.old/src/tovid-init.in	2007-08-18 15:21:37.000000000 -0500
++++ tovid-0.31/src/tovid-init.in	2008-12-20 00:51:24.000000000 -0600
+@@ -376,6 +376,26 @@
+ }
+ 
+ # ******************************************************************************
++# takes 2 args: (1) version (2) the version testing against
++# return true if version is >= to the test version (same or newer)
++# ******************************************************************************
++test_version()
++{
++    OIFS=$IFS
++    IFS='.'
++    local version test_version
++    version=${1//,/.} # allow comma separated version string too
++    version=($version)
++    test_version=($2)
++    IFS=$OIFS
++    for i in ${!test_version[@]}; do
++        [[ -z ${version[i]} ]] && version[i]=0
++       (( ${version[i]} < ${test_version[i]} )) && return 1
++    done
++    return 0
++}
++
++# ******************************************************************************
+ # ******************************************************************************
+ #
+ #
diff --git a/media-video/tovid/tovid-0.31-r1.ebuild b/media-video/tovid/tovid-0.31-r1.ebuild
new file mode 100644
index 000000000000..10c0c365d69e
--- /dev/null
+++ b/media-video/tovid/tovid-0.31-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.31-r1.ebuild,v 1.1 2008/12/20 08:57:19 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
+	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
+}
+
+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"
+	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"
+	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 ""
+}