From: Diego Elio Pettenò Date: Sat, 30 Dec 2006 22:46:24 +0000 (+0000) Subject: Add patch to build with linux-headers-2.6.18 and later. Closes bug #159510 reported... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e03b8a935af912375e8cac8beb557672c1934608;p=gentoo.git Add patch to build with linux-headers-2.6.18 and later. Closes bug #159510 reported by Balint Dobai-Pataky. Package-Manager: portage-2.1.2_rc4-r2 --- diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog index fd5695f162be..4d7123ef894c 100644 --- a/media-tv/tvtime/ChangeLog +++ b/media-tv/tvtime/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-tv/tvtime # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.35 2006/10/28 11:40:33 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.36 2006/12/30 22:46:24 flameeyes Exp $ + +*tvtime-1.0.2-r1 (30 Dec 2006) + + 30 Dec 2006; Diego Pettenò + +files/tvtime-1.0.2+linux-headers-2.6.18.patch, +tvtime-1.0.2-r1.ebuild: + Add patch to build with linux-headers-2.6.18 and later. Closes bug #159510 + reported by Balint Dobai-Pataky. 28 Oct 2006; Matthias Schwarzott tvtime-1.0.2.ebuild: Added WANT_AUTOMAKE and WANT_AUTOCONF due to Bug #153082. diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest index 3d82e4cf4d21..188846e98e02 100644 --- a/media-tv/tvtime/Manifest +++ b/media-tv/tvtime/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX tvtime-1.0.2+linux-headers-2.6.18.patch 401 RMD160 a299364d7a35d02f67690c1b4df6e41e274ad0f1 SHA1 ca287bed793e153027f071f9153cd9a06c9a7dc6 SHA256 37d61ef2ec6ef32a83221248a1d13090b05e04fb1f47cb204c93d42abbc18e22 +MD5 29b0aefd80fddae68613854b627e044a files/tvtime-1.0.2+linux-headers-2.6.18.patch 401 +RMD160 a299364d7a35d02f67690c1b4df6e41e274ad0f1 files/tvtime-1.0.2+linux-headers-2.6.18.patch 401 +SHA256 37d61ef2ec6ef32a83221248a1d13090b05e04fb1f47cb204c93d42abbc18e22 files/tvtime-1.0.2+linux-headers-2.6.18.patch 401 AUX tvtime-1.0.2-gcc41.patch 2114 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a9 SHA1 79d97ba94d2832584f55ccfc7b2e1edf609151eb SHA256 5272246501f80135ba11fdbe15e345e430bade41c552cfdef696d10396a7cdfd MD5 c782789825dfa664e1f6fcc96ac7246c files/tvtime-1.0.2-gcc41.patch 2114 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a9 files/tvtime-1.0.2-gcc41.patch 2114 @@ -14,14 +18,18 @@ MD5 4bc08a98c7cc134accb89aea3018c2f6 files/tvtime-pic.patch 254 RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf files/tvtime-pic.patch 254 SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41 files/tvtime-pic.patch 254 DIST tvtime-1.0.2.tar.gz 1645742 RMD160 e7d9621054edba5833f4ea002be8979983fbf3dc SHA1 ea609876084b2d627a84a1f77bf81cc2175ee58e SHA256 aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523 +EBUILD tvtime-1.0.2-r1.ebuild 2024 RMD160 078f223949a37434c1b6f132641a89e5546a65f1 SHA1 71ebfd7891be434411e433d3fb932dbce4e8b923 SHA256 b736b4d9bfb15535a30456d1ac3030c500bfb8c34a285bf8bba93d302887b4aa +MD5 12a151a64028ff42662fc137a7f57ca2 tvtime-1.0.2-r1.ebuild 2024 +RMD160 078f223949a37434c1b6f132641a89e5546a65f1 tvtime-1.0.2-r1.ebuild 2024 +SHA256 b736b4d9bfb15535a30456d1ac3030c500bfb8c34a285bf8bba93d302887b4aa tvtime-1.0.2-r1.ebuild 2024 EBUILD tvtime-1.0.2.ebuild 1853 RMD160 91df1078b41156febdaf7cf7dd433988c2baeb81 SHA1 f59aafade40df1a48b11d42f48f975cf796dfe8b SHA256 861909aa5ea385d5e713b98f003127fc859731407ee4160aae4b69af714a4f7d MD5 7245568a1307d52ab8a31a3587cbdedd tvtime-1.0.2.ebuild 1853 RMD160 91df1078b41156febdaf7cf7dd433988c2baeb81 tvtime-1.0.2.ebuild 1853 SHA256 861909aa5ea385d5e713b98f003127fc859731407ee4160aae4b69af714a4f7d tvtime-1.0.2.ebuild 1853 -MISC ChangeLog 6455 RMD160 ee0063f37833896419c356021cc0dea76b679eb3 SHA1 fd1948bc6257eadf6547378b468f45d382272676 SHA256 a3d8f3092f256b79b26669c9e109ddb8c5167393ef7a1bff6e59d75b8ae73b42 -MD5 bb4dbefa1b3044b43faa7f029c3f3e70 ChangeLog 6455 -RMD160 ee0063f37833896419c356021cc0dea76b679eb3 ChangeLog 6455 -SHA256 a3d8f3092f256b79b26669c9e109ddb8c5167393ef7a1bff6e59d75b8ae73b42 ChangeLog 6455 +MISC ChangeLog 6733 RMD160 ebe32f643bdcd6345635bc3ee31057a28a777363 SHA1 16284cab4365cd223116f1652253d38acf5cb3e2 SHA256 d4581ea39effcf587e1a5cf66440fa2353a10f1054adf8c3011de1f8c9afa937 +MD5 e63c03a1c6118d9d071f0c0037c0a1cd ChangeLog 6733 +RMD160 ebe32f643bdcd6345635bc3ee31057a28a777363 ChangeLog 6733 +SHA256 d4581ea39effcf587e1a5cf66440fa2353a10f1054adf8c3011de1f8c9afa937 ChangeLog 6733 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd MD5 20e2255501865de5b568424821abf69d metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161 @@ -29,10 +37,13 @@ SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd metadata MD5 ec886e8919b8296612e12ac28fef3ce8 files/digest-tvtime-1.0.2 241 RMD160 d1a3032830a3b13099c692258158d79efa1f304f files/digest-tvtime-1.0.2 241 SHA256 d674bd6b960c3eefd8f5c1369e9c12445258c8bf0c2f4f6136289f12c77b5e0a files/digest-tvtime-1.0.2 241 +MD5 ec886e8919b8296612e12ac28fef3ce8 files/digest-tvtime-1.0.2-r1 241 +RMD160 d1a3032830a3b13099c692258158d79efa1f304f files/digest-tvtime-1.0.2-r1 241 +SHA256 d674bd6b960c3eefd8f5c1369e9c12445258c8bf0c2f4f6136289f12c77b5e0a files/digest-tvtime-1.0.2-r1 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFQ0Iyt2vP6XvVdOcRAtYbAJ9OFQQhFphXBSEt+fu64vSqmMFA1wCgirsn -bHyVA8QpjMx+uqoJpbZoO2Q= -=EKah +iD8DBQFFluxaAiZjviIA2XgRAg6oAKCzFJ8ZLjOuB01JlBRjb0V1ZwHo6QCfUT17 +Fc/DRRujVU9myCUX7liD7vI= +=ffOC -----END PGP SIGNATURE----- diff --git a/media-tv/tvtime/files/digest-tvtime-1.0.2-r1 b/media-tv/tvtime/files/digest-tvtime-1.0.2-r1 new file mode 100644 index 000000000000..84daa7261293 --- /dev/null +++ b/media-tv/tvtime/files/digest-tvtime-1.0.2-r1 @@ -0,0 +1,3 @@ +MD5 4b3d03afe61be239b08b5e522cd8afed tvtime-1.0.2.tar.gz 1645742 +RMD160 e7d9621054edba5833f4ea002be8979983fbf3dc tvtime-1.0.2.tar.gz 1645742 +SHA256 aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523 tvtime-1.0.2.tar.gz 1645742 diff --git a/media-tv/tvtime/files/tvtime-1.0.2+linux-headers-2.6.18.patch b/media-tv/tvtime/files/tvtime-1.0.2+linux-headers-2.6.18.patch new file mode 100644 index 000000000000..b1cfd49f1ba9 --- /dev/null +++ b/media-tv/tvtime/files/tvtime-1.0.2+linux-headers-2.6.18.patch @@ -0,0 +1,15 @@ +Index: tvtime-1.0.2/src/videoinput.c +=================================================================== +--- tvtime-1.0.2.orig/src/videoinput.c ++++ tvtime-1.0.2/src/videoinput.c +@@ -35,8 +35,8 @@ + #ifdef HAVE_CONFIG_H + # include "config.h" + #endif +-#include "videodev.h" +-#include "videodev2.h" ++#include ++#include + #include "videoinput.h" + #include "mixer.h" + diff --git a/media-tv/tvtime/tvtime-1.0.2-r1.ebuild b/media-tv/tvtime/tvtime-1.0.2-r1.ebuild new file mode 100644 index 000000000000..3a858d77773e --- /dev/null +++ b/media-tv/tvtime/tvtime-1.0.2-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/12/30 22:46:24 flameeyes Exp $ + +WANT_AUTOMAKE=1.7 +WANT_AUTOCONF=2.5 + +inherit eutils autotools + +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 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 + nls? ( virtual/libintl )" + +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 + + epatch "${FILESDIR}/${P}-xinerama.patch" + + # Remove linux headers and patch to build with 2.6.18 headers + rm -f "${S}"/src/{videodev.h,videodev2.h} + epatch "${FILESDIR}/${P}+linux-headers-2.6.18.patch" + + AT_M4DIR="m4" eautoreconf +} + +src_compile() { + econf $(use_enable nls) \ + $(use_with xinerama) || 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 +}