New version of tvtime, 0.9.15 - as requested in bug #66293. Thanks to contributors there, especially <bugtracker@surasoft.com> and <dgp85@users.sourceforge.net> for their help. Also includes a patch for PIC/__PIC__ from <co@kevquinn.com>, see bug #24227.

8 files changed, 104 insertions, 10 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index bd792cb1cb9b..323178653d55 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/tvtime
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.16 2004/07/21 03:34:36 lv Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.17 2005/02/24 08:16:51 obz Exp $
+
+*tvtime-0.9.15 (24 Feb 2005)
+
+  24 Feb 2005; Mike Gardiner <obz@gentoo.org> metadata.xml,
+  +files/tvtime-0.9.15-pic.patch, +tvtime-0.9.15.ebuild:
+  New version of tvtime, 0.9.15 - as requested in bug #66293. 
+  Thanks to contributors there, especially 
+  <bugtracker@surasoft.com> and <dgp85@users.sourceforge.net> 
+  for their help. Also includes a patch for PIC/__PIC__ 
+  from <co@kevquinn.com>, see bug #24227.
 
   20 Jul 2004; Travis Tilley <lv@gentoo.org> tvtime-0.9.12.ebuild:
   stable on amd64
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index 3daf97935fca..94d92726af07 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,7 +1,10 @@
-MD5 d486ad11275aa47108b293aab56e66ba tvtime-0.9.10-r1.ebuild 1557
-MD5 a48d47e1d4acebe3ff889fd68ef32f13 tvtime-0.9.12.ebuild 1283
-MD5 3c06a0e2c2957d3b9c0322047ef546e7 ChangeLog 3642
-MD5 20e2255501865de5b568424821abf69d metadata.xml 161
+MD5 66c479aacdfd41c2a63716326fb468e8 tvtime-0.9.10-r1.ebuild 1552
+MD5 7f0d07fe6962f5524bf1963292e913ab tvtime-0.9.15.ebuild 1450
+MD5 013a7785e90003c22261a994e06146ca tvtime-0.9.12.ebuild 1284
+MD5 84fe2fba231a92ddad06d7c8e3d78c80 ChangeLog 4060
+MD5 d19bb57e494a860d7ed0aaa7961d8406 metadata.xml 247
 MD5 e6cc6888101a6d0b8c9d1ae128b68e7a files/digest-tvtime-0.9.10-r1 66
 MD5 352d39fb5ee53bdb9ea901579c0d7b9d files/digest-tvtime-0.9.12 66
+MD5 da73995bcdbdc131e5bf2864d5e3b85f files/digest-tvtime-0.9.15 66
+MD5 cb9c972885700c76b8449d12915d019e files/tvtime-0.9.15-pic.patch 419
 MD5 f868d4bcfd4c67150a6b209d3cddf1b6 files/tvtime-0.9.10-make.patch 4489
diff --git a/media-tv/tvtime/files/digest-tvtime-0.9.15 b/media-tv/tvtime/files/digest-tvtime-0.9.15
new file mode 100644
index 000000000000..8b11ae9e55c6
--- /dev/null
+++ b/media-tv/tvtime/files/digest-tvtime-0.9.15
@@ -0,0 +1 @@
+MD5 bf1b1547e8979cb6486584684e315847 tvtime-0.9.15.tar.gz 1479340
diff --git a/media-tv/tvtime/files/tvtime-0.9.15-pic.patch b/media-tv/tvtime/files/tvtime-0.9.15-pic.patch
new file mode 100644
index 000000000000..81f65088f195
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-0.9.15-pic.patch
@@ -0,0 +1,12 @@
+diff -ur tvtime-0.9.15/src/cpu_accel.c tvtime-0.9.15-patched/src/cpu_accel.c
+--- tvtime-0.9.15/src/cpu_accel.c	2004-06-20 12:30:11.000000000 +0800
++++ tvtime-0.9.15-patched/src/cpu_accel.c	2005-02-24 16:01:46.665413504 +0800
+@@ -35,7 +35,7 @@
+     int AMD;
+     uint32_t caps;
+ 
+-#ifndef PIC
++#if !defined(PIC) && !defined(__PIC__)
+ #define cpuid(op,eax,ebx,ecx,edx)	\
+     __asm__ ("cpuid"			\
+ 	     : "=a" (eax),		\
diff --git a/media-tv/tvtime/metadata.xml b/media-tv/tvtime/metadata.xml
index a6b9e38a1b93..52669dc77e2a 100644
--- a/media-tv/tvtime/metadata.xml
+++ b/media-tv/tvtime/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
+<maintainer>
+	<email>obz@gentoo.org</email>
+	<name>Mike Gardiner</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-tv/tvtime/tvtime-0.9.10-r1.ebuild b/media-tv/tvtime/tvtime-0.9.10-r1.ebuild
index 97d1e3f1fbc3..061f2d2f3e74 100644
--- a/media-tv/tvtime/tvtime-0.9.10-r1.ebuild
+++ b/media-tv/tvtime/tvtime-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.10-r1.ebuild,v 1.8 2004/06/25 00:34:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.10-r1.ebuild,v 1.9 2005/02/24 08:16:51 obz Exp $
 
 inherit eutils
 
diff --git a/media-tv/tvtime/tvtime-0.9.12.ebuild b/media-tv/tvtime/tvtime-0.9.12.ebuild
index 7710c1281673..91ecff3ed236 100644
--- a/media-tv/tvtime/tvtime-0.9.12.ebuild
+++ b/media-tv/tvtime/tvtime-0.9.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.12.ebuild,v 1.6 2004/07/21 03:34:36 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.12.ebuild,v 1.7 2005/02/24 08:16:51 obz Exp $
 
 DESCRIPTION="High quality television application for use with video capture cards."
 HOMEPAGE="http://tvtime.net/"
diff --git a/media-tv/tvtime/tvtime-0.9.15.ebuild b/media-tv/tvtime/tvtime-0.9.15.ebuild
new file mode 100644
index 000000000000..4d500d99a7d2
--- /dev/null
+++ b/media-tv/tvtime/tvtime-0.9.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.15.ebuild,v 1.1 2005/02/24 08:16:51 obz Exp $
+
+inherit eutils
+
+DESCRIPTION="High quality television application for use with video capture cards."
+HOMEPAGE="http://tvtime.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="pic nls"
+
+RDEPEND="virtual/x11
+	>=media-libs/freetype-2
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=dev-libs/libxml2-2.5.11"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+
+	unpack ${A}
+	# use 'tvtime' for the application icon see bug #66293
+	sed -i -e "s/tvtime.png/tvtime/" ${S}/docs/net-tvtime.desktop
+	# patch to adapt to PIC or __PIC__ for pic support
+	# see bug #74227
+	epatch ${FILESDIR}/${P}-pic.patch
+
+}
+
+src_compile() {
+
+	econf `use_enable nls` \
+		  `use_with pic` || die "econf failed"
+
+	emake || die "compile problem"
+
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	dohtml docs/html/*
+	dodoc ChangeLog AUTHORS NEWS README COPYING data/COPYING.*
+
+}
+
+pkg_postinst() {
+	einfo "A default setup for ${PN} has been saved as"
+	einfo "/etc/tvtime/tvtime.xml. You may need to modify it"
+	einfo "for your needs."
+	einfo
+	einfo "Detailed information on ${PN} setup can be"
+	einfo "found at ${HOMEPAGE}help.html"
+	echo
+}
+