Add additional patch to fix alsa issues, bug 384215. Minor ebuild fixes from bug 385353 and idl0r.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

5 files changed, 46 insertions, 21 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index f89063c39f5f..5d9d635a9f51 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.53 2011/10/13 08:13:56 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.54 2011/10/14 21:16:50 a3li Exp $
+
+*tvtime-1.0.2_p20110131-r3 (14 Oct 2011)
+
+  14 Oct 2011; Alex Legler <a3li@gentoo.org> -tvtime-1.0.2_p20110131-r2.ebuild,
+  +tvtime-1.0.2_p20110131-r3.ebuild,
+  +files/tvtime-1.0.2_p20110131-underlinking.patch, metadata.xml:
+  Add additional patch to fix alsa issues, bug 384215. Minor ebuild fixes from
+  bug 385353 and idl0r.
 
 *tvtime-1.0.2_p20110131-r2 (13 Oct 2011)
 
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index 3a6cc1c7b2d5..69c101c6787d 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -10,20 +10,22 @@ AUX tvtime-1.0.2-xinerama.patch 1292 RMD160 1c725852d9c692786614b0e3710a5c38682c
 AUX tvtime-1.0.2_p20110131-autotools.patch 2519 RMD160 2caefca2215a67787774dd096c70d05dcd59f1f0 SHA1 f98c41c2cca295dc06ccdd13f7ab0bb7de7e0483 SHA256 5992ce49c0c76304911145e20c53505cf962f8e78ad0178d10fc177d4669b1b9
 AUX tvtime-1.0.2_p20110131-gettext.patch 2443 RMD160 0f28fdbc151dce2a3f78d8e77a2b806e4280c87e SHA1 dc0a3b184d565ce53ae35f63003b3d8e40f31848 SHA256 efdb636f290ee653eb0215041141ea7c0226396425dbe26ff5c4c9edf86e1ebd
 AUX tvtime-1.0.2_p20110131-libsupc++.patch 548 RMD160 af77a599ae572ada34825b6bb97675698f30cecf SHA1 e75c9fbbdc99d51fa9477ec4ff518340ddbc488e SHA256 3d155f21cd03bb98020504105768fb71922835f7180f454728b1e9637acddd7b
+AUX tvtime-1.0.2_p20110131-underlinking.patch 480 RMD160 5f7789ba84d0e73ac61d604df31b6ad3e178a6da SHA1 992b9f13aff22528b967040c4b85877885c4a2b5 SHA256 dd9b27116a3fa5f5349d2a6aac94e1d29b777e07a266108d3bf7ff77f78cc65e
 AUX tvtime-libpng-1.5.patch 449 RMD160 b5281d06d1365d0ed297497c96ba93ff497325b2 SHA1 ccd0506c59dd954e2fe2cc66033592185fc524ac SHA256 ab9842e0da83371d74bb75a67cc81fb056eeefbd1eaf592458e6e9986f38b27e
 AUX tvtime-pic.patch 254 RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf SHA1 3d90369da57861933b7cb99597d85de60416a358 SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41
