added 2 patches, solving bug #144691.

(Portage version: 2.1.2.7)

5 files changed, 194 insertions, 2 deletions

diff --git a/media-video/qvamps/ChangeLog b/media-video/qvamps/ChangeLog
index 6e7440778b61..6f6c6a39610d 100644
--- a/media-video/qvamps/ChangeLog
+++ b/media-video/qvamps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/qvamps
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qvamps/ChangeLog,v 1.6 2006/10/01 20:33:51 sbriesen Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qvamps/ChangeLog,v 1.7 2007/05/16 06:42:44 sbriesen Exp $
+
+*qvamps-0.98-r1 (16 May 2007)
+
+  16 May 2007; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/qvamps-0.98-fgcmgr.diff, +files/qvamps-0.98-xmlwriter.diff,
+  +qvamps-0.98-r1.ebuild:
+  added 2 patches, solving bug #144691.
 
   01 Oct 2006; Stefan Briesenick <sbriesen@gentoo.org>
   -files/qvamps-0.96-dvdread.patch, -qvamps-0.96.ebuild:
diff --git a/media-video/qvamps/files/digest-qvamps-0.98-r1 b/media-video/qvamps/files/digest-qvamps-0.98-r1
new file mode 100644
index 000000000000..8335fbce4476
--- /dev/null
+++ b/media-video/qvamps/files/digest-qvamps-0.98-r1
@@ -0,0 +1,3 @@
+MD5 91b0ec57fc02c902082f2bd38d77527a qvamps-0.98.tar.gz 378207
+RMD160 eb54f6705c014a52e118c825adbd46f06f4e6f0a qvamps-0.98.tar.gz 378207
+SHA256 045069bc4154893c7e98497da8181c00f77c2302e8013da70cd015eb5136b712 qvamps-0.98.tar.gz 378207
diff --git a/media-video/qvamps/files/qvamps-0.98-fgcmgr.diff b/media-video/qvamps/files/qvamps-0.98-fgcmgr.diff
new file mode 100644
index 000000000000..22336d3d613b
--- /dev/null
+++ b/media-video/qvamps/files/qvamps-0.98-fgcmgr.diff
@@ -0,0 +1,17 @@
+--- qvamps-0.98.orig/FpcMgr.pm	2006-02-19 09:14:01.000000000 +0100
++++ qvamps-0.98/FpcMgr.pm	2006-08-22 22:45:20.000000000 +0200
+@@ -246,10 +246,10 @@
+ }
+ 
+ 
+-sub subtitle_stream
+-{
+-  return audio_combo -> currentItem () - 1;
+-}
++sub subtitle_stream 
++{ 
++  return subtitle_combo -> currentItem () - 1; 
++} 
+ 
+ 
+ 1;
diff --git a/media-video/qvamps/files/qvamps-0.98-xmlwriter.diff b/media-video/qvamps/files/qvamps-0.98-xmlwriter.diff
new file mode 100644
index 000000000000..3dcb60392e78
--- /dev/null
+++ b/media-video/qvamps/files/qvamps-0.98-xmlwriter.diff
@@ -0,0 +1,108 @@
+--- qvamps-0.98.orig/XmlWriter.pm	2006-02-28 19:49:02.000000000 +0100
++++ qvamps-0.98/XmlWriter.pm		2006-08-21 22:07:47.000000000 +0200
+@@ -178,6 +178,7 @@
+     # loop over all selected titles
+     foreach my $title_nr (@{$selected_titles})
+     {
++      my $last_pgcn;
+       my @chapter_marks;
+       my $any_program_selected;
+       my $tsn = dvd -> title_set_nr ($title_nr);
+@@ -198,6 +199,8 @@
+ 	  $any_program_selected = 1
+ 	    unless ($any_program_selected ||
+ 		    !vts_list_items -> any_program_selected ($tsn, $pgcn));
++
++	  $last_pgcn = $pgcn;
+ 	}
+ 
+ 	$chapter_marks [$pgcn] [$pgn] = 1;
+@@ -215,7 +218,7 @@
+ 	                                selected_subtitle_streams ($title_nr);
+ 
+       # write tags for start of title
+-      titleset_begin_tag ();
++      titleset_begin_tag ($menu_box_checked && $nr_of_menu_items);
+       titles_begin_tag ();
+       video_tag ($tsn);
+       audio_tags ($tsn, $selected_audio_streams);
+@@ -264,6 +267,9 @@
+ 	  }
+ 	}
+ 
++	title_post_tag () if ($menu_box_checked &&
++			      $nr_of_menu_items && $pgcn == $last_pgcn);
++
+ 	# write pgc end tag
+ 	title_pgc_end_tag ();
+       }
+@@ -287,7 +293,7 @@
+       my $nr_of_subtitle_streams = dvd -> nr_of_subtitle_streams ($tsn);
+ 
+       # write tags for start of title
+-      titleset_begin_tag ();
++      titleset_begin_tag ($menu_box_checked && $nr_of_menu_items);
+       titles_begin_tag ();
+       video_tag ($tsn);
+       audio_tags ($tsn, [ 1 .. $nr_of_audio_streams ]);
+@@ -301,7 +307,7 @@
+ 	next unless (vts_list_items -> any_program_selected ($tsn, $pgcn));
+ 
+ 	# write pgc begin tag
+-	pgc_begin_tag ($tsn, $pgcn);
++	title_pgc_begin_tag ($tsn, $pgcn);
+ 
+ 	# loop over all programs of PGC
+ 	foreach my $pgn (1 .. dvd -> nr_of_programs ($tsn, $pgcn))
+@@ -328,7 +334,7 @@
+ 	}
+ 
+ 	# write pgc end tag
+-	pgc_end_tag ();
++	title_pgc_end_tag ();
+       }
+ 
+       # write tags for end of title
+@@ -454,14 +460,20 @@
+ 
+ sub titleset_begin_tag
+ {
++  my $genjmp = shift;
++
+   print {&fh} "  <titleset>\n";
+-  print {&fh} "    <menus>\n";
+-  print {&fh} "      <pgc entry=\"root\">\n";
+-  print {&fh} "        <pre>\n";
+-  print {&fh} "          jump vmgm menu;\n";
+-  print {&fh} "        </pre>\n";
+-  print {&fh} "      </pgc>\n";
+-  print {&fh} "    </menus>\n";
++
++  if ($genjmp)
++  {
++    print {&fh} "    <menus>\n";
++    print {&fh} "      <pgc entry=\"root\">\n";
++    print {&fh} "        <pre>\n";
++    print {&fh} "          jump vmgm menu;\n";
++    print {&fh} "        </pre>\n";
++    print {&fh} "      </pgc>\n";
++    print {&fh} "    </menus>\n";
++  }
+ }
+ 
+ 
+@@ -598,6 +610,14 @@
+ }
+ 
+ 
++sub title_post_tag
++{
++  print {&fh} "        <post>\n";
++  print {&fh} "          call vmgm menu;\n";
++  print {&fh} "        </post>\n";
++}
++
++
+ sub title_vob_tag
+ {
+   my $tsn              = shift;
diff --git a/media-video/qvamps/qvamps-0.98-r1.ebuild b/media-video/qvamps/qvamps-0.98-r1.ebuild
new file mode 100644
index 000000000000..6231045a2466
--- /dev/null
+++ b/media-video/qvamps/qvamps-0.98-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qvamps/qvamps-0.98-r1.ebuild,v 1.1 2007/05/16 06:42:44 sbriesen Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+DESCRIPTION="Qt frontend for vamps"
+HOMEPAGE="http://vamps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vamps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/swig
+	dev-lang/perl
+	dev-perl/PerlQt
+	>=media-libs/libdvdread-0.9.6"
+
+RDEPEND="${DEPEND}
+	>=media-video/dvdauthor-0.6.11
+	>=media-video/mjpegtools-1.8.0
+	>=media-video/vamps-0.99.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# set correct libdir
+	sed -i -e "s:/lib/qvamps/:/$(get_libdir)/qvamps/:g" Makefile qvamps
+
+	# apply patches (see bug #144691)
+	epatch "${FILESDIR}/${P}-fgcmgr.diff"
+	epatch "${FILESDIR}/${P}-xmlwriter.diff"
+}
+
+src_compile() {
+	# Need to fake out Qt or we'll get sandbox problems
+	export REALHOME="${HOME}" HOME="${T}/fakehome"
+	addwrite "${QTDIR}/etc/settings"
+	mkdir -p "${HOME}/".{kde,qt}
+
+	# -fPIC is needed for shared objects on some platforms (amd64 and others)
+	append-flags -fPIC
+
+	emake PREFIX="/usr" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	make PREFIX="${D}usr" install || die "make install failed"
+	dodoc ChangeLog README INSTALL
+
+	newicon images/icon.png qvamps.png
+	make_desktop_entry qvamps qVamps qvamps.png
+}