From 3c3a380606579ecffe703ee57f1e6a9734fbaf3a Mon Sep 17 00:00:00 2001
From: Steve Dibb <beandog@gentoo.org>
Date: Sat, 28 Apr 2007 04:29:18 +0000
Subject: [PATCH] ffmpeg patch, bug 176266 Package-Manager: portage-2.1.2.4

---
 media-video/tovid/ChangeLog                   |  8 +-
 media-video/tovid/Manifest                    | 19 ++++-
 media-video/tovid/files/digest-tovid-0.30-r1  |  3 +
 .../tovid/files/tovid-0.30-ffmpeg.patch       | 68 +++++++++++++++++
 media-video/tovid/tovid-0.30-r1.ebuild        | 76 +++++++++++++++++++
 5 files changed, 169 insertions(+), 5 deletions(-)
 create mode 100644 media-video/tovid/files/digest-tovid-0.30-r1
 create mode 100644 media-video/tovid/files/tovid-0.30-ffmpeg.patch
 create mode 100644 media-video/tovid/tovid-0.30-r1.ebuild

diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index a265d58b7e6e..ba01b2c97c84 100644
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/tovid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.7 2007/03/30 03:46:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.8 2007/04/28 04:29:18 beandog Exp $
+
+*tovid-0.30-r1 (28 Apr 2007)
+
+  28 Apr 2007; Steve Dibb <beandog@gentoo.org>
+  +files/tovid-0.30-ffmpeg.patch, +tovid-0.30-r1.ebuild:
+  ffmpeg patch, bug 176266
 
   30 Mar 2007; Steve Dibb <beandog@gentoo.org> -tovid-0.29-r1.ebuild,
   tovid-0.30.ebuild:
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
index c81adcb46058..f3964f1e0076 100644
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@@ -2,15 +2,23 @@ AUX tovid-0.30-configure.patch 263 RMD160 fb74007a796ace83357ae304fe70afd6cb104f
 MD5 7fac1a64a781bc8fa7bb38da020e8d17 files/tovid-0.30-configure.patch 263
 RMD160 fb74007a796ace83357ae304fe70afd6cb104f99 files/tovid-0.30-configure.patch 263
 SHA256 bad68a1a8afca29440156f3d1cc38fb2718151170d46407a503ad5b0b13b57ae files/tovid-0.30-configure.patch 263
+AUX tovid-0.30-ffmpeg.patch 3552 RMD160 eb6ff38afb781791dab2a207b77d02af8393080e SHA1 16127bc0a996752f12bae347c34cdff0e16032b8 SHA256 8934dd9d0e90fca46a2176b02031632fb9dd68cbfc24610fbb957f5448f23b6a
+MD5 763221accd06dacf6226481de55abda5 files/tovid-0.30-ffmpeg.patch 3552
+RMD160 eb6ff38afb781791dab2a207b77d02af8393080e files/tovid-0.30-ffmpeg.patch 3552
+SHA256 8934dd9d0e90fca46a2176b02031632fb9dd68cbfc24610fbb957f5448f23b6a files/tovid-0.30-ffmpeg.patch 3552
 DIST tovid-0.30.tar.gz 393084 RMD160 ef7e35e6553fddc4f601fd44b681b5afd643705a SHA1 70259c55a7da3b9a98fe8136470f5770d0923732 SHA256 fe30a4ef08d1aa15fcb811d123d14a7934a9f5180abbcaddafef1e543c42720f