-DIST tvtime-1.0.2-alsa.patch 17011 RMD160 b9e7e94c918990eb0e88ffc009f77f5e4322fa0d SHA1 139f714083a565cf3a65ab769857608c4d1bb9e3 SHA256 24cc62ee831dbaeb51ef374cf4622dec4b570985df1059f46bab1fe6880469d7
-DIST tvtime-1.0.2-alsamixer.patch 36484 RMD160 22237eb387403804ef86dc01ffdae7f0661be1cf SHA1 2c330d430714cbadb0653a8987a3dd9c2ca9cfdb SHA256 a03605fe8b8444895d57012f30137a2f0a4a5b736c59ec84b1d631427f9ff58e
+DIST tvtime-1.0.2-alsa-fixes.patch 4304 RMD160 352e411ba87c88521cf5ce331c56945e0d1078ba SHA1 25e9b6b25219c08efe1dfc7e134c0f701250cd88 SHA256 827bb1eef552cf777a44ba52bcd13849485e1014bf492b06dbc38efd165da371
+DIST tvtime-1.0.2-alsa-r1.patch 17031 RMD160 256580705c3e77bcf1b08256a8db80d749d04345 SHA1 18e06015ae569b291e4a412921f0ae78853ccc23 SHA256 fb97054807cb201c7d715c1da667975b4cb9aea0abb31c8d942a2e8d4c16f4ef
+DIST tvtime-1.0.2-alsamixer-r1.patch 36504 RMD160 bf71724599eaacece996410834e4ac8fc7ec877b SHA1 65ae34312040a259f4264f46e573a9b4d48cecef SHA256 7cc68aad9f39772177a6eb3852ec1cd9882480988dbb2a7f8c7b83c8c1187399
 DIST tvtime-1.0.2.tar.gz 1645742 RMD160 e7d9621054edba5833f4ea002be8979983fbf3dc SHA1 ea609876084b2d627a84a1f77bf81cc2175ee58e SHA256 aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523
 DIST tvtime-1.0.2_p20110131.tar.bz2 3800555 RMD160 64d15f09f3ebfe4399115168d355689470a6d03a SHA1 71fddd2624debb719faa3dd03aa827e93d8eb6db SHA256 37f8f87b52519f80e3d49c7a619706da2c45b526f67e13cdda21fbdf17e1c583
 EBUILD tvtime-1.0.2-r2.ebuild 2200 RMD160 55d6ad28970da609693321525b7e683675df1e17 SHA1 06e9ec116bdcca0b025ca12d82fa5526e41ba252 SHA256 b1c4c8e814b0e799da1cd50e82613dfe785f2adab420b82948c618a6a9ba8f08
-EBUILD tvtime-1.0.2_p20110131-r2.ebuild 2687 RMD160 6c50b50d70fd64a2220f39c21931c501c9b3c709 SHA1 be44337d19cdb1ecbd64b26f096232e981d2b0bc SHA256 f3c2534f0e767a069699ed42c57cfceb6a6c76069ace48a89b1f57eab970714f
-MISC ChangeLog 10073 RMD160 448fcc3a71ac03ad2a9ef8170c6b05b51ad7b6b5 SHA1 8e63d0f288363e8ddd52a47e618c7e70c918ddde SHA256 ac584b2698da0078815b61c6f8281ea56ba1cd246da7519edf1d3200542b6c9d
-MISC metadata.xml 298 RMD160 b3c50e3158896716b3eed3bf8a2592979388b8c0 SHA1 63ef4f15859c74802318b2caa220040a02e6863f SHA256 d3ccf40b1c0e6e264c8771fe382756028d2eaefa0bfa5c69900c6fe152db158c
+EBUILD tvtime-1.0.2_p20110131-r3.ebuild 2713 RMD160 f947e6c12041f983c3cf07ba0c7fb56fe485292a SHA1 b07dfc8a40ae5c57cb0c80991429ccaf86463fa9 SHA256 4d5e4e4f28772e05486578363aaddd600b58bd40f8aad75f3cff71c9f048996e
+MISC ChangeLog 10402 RMD160 85639c9118d98971cca96fba3feea4fb08583d24 SHA1 ff256cf6768d51a05d687d643b078afe1b39d6cd SHA256 f08e1cb099e0c0b5fb1a2e8cf90e7c1f73eb7f7caf4809111fe28e319148650b
+MISC metadata.xml 459 RMD160 6a80df6dfb1d5e7cec3f464891780b7b49db1f67 SHA1 b647da8e8ffa52ca497f27e59c5e35b30e5a5f66 SHA256 7e42f1f1905968b18a8a041ece14a2750209d04bac97cb06eb534bb7aa8cf8c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6Wnc0ACgkQ3Ca6Xy8+rvQMkQEAhT3oSM5+zfucxvFsNNUZRe5W
-B6tVu+cISN8eLotaz6YA/j+07ChX7EBMUtGFRsBIDuhitPM5dE4RNCFfdbAL/yOh
-=PtEq
+iF4EAREIAAYFAk6YpswACgkQ3Ca6Xy8+rvRmEAD6AsiFdiNffLre1eMXrIhd7Nve
+xWD16Js+m88W24SEkQUA/3RzzhBpxPVJHrjMjUV2U5WcLTyK+dDuFLtCFrZG1/+u
+=5auN
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvtime/files/tvtime-1.0.2_p20110131-underlinking.patch b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-underlinking.patch
new file mode 100644
index 000000000000..eed4beac34d5
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-underlinking.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2011-10-14 22:21:20.897781921 +0200
++++ src/Makefile.am	2011-10-14 22:21:30.368781581 +0200
+@@ -74,7 +74,7 @@
+ 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
+ 	$(FONT_CFLAGS) $(AM_CFLAGS)
+ tvtime_LDADD  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
+-	$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++
++	$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++ -lpthread
+ 
+ tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-command.c
diff --git a/media-tv/tvtime/metadata.xml b/media-tv/tvtime/metadata.xml
index 987c4080e67d..58373b196d2a 100644
--- a/media-tv/tvtime/metadata.xml
+++ b/media-tv/tvtime/metadata.xml
@@ -7,4 +7,10 @@
 		<name>Alex Legler</name>
 		<description>Please CC on bugs</description>
 	</maintainer>
