Mirror tarballs since SF project is dead; Error in calculation of chapter length patch, bug 222637

(Portage version: 2.1.5.3)

6 files changed, 74 insertions, 9 deletions

diff --git a/media-video/lsdvd/ChangeLog b/media-video/lsdvd/ChangeLog
index 15ebe2e4ff76..87f0cde499bc 100644
--- a/media-video/lsdvd/ChangeLog
+++ b/media-video/lsdvd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/lsdvd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.36 2008/01/02 14:04:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.37 2008/06/10 14:06:57 beandog Exp $
+
+*lsdvd-0.16-r1 (10 Jun 2008)
+
+  10 Jun 2008; Steve Dibb <beandog@gentoo.org> +files/lsdvd-0.16-usec.patch,
+  lsdvd-0.10.ebuild, lsdvd-0.15.ebuild, lsdvd-0.16.ebuild,
+  +lsdvd-0.16-r1.ebuild:
+  Mirror tarballs since SF project is dead; Error in calculation of chapter
+  length patch, bug 222637
 
   02 Jan 2008; Raúl Porcel <armin76@gentoo.org> lsdvd-0.16.ebuild:
   Re-add ~ia64
diff --git a/media-video/lsdvd/files/lsdvd-0.16-usec.patch b/media-video/lsdvd/files/lsdvd-0.16-usec.patch
new file mode 100644
index 000000000000..bfaa16e9615d
--- /dev/null
+++ b/media-video/lsdvd/files/lsdvd-0.16-usec.patch
@@ -0,0 +1,21 @@
+diff -uw lsdvd-0.16.orig/lsdvd.c lsdvd-0.16/lsdvd.c
+--- lsdvd-0.16.orig/lsdvd.c	2006-03-02 14:48:11.000000000 +0100
++++ lsdvd-0.16/lsdvd.c	2008-05-18 13:58:15.000000000 +0200
+@@ -92,7 +92,7 @@
+ 	ms += (((dt->second & 0xf0) >> 3) * 5 + (dt->second & 0x0f)) * 1000;
+ 
+ 	if(fps > 0)
+-	ms += ((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f) * 1000.0 / fps;
++	ms += (((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f)) * 1000.0 / fps;
+ 
+ 	return ms;
+ }
+@@ -107,7 +107,7 @@
+ {
+ 	double fps = frames_per_s[(dt->frame_u & 0xc0) >> 6];
+ 
+-	pt->usec = pt->usec + ((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f) * 1000.0 / fps;
++	pt->usec = pt->usec + (((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f)) * 1000.0 / fps;
+ 	pt->second = pt->second + ((dt->second & 0xf0) >> 3) * 5 + (dt->second & 0x0f);
+ 	pt->minute = pt->minute + ((dt->minute & 0xf0) >> 3) * 5 + (dt->minute & 0x0f);
+ 	pt->hour = pt->hour + ((dt->hour &   0xf0) >> 3) * 5 + (dt->hour   & 0x0f);
diff --git a/media-video/lsdvd/lsdvd-0.10.ebuild b/media-video/lsdvd/lsdvd-0.10.ebuild
index 53e6ec05dd40..9e41936af5f0 100644
--- a/media-video/lsdvd/lsdvd-0.10.ebuild
+++ b/media-video/lsdvd/lsdvd-0.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.10.ebuild,v 1.10 2006/04/01 11:59:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.10.ebuild,v 1.11 2008/06/10 14:06:57 beandog Exp $
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://untrepid.com/lsdvd/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/lsdvd/lsdvd-0.15.ebuild b/media-video/lsdvd/lsdvd-0.15.ebuild
index e82cbcd25c39..864611be00e5 100644
--- a/media-video/lsdvd/lsdvd-0.15.ebuild
+++ b/media-video/lsdvd/lsdvd-0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.15.ebuild,v 1.13 2006/10/29 22:55:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.15.ebuild,v 1.14 2008/06/10 14:06:57 beandog Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -9,7 +9,7 @@ inherit eutils autotools
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://untrepid.com/lsdvd/"
-SRC_URI="mirror://sourceforge/${P}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/lsdvd/lsdvd-0.16-r1.ebuild b/media-video/lsdvd/lsdvd-0.16-r1.ebuild
new file mode 100644
index 000000000000..f69400b78f4f
--- /dev/null
+++ b/media-video/lsdvd/lsdvd-0.16-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16-r1.ebuild,v 1.1 2008/06/10 14:06:57 beandog Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="Utility for getting info out of DVDs"
+HOMEPAGE="http://untrepid.com/lsdvd/"
+SRC_URI="mirror://gentoo/lsdvd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/libdvdread"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-types.patch"
+
+	# bug 222637
+	epatch "${FILESDIR}/${P}-usec.patch"
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS NEWS README
+}
diff --git a/media-video/lsdvd/lsdvd-0.16.ebuild b/media-video/lsdvd/lsdvd-0.16.ebuild
index 2e6b2f0c915a..a74e74bdbc9a 100644
--- a/media-video/lsdvd/lsdvd-0.16.ebuild
+++ b/media-video/lsdvd/lsdvd-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16.ebuild,v 1.10 2008/01/02 14:04:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16.ebuild,v 1.11 2008/06/10 14:06:57 beandog Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -9,7 +9,7 @@ inherit eutils autotools
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://untrepid.com/lsdvd/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"