+EBUILD tovid-0.30-r1.ebuild 2426 RMD160 7b71d655d4cfc98fbb1e60472067971023cb98bc SHA1 6d444ccd7b9957a598603e9546fb0b0f6cd401f0 SHA256 946100d659657c54ead2b56f673ddfff8bd1674ae49801cf209baaa21384cc96
+MD5 7766e3e39caa567f365870ae6668c03f tovid-0.30-r1.ebuild 2426
+RMD160 7b71d655d4cfc98fbb1e60472067971023cb98bc tovid-0.30-r1.ebuild 2426
+SHA256 946100d659657c54ead2b56f673ddfff8bd1674ae49801cf209baaa21384cc96 tovid-0.30-r1.ebuild 2426
 EBUILD tovid-0.30.ebuild 2383 RMD160 ca2cdb31e70ed03d4ec685667fbc6ef4e71e80c0 SHA1 7d529c7bc3f9a0284800361370074ef85d950167 SHA256 592511f8a074d8aac622a5908e245dea2b54ea66a6c1b131af4ec5b5bd76f237
 MD5 159e727230ed3202fd7fc8d9145bd42b tovid-0.30.ebuild 2383
 RMD160 ca2cdb31e70ed03d4ec685667fbc6ef4e71e80c0 tovid-0.30.ebuild 2383
 SHA256 592511f8a074d8aac622a5908e245dea2b54ea66a6c1b131af4ec5b5bd76f237 tovid-0.30.ebuild 2383
-MISC ChangeLog 1221 RMD160 09040f936d33a0ae8bbbe83c21eb1103d02903b4 SHA1 2b4e95a56a9f9991e872b17bdaa4e7c201c817e8 SHA256 8209613eb0e7ed5a724344744665f372e9728cf22ad4237f8cd69aa3f7f79ccc
-MD5 8fcf966b55c28563391f018dd5c91ab1 ChangeLog 1221
-RMD160 09040f936d33a0ae8bbbe83c21eb1103d02903b4 ChangeLog 1221
-SHA256 8209613eb0e7ed5a724344744665f372e9728cf22ad4237f8cd69aa3f7f79ccc ChangeLog 1221
+MISC ChangeLog 1383 RMD160 2e57964bd7907c4b183595de4c745e55397ffd13 SHA1 8229f6a7fc926bf7f1c646e29e91dbf17bf6d2b4 SHA256 29d92cc5cb0b82929204a763ca6d955a359dc51ea865b5f8d892113677621882
+MD5 940f4602573aae8fe40d60935e2ddb3f ChangeLog 1383
+RMD160 2e57964bd7907c4b183595de4c745e55397ffd13 ChangeLog 1383
+SHA256 29d92cc5cb0b82929204a763ca6d955a359dc51ea865b5f8d892113677621882 ChangeLog 1383
 MISC metadata.xml 243 RMD160 bec126773cb14d955fbf716c890dc9ed16e7bb91 SHA1 9f167df30ba9b0fc7d8db4e73135d8091489593c SHA256 2f9da26cb66f6247e479d75db4db219b6ac62f05ec991eb9ae22431f51320c35
 MD5 18be178ff2124446700dee887d9b6743 metadata.xml 243
 RMD160 bec126773cb14d955fbf716c890dc9ed16e7bb91 metadata.xml 243
@@ -18,3 +26,6 @@ SHA256 2f9da26cb66f6247e479d75db4db219b6ac62f05ec991eb9ae22431f51320c35 metadata
 MD5 c11915746972c34c79716f5b2142cdaf files/digest-tovid-0.30 232
 RMD160 7b7297b787bac1449e8f401d38ed8bec136821ba files/digest-tovid-0.30 232
 SHA256 73c822b81cbae1f4b4d53b5c6b857aa0c11f429b3cfcd4bb54e548c80b819ccd files/digest-tovid-0.30 232