+	<use>
+		<flag name="alsa">
+			Enables an EXPERIMENTAL ALSA patch by the Ubuntu maintainers.
+			Several problems were reported, use with care.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild
index 41f639b24354..12b7413bf0f3 100644
--- a/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild
+++ b/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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_p20110131-r2.ebuild,v 1.1 2011/10/13 08:13:56 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild,v 1.1 2011/10/14 21:16:50 a3li Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -10,8 +10,9 @@ TVTIME_HGREV="111b28cca42d"
 DESCRIPTION="High quality television application for use with video capture cards"
 HOMEPAGE="http://tvtime.sourceforge.net/"
 SRC_URI="http://www.kernellabs.com/hg/~dheitmueller/tvtime/archive/${TVTIME_HGREV}.tar.bz2 -> ${P}.tar.bz2
-http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsa.patch
-http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsamixer.patch"
+http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsamixer-r1.patch
+http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsa-r1.patch
+http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsa-fixes.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,6 +41,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${PN}-${TVTIME_HGREV}"
+DOCS=( ChangeLog AUTHORS NEWS README )
 
 src_prepare() {
 	# Rename the desktop file, bug #308297
@@ -62,10 +64,12 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-autotools.patch"
 	epatch "${FILESDIR}/${P}-gettext.patch"
 	epatch "${FILESDIR}/${PN}-libpng-1.5.patch"
+	epatch "${FILESDIR}/${P}-underlinking.patch" #370025
 
 	if use alsa; then
-		epatch "${DISTDIR}/${PN}-1.0.2-alsa.patch"
-		epatch "${DISTDIR}/${PN}-1.0.2-alsamixer.patch"
+		epatch "${DISTDIR}/${PN}-1.0.2-alsa-r1.patch"
+		epatch "${DISTDIR}/${PN}-1.0.2-alsamixer-r1.patch"
+		epatch "${DISTDIR}/${PN}-1.0.2-alsa-fixes.patch"
 	fi
 
 	AT_M4DIR="m4" eautoreconf
@@ -77,16 +81,10 @@ src_configure() {
 		$(use_with xinerama) || die "econf failed"
 }
 
-src_compile() {
-	# Fix underlinking, #370025
-	emake LDFLAGS="${LDFLAGS} -lpthread" || die "compile problem"
-}
-
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 
 	dohtml docs/html/*
-	dodoc ChangeLog AUTHORS NEWS README
 }
 
 pkg_postinst() {