tvtime update and gcc41 fix

Package-Manager: portage-2.0.53_rc7

5 files changed, 144 insertions, 8 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index bb918b986fa2..ef952b44d32c 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.21 2005/09/29 15:47:40 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.22 2005/11/28 22:37:15 hanno Exp $
+
+*tvtime-1.0.2 (28 Nov 2005)
+
+  28 Nov 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/tvtime-1.0.2-gcc41.patch, +tvtime-1.0.2.ebuild:
+  Version bump and fix for gcc 4.1.
 
 *tvtime-1.0.1 (29 Sep 2005)
 
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index c96ae8464140..3288d44d5145 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,12 +1,25 @@
-MD5 461fa690aaeed122104c5654d4b98714 ChangeLog 4629
-MD5 d19bb57e494a860d7ed0aaa7961d8406 metadata.xml 247
-MD5 013a7785e90003c22261a994e06146ca tvtime-0.9.12.ebuild 1284
-MD5 584e0127bcc058f665ecd1c5833c5929 tvtime-0.9.15.ebuild 1473
-MD5 1f96f671cfee328c5d95949ef1bea237 tvtime-0.99.ebuild 1393
-MD5 8476949ca4ef9c07c35153ea05418869 tvtime-1.0.1.ebuild 1392
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7185d4ed722abf036fc55d7bd6465656 ChangeLog 4800
 MD5 352d39fb5ee53bdb9ea901579c0d7b9d files/digest-tvtime-0.9.12 66
 MD5 da73995bcdbdc131e5bf2864d5e3b85f files/digest-tvtime-0.9.15 66
 MD5 3284a56b7388007a53ad0a907bda2b40 files/digest-tvtime-0.99 64
+MD5 41a4847d5d361629e869a31052331e3c files/digest-tvtime-1.0.1 65
+MD5 f009432a1e8b29f4833a4b638823590b files/digest-tvtime-1.0.2 65
 MD5 f868d4bcfd4c67150a6b209d3cddf1b6 files/tvtime-0.9.10-make.patch 4489
+MD5 c782789825dfa664e1f6fcc96ac7246c files/tvtime-1.0.2-gcc41.patch 2114
 MD5 ee506c523f1880bb929e7e5f25d4fe6b files/tvtime-pic.patch 248
-MD5 41a4847d5d361629e869a31052331e3c files/digest-tvtime-1.0.1 65
+MD5 d19bb57e494a860d7ed0aaa7961d8406 metadata.xml 247
+MD5 013a7785e90003c22261a994e06146ca tvtime-0.9.12.ebuild 1284
+MD5 584e0127bcc058f665ecd1c5833c5929 tvtime-0.9.15.ebuild 1473
+MD5 1f96f671cfee328c5d95949ef1bea237 tvtime-0.99.ebuild 1393
+MD5 8476949ca4ef9c07c35153ea05418869 tvtime-1.0.1.ebuild 1392
+MD5 fdf3c824b7c0fc73b6d72b93848b6d19 tvtime-1.0.2.ebuild 1440
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDi4axr2QksT29OyARAlxXAJ4hzXZ6hSyVcBpNo7rc3R310yJxPgCggAqO
+/80HnyXZVQYZJfmL5FdzsLY=
+=KjFN
+-----END PGP SIGNATURE-----
diff --git a/media-tv/tvtime/files/digest-tvtime-1.0.2 b/media-tv/tvtime/files/digest-tvtime-1.0.2
new file mode 100644
index 000000000000..28eaa72e832d
--- /dev/null
+++ b/media-tv/tvtime/files/digest-tvtime-1.0.2
@@ -0,0 +1 @@
+MD5 4b3d03afe61be239b08b5e522cd8afed tvtime-1.0.2.tar.gz 1645742
diff --git a/media-tv/tvtime/files/tvtime-1.0.2-gcc41.patch b/media-tv/tvtime/files/tvtime-1.0.2-gcc41.patch
new file mode 100644
index 000000000000..58e9bb204e10
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2-gcc41.patch
@@ -0,0 +1,57 @@
+diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
+--- tvtime-1.0.1/plugins/greedyh.asm	2005-08-14 18:16:43.000000000 +0200
++++ tvtime-1.0.1-gcc41/plugins/greedyh.asm	2005-11-28 17:53:09.210774544 +0100
+@@ -18,7 +18,7 @@
+ 
+ #include "x86-64_macros.inc"
+ 
+-void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
++void FUNCT_NAME(TDeinterlaceInfo* pInfo)
+ {
+     int64_t i;
+     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
+diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
+--- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc	2004-10-20 17:31:05.000000000 +0200
++++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc	2005-11-28 17:53:33.251119856 +0100
+@@ -5,9 +5,9 @@
+ #endif
+ 
+ #ifdef USE_STRANGE_BOB
+-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
++#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
+ #else
+-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
++#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
+ #endif
+ 
+ int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
+diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
+--- tvtime-1.0.1/plugins/tomsmocomp.cpp	2004-10-20 19:38:04.000000000 +0200
++++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp	2005-11-28 17:52:53.862107896 +0100
+@@ -31,7 +31,7 @@
+ 
+ #define IS_MMX
+ #define SSE_TYPE MMX
+-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
++#define FUNCT_NAME filterDScaler_MMX
+ #include "tomsmocomp/TomsMoCompAll.inc"
+ #undef  IS_MMX
+ #undef  SSE_TYPE
+@@ -39,7 +39,7 @@
+ 
+ #define IS_3DNOW
+ #define SSE_TYPE 3DNOW
+-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
++#define FUNCT_NAME filterDScaler_3DNOW
+ #include "tomsmocomp/TomsMoCompAll.inc"
+ #undef  IS_3DNOW
+ #undef  SSE_TYPE
+@@ -47,7 +47,7 @@
+ 
+ #define IS_SSE
+ #define SSE_TYPE SSE
+-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
++#define FUNCT_NAME filterDScaler_SSE
+ #include "tomsmocomp/TomsMoCompAll.inc"
+ #undef  IS_SSE
+ #undef  SSE_TYPE
diff --git a/media-tv/tvtime/tvtime-1.0.2.ebuild b/media-tv/tvtime/tvtime-1.0.2.ebuild
new file mode 100644
index 000000000000..67ef93603ed3
--- /dev/null
+++ b/media-tv/tvtime/tvtime-1.0.2.ebuild
@@ -0,0 +1,59 @@
+# 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-1.0.2.ebuild,v 1.1 2005/11/28 22:37:15 hanno Exp $
+
+inherit eutils
+
+DESCRIPTION="High quality television application for use with video capture cards"
+HOMEPAGE="http://tvtime.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="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}
+	cd "${S}"
+
+	epatch ${FILESDIR}/tvtime-1.0.2-gcc41.patch
+
+	# use 'tvtime' for the application icon see bug #66293
+	sed -i -e "s/tvtime.png/tvtime/" docs/net-tvtime.desktop
+
+	# patch to adapt to PIC or __PIC__ for pic support
+	epatch "${FILESDIR}"/${PN}-pic.patch #74227
+}
+
+src_compile() {
+	econf $(use_enable nls) || 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
+}
+
+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
+}