Version bump for people to stabilize as this does not contain the PIC patch (will integrate in next rev).

(Portage version: 2.1.2_pre1)

4 files changed, 88 insertions, 2 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index c715e297d62d..4efef4cdb10d 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libdv
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.54 2006/06/05 09:19:22 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.55 2006/09/24 13:04:53 vapier Exp $
+
+*libdv-0.104-r2 (24 Sep 2006)
+
+  24 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/libdv-0.104-playdv-segv.patch, +libdv-0.104-r2.ebuild:
+  Version bump for people to stabilize as this does not contain the PIC patch
+  (will integrate in next rev).
 
   05 Jun 2006; Markus Rothe <corsair@gentoo.org> libdv-0.104-r1.ebuild:
   Added ~ppc64
diff --git a/media-libs/libdv/files/digest-libdv-0.104-r2 b/media-libs/libdv/files/digest-libdv-0.104-r2
new file mode 100644
index 000000000000..e5209c8ed3c6
--- /dev/null
+++ b/media-libs/libdv/files/digest-libdv-0.104-r2
@@ -0,0 +1,3 @@
+MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
+RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
+SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/libdv-0.104-playdv-segv.patch b/media-libs/libdv/files/libdv-0.104-playdv-segv.patch
new file mode 100644
index 000000000000..6bc02dd056b0
--- /dev/null
+++ b/media-libs/libdv/files/libdv-0.104-playdv-segv.patch
@@ -0,0 +1,25 @@
+2006-01-15  Dan Dennedy <dan@dennedy.org>
+
+	* playdv.c: bugfix segfault on exit due to dv_display_exit()
+	  being called twice: once in main() and second in atexit
+	  handler created by dv_display. Thanks for hint provided
+	  by Jean-Francois Panisset.
+
+Index: playdv/playdv.c
+===================================================================
+RCS file: /cvsroot/libdv/libdv/playdv/playdv.c,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -p -r1.14 -r1.15
+--- playdv/playdv.c	23 Nov 2003 22:59:08 -0000	1.14
++++ playdv/playdv.c	15 Jan 2006 21:23:15 -0000	1.15
+@@ -511,9 +511,6 @@ restart:
+   if(!dv_player->arg_disable_video) {
+     dv_display_exit(dv_player->display);
+   } /* if */
+-  if(!dv_player->arg_disable_audio) {
+-    dv_oss_close(dv_player->oss);
+-  } /* if  */
+   dv_decoder_free(dv_player->decoder);
+   free(dv_player);
+   exit(0);
diff --git a/media-libs/libdv/libdv-0.104-r2.ebuild b/media-libs/libdv/libdv-0.104-r2.ebuild
new file mode 100644
index 000000000000..db7af83e03a6
--- /dev/null
+++ b/media-libs/libdv/libdv-0.104-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r2.ebuild,v 1.1 2006/09/24 13:04:53 vapier Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="Software codec for dv-format video (camcorders etc)"
+HOMEPAGE="http://libdv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gtk sdl xv"
+
+RDEPEND="dev-libs/popt
+	gtk? ( =x11-libs/gtk+-1.2* )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	xv? ( x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	gtk? ( x11-proto/xextproto x11-libs/libXt )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
+	epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
+	epatch "${FILESDIR}"/${P}-playdv-segv.patch
+	epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
+	epatch "${FILESDIR}/"${P}-inline.patch
+
+	elibtoolize
+	epunt_cxx #74497
+}
+
+src_compile() {
+	econf \
+		$(use_with debug) \
+		$(use_enable gtk) $(use_enable gtk gtktest) \
+		$(use_enable sdl) \
+		$(use_enable xv) \
+		|| die "econf failed"
+	make || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
+}