Fix png8 bug, wrt 151591

Package-Manager: portage-2.1.1-r1

diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index f99eb1faa164467de8caeb772fc71353a31bd1e6..ee9b9a8d5e6a153d143cf9556afe9067eb9ddba2 100644 (file)
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/tovid
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.2 2006/09/11 20:05:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.3 2006/10/23 05:59:23 beandog Exp $
+
+*tovid-0.28-r1 (23 Oct 2006)
+
+  23 Oct 2006; Steve Dibb <beandog@gentoo.org> +files/makemenu_png8.patch,
+  +tovid-0.28-r1.ebuild:
+  Fix png8 bug, wrt 151591
 
   11 Sep 2006; Steve Dibb <beandog@gentoo.org> Manifest:
   Fix manifest, bug # 147079

diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
index 8bd282cce0297ee561623504bfe5dde26081c69a..16cccd0a132aaf6ce6b150a52774858556331f19 100644 (file)
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@@ -1,12 +1,20 @@
+AUX makemenu_png8.patch 1505 RMD160 06ea1ea32d32c5a0ef5abb69e3346ad5ea0fbf4f SHA1 d05ff181c1f62a7e631ea483ca51c6c6545b72c6 SHA256 b00eaaf113f7f4f34a1868db6ca9ddc4e28607c829e6d125aae36e00f160acd5
+MD5 f93775129ebcff7db5ca85385d7a0607 files/makemenu_png8.patch 1505
+RMD160 06ea1ea32d32c5a0ef5abb69e3346ad5ea0fbf4f files/makemenu_png8.patch 1505
+SHA256 b00eaaf113f7f4f34a1868db6ca9ddc4e28607c829e6d125aae36e00f160acd5 files/makemenu_png8.patch 1505
 DIST tovid-0.28.tar.gz 295903 RMD160 eb721c2785ea8282aebb8e50015cd450944d39b2 SHA1 4200d883862866f7299639866d85e23e6cc603e7 SHA256 fbd73eb3d1f0123ac88666a24a4ba14bd396c7edf5b3f802896c414ac32819f5
+EBUILD tovid-0.28-r1.ebuild 2067 RMD160 f31da79129189bcf35e4e325d8f0a6617d8041b8 SHA1 13919136d151bdc43238495490e80935e034e1cd SHA256 b87b569e84b6bfa3b9f5a690f069a86c4ff11014a184d286772fe11a49f5b838
+MD5 338c35ff3d7db2311e53fe104dc941d0 tovid-0.28-r1.ebuild 2067
+RMD160 f31da79129189bcf35e4e325d8f0a6617d8041b8 tovid-0.28-r1.ebuild 2067
+SHA256 b87b569e84b6bfa3b9f5a690f069a86c4ff11014a184d286772fe11a49f5b838 tovid-0.28-r1.ebuild 2067
 EBUILD tovid-0.28.ebuild 1895 RMD160 76d5dcd1a571cd6e33b55e8858f97923b582ead4 SHA1 22cc418ffb8d72d455c70dfd1d654b7d1a131c22 SHA256 afd2842cd983ebab5d45f5faac6d716c51e4ac28201fb1d938f114724914ea73
 MD5 0d5f7fff9ef9749f4df5a62e2ecb5e82 tovid-0.28.ebuild 1895
 RMD160 76d5dcd1a571cd6e33b55e8858f97923b582ead4 tovid-0.28.ebuild 1895
 SHA256 afd2842cd983ebab5d45f5faac6d716c51e4ac28201fb1d938f114724914ea73 tovid-0.28.ebuild 1895
-MISC ChangeLog 435 RMD160 bc1ceb97fa51a7f87f656ac21a55f7458cee5ab4 SHA1 1ce920bf7d89989438da1910f15b37a59d433b22 SHA256 dbf2bc49a415a41f87d731538f87f4d0e0ab1267c84aaa7af2f9af55c48604c6
-MD5 cb100bf185483eb72b195bd9688d60e8 ChangeLog 435
-RMD160 bc1ceb97fa51a7f87f656ac21a55f7458cee5ab4 ChangeLog 435
-SHA256 dbf2bc49a415a41f87d731538f87f4d0e0ab1267c84aaa7af2f9af55c48604c6 ChangeLog 435
+MISC ChangeLog 593 RMD160 3d9c963bfd465f091862104a5210963c139f8e92 SHA1 829fbe40cca04e9b0274e55a43ebb0a0a4a27de4 SHA256 6a8175a5ae4d0df6c6df995c5ba1aaeb21f8b77ea945862816c7f1590932c97f
+MD5 26caf2ce042da8316dff137ab3f19e20 ChangeLog 593
+RMD160 3d9c963bfd465f091862104a5210963c139f8e92 ChangeLog 593
+SHA256 6a8175a5ae4d0df6c6df995c5ba1aaeb21f8b77ea945862816c7f1590932c97f ChangeLog 593
 MISC metadata.xml 243 RMD160 bec126773cb14d955fbf716c890dc9ed16e7bb91 SHA1 9f167df30ba9b0fc7d8db4e73135d8091489593c SHA256 2f9da26cb66f6247e479d75db4db219b6ac62f05ec991eb9ae22431f51320c35
 MD5 18be178ff2124446700dee887d9b6743 metadata.xml 243
 RMD160 bec126773cb14d955fbf716c890dc9ed16e7bb91 metadata.xml 243
