From 18107274008f825bfe6ce40f54b34e8681d0a442 Mon Sep 17 00:00:00 2001 From: Alex Legler Date: Fri, 14 Oct 2011 21:16:50 +0000 Subject: Add additional patch to fix alsa issues, bug 384215. Minor ebuild fixes from bug 385353 and idl0r. (Portage version: 2.2.0_alpha59/cvs/Linux x86_64) --- media-tv/tvtime/ChangeLog | 10 ++- .../tvtime-1.0.2_p20110131-underlinking.patch | 11 +++ media-tv/tvtime/metadata.xml | 6 ++ media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild | 100 --------------------- media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild | 98 ++++++++++++++++++++ 5 files changed, 124 insertions(+), 101 deletions(-) create mode 100644 media-tv/tvtime/files/tvtime-1.0.2_p20110131-underlinking.patch delete mode 100644 media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild create mode 100644 media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild (limited to 'media-tv') 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 -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/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 @@ Alex Legler Please CC on bugs + + + Enables an EXPERIMENTAL ALSA patch by the Ubuntu maintainers. + Several problems were reported, use with care. + + diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild deleted file mode 100644 index 41f639b24354..000000000000 --- a/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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 $ - -EAPI=4 -inherit eutils autotools - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa nls xinerama" - -RDEPEND="x11-libs/libSM - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXv - x11-libs/libXxf86vm - xinerama? ( x11-libs/libXinerama ) - x11-libs/libXtst - x11-libs/libXau - x11-libs/libXdmcp - >=media-libs/freetype-2 - >=sys-libs/zlib-1.1.4 - >=media-libs/libpng-1.2 - >=dev-libs/libxml2-2.5.11 - alsa? ( media-libs/alsa-lib ) - nls? ( virtual/libintl )" - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - dev-util/pkgconfig" - -S="${WORKDIR}/${PN}-${TVTIME_HGREV}" - -src_prepare() { - # Rename the desktop file, bug #308297 - mv docs/net-tvtime.desktop docs/tvtime.desktop || die - sed -i -e "s/net-tvtime.desktop/tvtime.desktop/g" docs/Makefile.am || die - - # use 'tvtime' for the application icon see bug #66293 - sed -i -e "s/tvtime.png/tvtime/" docs/tvtime.desktop || die - - # patch to adapt to PIC or __PIC__ for pic support - epatch "${FILESDIR}"/${PN}-pic.patch #74227 - - epatch "${FILESDIR}/${PN}-1.0.2-xinerama.patch" - - # Remove linux headers and patch to build with 2.6.18 headers - rm -f "${S}"/src/{videodev.h,videodev2.h} || die - - epatch "${FILESDIR}/${P}-libsupc++.patch" - - epatch "${FILESDIR}/${P}-autotools.patch" - epatch "${FILESDIR}/${P}-gettext.patch" - epatch "${FILESDIR}/${PN}-libpng-1.5.patch" - - if use alsa; then - epatch "${DISTDIR}/${PN}-1.0.2-alsa.patch" - epatch "${DISTDIR}/${PN}-1.0.2-alsamixer.patch" - fi - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(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" - - dohtml docs/html/* - dodoc ChangeLog AUTHORS NEWS README -} - -pkg_postinst() { - elog "A default setup for ${PN} has been saved as" - elog "/etc/tvtime/tvtime.xml. You may need to modify it" - elog "for your needs." - elog - elog "Detailed information on ${PN} setup can be" - elog "found at ${HOMEPAGE}help.html" - echo -} diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild new file mode 100644 index 000000000000..12b7413bf0f3 --- /dev/null +++ b/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild @@ -0,0 +1,98 @@ +# 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-r3.ebuild,v 1.1 2011/10/14 21:16:50 a3li Exp $ + +EAPI=4 +inherit eutils autotools + +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-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" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="alsa nls xinerama" + +RDEPEND="x11-libs/libSM + x11-libs/libICE + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXv + x11-libs/libXxf86vm + xinerama? ( x11-libs/libXinerama ) + x11-libs/libXtst + x11-libs/libXau + x11-libs/libXdmcp + >=media-libs/freetype-2 + >=sys-libs/zlib-1.1.4 + >=media-libs/libpng-1.2 + >=dev-libs/libxml2-2.5.11 + alsa? ( media-libs/alsa-lib ) + nls? ( virtual/libintl )" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + dev-util/pkgconfig" + +S="${WORKDIR}/${PN}-${TVTIME_HGREV}" +DOCS=( ChangeLog AUTHORS NEWS README ) + +src_prepare() { + # Rename the desktop file, bug #308297 + mv docs/net-tvtime.desktop docs/tvtime.desktop || die + sed -i -e "s/net-tvtime.desktop/tvtime.desktop/g" docs/Makefile.am || die + + # use 'tvtime' for the application icon see bug #66293 + sed -i -e "s/tvtime.png/tvtime/" docs/tvtime.desktop || die + + # patch to adapt to PIC or __PIC__ for pic support + epatch "${FILESDIR}"/${PN}-pic.patch #74227 + + epatch "${FILESDIR}/${PN}-1.0.2-xinerama.patch" + + # Remove linux headers and patch to build with 2.6.18 headers + rm -f "${S}"/src/{videodev.h,videodev2.h} || die + + epatch "${FILESDIR}/${P}-libsupc++.patch" + + 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-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 +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_with xinerama) || die "econf failed" +} + +src_install() { + default + + dohtml docs/html/* +} + +pkg_postinst() { + elog "A default setup for ${PN} has been saved as" + elog "/etc/tvtime/tvtime.xml. You may need to modify it" + elog "for your needs." + elog + elog "Detailed information on ${PN} setup can be" + elog "found at ${HOMEPAGE}help.html" + echo +} -- cgit v1.2.3-65-gdbad