+MD5 c11915746972c34c79716f5b2142cdaf files/digest-tovid-0.30-r1 232
+RMD160 7b7297b787bac1449e8f401d38ed8bec136821ba files/digest-tovid-0.30-r1 232
+SHA256 73c822b81cbae1f4b4d53b5c6b857aa0c11f429b3cfcd4bb54e548c80b819ccd files/digest-tovid-0.30-r1 232
diff --git a/media-video/tovid/files/digest-tovid-0.30-r1 b/media-video/tovid/files/digest-tovid-0.30-r1
new file mode 100644
index 000000000000..536aabef5fe1
--- /dev/null
+++ b/media-video/tovid/files/digest-tovid-0.30-r1
@@ -0,0 +1,3 @@
+MD5 feb3418acade9584cd8256f5ce2efb88 tovid-0.30.tar.gz 393084
+RMD160 ef7e35e6553fddc4f601fd44b681b5afd643705a tovid-0.30.tar.gz 393084
+SHA256 fe30a4ef08d1aa15fcb811d123d14a7934a9f5180abbcaddafef1e543c42720f tovid-0.30.tar.gz 393084
diff --git a/media-video/tovid/files/tovid-0.30-ffmpeg.patch b/media-video/tovid/files/tovid-0.30-ffmpeg.patch
new file mode 100644
index 000000000000..93f953f3d083
--- /dev/null
+++ b/media-video/tovid/files/tovid-0.30-ffmpeg.patch
@@ -0,0 +1,68 @@
+diff -Naur tovid-0.30/libtovid/gui/options.py tovid-0.30.2/libtovid/gui/options.py
+--- tovid-0.30/libtovid/gui/options.py	2007-02-12 22:51:57.000000000 +0000
++++ tovid-0.30/libtovid/gui/options.py	2007-04-17 17:00:03.000000000 +0000
+@@ -42,7 +42,7 @@
+         # Get global configuration (for output directory)
+         curConfig = TovidConfig()
+ 
+-        strCommand = "makexml -noask -quiet -overwrite -%s " % self.format
++        strCommand = "makexml -quiet -overwrite -%s " % self.format
+ 
+         for curItem in self.optionList:
+             # Prefix -topmenu or -menu if necessary
+diff -Naur tovid-0.30/src/makemenu tovid-0.30.2/src/makemenu
+--- tovid-0.30/src/makemenu	2007-02-12 22:51:57.000000000 +0000
++++ tovid-0.30/src/makemenu	2007-04-17 16:58:49.000000000 +0000
+@@ -755,14 +755,14 @@
+         MENU_LENGTH="-t 4"
+     fi
+     echo "Creating $(echo "$MENU_LENGTH" | cut -c 4-)-second silent $ASUF audio...   "
+-    AUDIO_CMD="ffmpeg -f s16le -i /dev/zero -ac 2 -ar $SAMPRATE -ab 224 \
++    AUDIO_CMD="ffmpeg -f s16le -i /dev/zero -ac 2 -ar $SAMPRATE -ab 224k \
+         $MENU_LENGTH -acodec $ASUF -y \"$AUDIO_STREAM\""
+     $DEBUG && echo -e "\n\nBG audio:\n$AUDIO_CMD" >> $REDIR
+     eval $AUDIO_CMD >> $REDIR 2>&1
+ # Otherwise, convert provided audio to the target format
+ else
+     echo "Converting \"$BG_AUDIO\" to $ASUF...   "
+-    AUDIO_CMD="ffmpeg -i \"$BG_AUDIO\" -ac 2 -ar $SAMPRATE -ab 224 \
++    AUDIO_CMD="ffmpeg -i \"$BG_AUDIO\" -ac 2 -ar $SAMPRATE -ab 224k \
+         $MENU_LENGTH -acodec $ASUF -y \"$AUDIO_STREAM\""
+     $DEBUG && echo -e "\n\nBG audio:\n$AUDIO_CMD" >> $REDIR
+     eval $AUDIO_CMD >> $REDIR 2>&1
+diff -Naur tovid-0.30/src/postproc tovid-0.30.2/src/postproc
+--- tovid-0.30/src/postproc	2006-12-05 05:19:32.000000000 +0000
++++ tovid-0.30/src/postproc	2007-04-17 16:59:03.000000000 +0000
+@@ -210,7 +210,7 @@
+    # Re-encode audio
+    mv -v audio_dump normed_audio
+    AUDIO_BITRATE=$(expr $ID_AUDIO_BITRATE / 1000)
+-   AUDIO_ENC="ffmpeg -i normed_audio -vn -ab $AUDIO_BITRATE -ar $ID_AUDIO_RATE"
++   AUDIO_ENC="ffmpeg -i normed_audio -vn -ab ${AUDIO_BITRATE}k -ar $ID_AUDIO_RATE"
+    AUDIO_ENC="$AUDIO_ENC -ac $ID_AUDIO_NCH -acodec $ID_AUDIO_CODEC"
+    AUDIO_ENC="$AUDIO_ENC -y audio_dump.$ID_AUDIO_CODEC"
+ 
+diff -Naur tovid-0.30/src/todisc tovid-0.30.2/src/todisc
+--- tovid-0.30/src/todisc	2007-04-17 17:53:57.000000000 +0000
++++ tovid-0.30/src/todisc	2007-04-17 16:58:26.000000000 +0000
+@@ -1856,7 +1856,7 @@
+ 
+ # easier to have non transparent showcase use the transparent block
+ if $SHOWCASE && ! $TRANSPARENT; then TRANSPARENT=:; fi
+-AUDIO_OPTS="-ab 224 -ar $SAMPLERATE -ac 2 -acodec $AUDIO_EXT"
++AUDIO_OPTS="-ab 224k -ar $SAMPLERATE -ac 2 -acodec $AUDIO_EXT"
+ # spumux and dvdauthor vars
+ if $WIDE_SCREEN; then
+         TITLES_VIDEO_TAG="<video widescreen=\"$WIDESCREEN\" $V_ASPECT/>"
+diff -Naur tovid-0.30/src/tovid tovid-0.30.2/src/tovid
+--- tovid-0.30/src/tovid	2007-02-11 20:11:11.000000000 +0000
++++ tovid-0.30/src/tovid	2007-04-17 16:59:50.000000000 +0000
+@@ -1810,7 +1810,7 @@
+         AUDIO_ENC=( "${AUDIO_ENC[@]}" -i "${AUDIO_IN_FILE[@]}" )
+         yecho "Encoding audio stream to $AUD_SUF with the following command:"
+     fi
+-    AUDIO_ENC=( "${AUDIO_ENC[@]}" -vn -ab $AUD_BITRATE -ar $SAMPRATE -ac 2 )
++    AUDIO_ENC=( "${AUDIO_ENC[@]}" -vn -ab ${AUD_BITRATE}k -ar $SAMPRATE -ac 2 )
+     ! $DO_NORM && AUDIO_ENC=( "${AUDIO_ENC[@]}" $CLIP_SEEK $FF_LENGTH $AUDIO_MAP )
+     AUDIO_ENC=( "${AUDIO_ENC[@]}" -acodec $AUD_SUF)
+     $DO_NORM && AUDIO_ENC=( "${AUDIO_ENC[@]}" "${AUDIO_WAV_MAP[@]}" )
diff --git a/media-video/tovid/tovid-0.30-r1.ebuild b/media-video/tovid/tovid-0.30-r1.ebuild
new file mode 100644
index 000000000000..ee37f30a15e5
--- /dev/null
+++ b/media-video/tovid/tovid-0.30-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.30-r1.ebuild,v 1.1 2007/04/28 04:29:18 beandog Exp $
+
+inherit eutils
+
+DESCRIPTION="Video conversion and DVD authoring tools"
+HOMEPAGE="http://tovid.wikia.com/"
+SRC_URI="mirror://sourceforge/tovid/${P}.tar.gz"
+IUSE="tk"
+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
+	>=dev-python/wxpython-2.6
+	app-cdr/dvd+rw-tools
+	app-cdr/cdrdao
+	dev-python/imaging"
+KEYWORDS="~x86 ~amd64"
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-configure.patch"
+	epatch "${FILESDIR}/${P}-ffmpeg.patch"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install died"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "List of suite components:"
+	einfo "   idvid:       Identifies video format, resolution, and length"
+	einfo "   makemenu:    Creates (S)VCD/DVD menus"
+	einfo "   makeslides:  Creates mpeg still slides for (S)VCD"
+	einfo "   makexml:     Creates XML specification for an (S)VCD or DVD navigation hierarchy"
+	einfo "   makedvd:     Creates the DVD structure and/or iso image"
+	einfo "   postproc:    Adjusts A/V sync and does shrinking of encoded video"
+	einfo "   tovid:       Converts video to (S)VCD or DVD mpeg format"
+	einfo "   tovidgui:    The tovid GUI"
+	einfo "   pytovid:     The new (experimental) python based tovid script"
+	einfo "   todisc:      Create a DVD with animated menus"
+	einfo "   todiscgui:   Experimental gui for todisc"
+	einfo ""
+	einfo "Please check out the tovid documentation on the web:"
+	einfo "   http://tovid.wikia.com/"
+	einfo ""
+}
-- 
2.26.2