@@ -14,3 +22,6 @@ SHA256 2f9da26cb66f6247e479d75db4db219b6ac62f05ec991eb9ae22431f51320c35 metadata
 MD5 2169dfabbf4a5f98e9e6dfcb792c2452 files/digest-tovid-0.28 232
 RMD160 e7ff195610352321ad986d7281a35bde816d29d6 files/digest-tovid-0.28 232
 SHA256 b1196bd3535b49aed91723f5d8b8be31bf01d622577da9f1350445eca392d717 files/digest-tovid-0.28 232
+MD5 2169dfabbf4a5f98e9e6dfcb792c2452 files/digest-tovid-0.28-r1 232
+RMD160 e7ff195610352321ad986d7281a35bde816d29d6 files/digest-tovid-0.28-r1 232
+SHA256 b1196bd3535b49aed91723f5d8b8be31bf01d622577da9f1350445eca392d717 files/digest-tovid-0.28-r1 232

diff --git a/media-video/tovid/files/digest-tovid-0.28-r1 b/media-video/tovid/files/digest-tovid-0.28-r1
new file mode 100644 (file)
index 0000000..28eacb6
--- /dev/null
+++ b/media-video/tovid/files/digest-tovid-0.28-r1
@@ -0,0 +1,3 @@
+MD5 c5544382262af04e09974eced0d4495f tovid-0.28.tar.gz 295903
+RMD160 eb721c2785ea8282aebb8e50015cd450944d39b2 tovid-0.28.tar.gz 295903
+SHA256 fbd73eb3d1f0123ac88666a24a4ba14bd396c7edf5b3f802896c414ac32819f5 tovid-0.28.tar.gz 295903

diff --git a/media-video/tovid/files/makemenu_png8.patch b/media-video/tovid/files/makemenu_png8.patch
new file mode 100644 (file)
index 0000000..838ddd9
--- /dev/null
+++ b/media-video/tovid/files/makemenu_png8.patch
@@ -0,0 +1,38 @@
+--- src/makemenu       2006-07-06 05:32:48.000000000 +0200
++++ src/makemenu.new   2006-10-16 15:57:14.000000000 +0200
+@@ -473,7 +473,7 @@
+     -font \"$USE_TITLE_FONT\" -weight bold -pointsize $TITLE_SIZE \
+     -fill \"$HIGHLIGHT_COLOR\" -draw \"gravity $TEXT_ALIGN $BUTTON_TEXT\" \
+     -type Palette -colors 3 \
+-    png8:$FG_HIGHLIGHT"
++    $FG_HIGHLIGHT"
+ echo $SEPARATOR
+ echo "Creating the highlighted titles with the following command:"
+ echo $"$MAGICK_CMD"
+@@ -484,7 +484,7 @@
+     -font \"$USE_TITLE_FONT\" -weight bold -pointsize $TITLE_SIZE \
+     -fill \"$SELECT_COLOR\" -draw \"gravity $TEXT_ALIGN $BUTTON_TEXT\" \
+     -type Palette -colors 3 \
+-    png8:$FG_SELECTION"
++    $FG_SELECTION"
+ echo $SEPARATOR
+ echo "Creating the selection titles with the following command:"
+ echo $"$MAGICK_CMD"
+@@ -500,7 +500,7 @@
+ 
+ # Composite highlight canvas with transparent background
+ MAGICK_CMD="composite -compose Src -gravity center \
+-    $FG_HIGHLIGHT $BG_CANVAS png8:\"$OUT_PREFIX.hi.png\""
++    $FG_HIGHLIGHT $BG_CANVAS \"$OUT_PREFIX.hi.png\""
+ echo $SEPARATOR
+ echo "Compositing highlighted titles with the following command:"
+ echo $"$MAGICK_CMD"
+@@ -508,7 +508,7 @@
+ 
+ # Composite highlight canvas with transparent background
+ MAGICK_CMD="composite -compose Src -gravity center \
+-    $FG_SELECTION $BG_CANVAS png8:\"$OUT_PREFIX.sel.png\""
++    $FG_SELECTION $BG_CANVAS \"$OUT_PREFIX.sel.png\""
+ echo $SEPARATOR
+ echo "Compositing selection titles with the following command:"
+ echo $"$MAGICK_CMD"

diff --git a/media-video/tovid/tovid-0.28-r1.ebuild b/media-video/tovid/tovid-0.28-r1.ebuild
new file mode 100644 (file)
index 0000000..98d2ded
--- /dev/null
+++ b/media-video/tovid/tovid-0.28-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.28-r1.ebuild,v 1.1 2006/10/23 05:59:23 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=""
+DEPEND=""
+RDEPEND="media-video/mplayer
+       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/wxpython-2.6
+       app-cdr/dvd+rw-tools
+       app-cdr/cdrdao"
+
+KEYWORDS="~x86 ~amd64"
+LICENSE="GPL-2"
+RESTRICT="nomirror"
+SLOT="0"
+
+pkg_setup() {
+       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}"
+       # Patch to fix makexml from the gui app
+       epatch "${FILESDIR}/makemenu_png8.patch" || die "epatch died"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake died"
+}
+
+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 ""
+}