From: Matthias Schwarzott Date: Sun, 3 Dec 2006 15:22:53 +0000 (+0000) Subject: Added patch to compile also with vdr-1.4.4_p1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ae2cebe82fb00623c3a66982700b8e2a2d6f8f9;p=gentoo.git Added patch to compile also with vdr-1.4.4_p1 Package-Manager: portage-2.1.2_rc2-r4 --- diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog index de2e35e91f4b..31b7f1b1a1a4 100644 --- a/media-plugins/vdr-graphlcd/ChangeLog +++ b/media-plugins/vdr-graphlcd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-graphlcd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.8 2006/09/09 21:26:29 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.9 2006/12/03 15:22:53 zzam Exp $ + + 03 Dec 2006; Matthias Schwarzott + +files/vdr-graphlcd-0.1.3-uint64.diff, vdr-graphlcd-0.1.3-r1.ebuild: + Added patch to compile also with vdr-1.4.4_p1 *vdr-graphlcd-0.1.3-r1 (09 Sep 2006) diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest index 95b08c784dd9..22b25cb0ea94 100644 --- a/media-plugins/vdr-graphlcd/Manifest +++ b/media-plugins/vdr-graphlcd/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0.1.2/radiotext-lcr-service.diff 3429 RMD160 5ac8a870a814bc3c4337f5b15fd70700c1099dae SHA1 92037a8340529cc89e8a7c89691107602465581b SHA256 5240892a8e8c9ba3966e1b961009991dc79818340e26984a50af367d4b785bf6 MD5 9edde30be18467eead751bd619a887bd files/0.1.2/radiotext-lcr-service.diff 3429 RMD160 5ac8a870a814bc3c4337f5b15fd70700c1099dae files/0.1.2/radiotext-lcr-service.diff 3429 @@ -18,34 +21,45 @@ AUX rc-addon.sh 453 RMD160 4b8725bd9b0559cb8c6313c67245f1cf5053a3a7 SHA1 a7a10e9 MD5 517fd6e47ab25170f56df5a2a07510e6 files/rc-addon.sh 453 RMD160 4b8725bd9b0559cb8c6313c67245f1cf5053a3a7 files/rc-addon.sh 453 SHA256 2e221dcf199d657b610bfa69f886506392adb8c7ffe8322b20933e68af5a2ad7 files/rc-addon.sh 453 -DIST vdr-graphlcd-0.1.2-pre6.tgz 232345 +AUX vdr-graphlcd-0.1.3-uint64.diff 1809 RMD160 6f1831ed6a9ea5a08bbec7a2fa8cf10cfb84f3dd SHA1 72c6ca51d11ce8af2248146f8efed9d5f0eb8a06 SHA256 b7144d161050ba6d0b1e05f25a974f4a4f6a5ccd9a4bfd69b89237b93532ce2d +MD5 0faeb2267e7aa3deffcaa336966d3568 files/vdr-graphlcd-0.1.3-uint64.diff 1809 +RMD160 6f1831ed6a9ea5a08bbec7a2fa8cf10cfb84f3dd files/vdr-graphlcd-0.1.3-uint64.diff 1809 +SHA256 b7144d161050ba6d0b1e05f25a974f4a4f6a5ccd9a4bfd69b89237b93532ce2d files/vdr-graphlcd-0.1.3-uint64.diff 1809 +DIST vdr-graphlcd-0.1.2-pre6.tgz 232345 RMD160 5e47c30c9a7b5f7649a8cf12c38da73fa9bf76ae SHA1 4bfe58e96964f3563d018266a472075a20608b1b SHA256 3f5d772d392373c744a2945254039cfc4846f505683d90569845ef8be8c8aafd DIST vdr-graphlcd-0.1.3.tgz 244387 RMD160 6856258bc3938a4a817fc583f2624c499f595013 SHA1 d8264ed9e1ceb2b5ddc8093252bfbe5d03cfa65f SHA256 70cac20084f5613b8f9a5bf08b10564c0e0ce890a87062d323e08739017c74ef EBUILD vdr-graphlcd-0.1.2_pre6-r1.ebuild 2369 RMD160 dfa2b50e4b61e57e03d36e8ac2c4353fbad7b33f SHA1 46c960ebb44beac7c848e957f8857b6d739cbd03 SHA256 416bf24c51da90b19d941abd7622316757fb1967f137c359832a2e71476fe47d MD5 1967de93e3cc18efa9a885e122366697 vdr-graphlcd-0.1.2_pre6-r1.ebuild 2369 RMD160 dfa2b50e4b61e57e03d36e8ac2c4353fbad7b33f vdr-graphlcd-0.1.2_pre6-r1.ebuild 2369 SHA256 416bf24c51da90b19d941abd7622316757fb1967f137c359832a2e71476fe47d vdr-graphlcd-0.1.2_pre6-r1.ebuild 2369 -EBUILD vdr-graphlcd-0.1.3-r1.ebuild 2347 RMD160 7c3d6dde1cdb5c1c5be4ab1c866056e91c0a734c SHA1 9fbc83d153baaded1ab932e3500ebecf6f882f4a SHA256 6f166e6867a462ef640b2fe9213f83eed604401d2b1dacd785be2021b38a4576 -MD5 41e660075298a4e0fbe9ad5d63ce614e vdr-graphlcd-0.1.3-r1.ebuild 2347 -RMD160 7c3d6dde1cdb5c1c5be4ab1c866056e91c0a734c vdr-graphlcd-0.1.3-r1.ebuild 2347 -SHA256 6f166e6867a462ef640b2fe9213f83eed604401d2b1dacd785be2021b38a4576 vdr-graphlcd-0.1.3-r1.ebuild 2347 +EBUILD vdr-graphlcd-0.1.3-r1.ebuild 2367 RMD160 89e46e46ea2c369b93202176e476ffdd6914cd28 SHA1 a8f59909e12ba2ba4412136a59e808ebaa2448c5 SHA256 33d3deac3a1fdc98993b5b521ddb8f33154ab7d5ee16468dad5ed8cf6850787b +MD5 a702c11cb723d47504f3afaa659101b4 vdr-graphlcd-0.1.3-r1.ebuild 2367 +RMD160 89e46e46ea2c369b93202176e476ffdd6914cd28 vdr-graphlcd-0.1.3-r1.ebuild 2367 +SHA256 33d3deac3a1fdc98993b5b521ddb8f33154ab7d5ee16468dad5ed8cf6850787b vdr-graphlcd-0.1.3-r1.ebuild 2367 EBUILD vdr-graphlcd-0.1.3.ebuild 2271 RMD160 2addf449e122dc8414b700039742df1e832c981a SHA1 22d66c337f7883bfc6294ee6ccddca43512c18a0 SHA256 a4652d4ad8d1ee6c9fde6b19eff52bfab4d5465ed85963687f33a64eb6945b73 MD5 65d4a0c81dbc483af5e331a02994c454 vdr-graphlcd-0.1.3.ebuild 2271 RMD160 2addf449e122dc8414b700039742df1e832c981a vdr-graphlcd-0.1.3.ebuild 2271 SHA256 a4652d4ad8d1ee6c9fde6b19eff52bfab4d5465ed85963687f33a64eb6945b73 vdr-graphlcd-0.1.3.ebuild 2271 -MISC ChangeLog 1723 RMD160 cb5303e4758b7a39c6ae35525cac79fe60192166 SHA1 9d76e005e72f89a8bfab8f3465fb943ee4cee67c SHA256 7792afc469346225e93120962888e9ca83165eac3d8bafceaff03ea0efe2c686 -MD5 c95d97a0fabe30068aa0e212d6899a36 ChangeLog 1723 -RMD160 cb5303e4758b7a39c6ae35525cac79fe60192166 ChangeLog 1723 -SHA256 7792afc469346225e93120962888e9ca83165eac3d8bafceaff03ea0efe2c686 ChangeLog 1723 +MISC ChangeLog 1891 RMD160 28f3daf87da78520cf3ebd6b677eb82496e5996d SHA1 90ca50073bf09094f2df76a16c713576cd3c2ee2 SHA256 c1436d50f09d6fd627fb0374173adc761c524f5282368300e34cda5ee0affdb1 +MD5 018e125d89eae70695f9ecf96993db95 ChangeLog 1891 +RMD160 28f3daf87da78520cf3ebd6b677eb82496e5996d ChangeLog 1891 +SHA256 c1436d50f09d6fd627fb0374173adc761c524f5282368300e34cda5ee0affdb1 ChangeLog 1891 MISC metadata.xml 399 RMD160 da803ab914b85f48f99cd09321a577b2ae2df876 SHA1 ed8cb826e20b52e381e5926e3f5df01da6d02fd8 SHA256 fb14b64f0c614498c334e60f3774e886fbb5a6143bce4f162f39bb61fee0be67 MD5 d620f1598e91e4b0e15a579df112c8f0 metadata.xml 399 RMD160 da803ab914b85f48f99cd09321a577b2ae2df876 metadata.xml 399 SHA256 fb14b64f0c614498c334e60f3774e886fbb5a6143bce4f162f39bb61fee0be67 metadata.xml 399 -MD5 c06ef00216c435d94502bd44c0cf7e51 files/digest-vdr-graphlcd-0.1.2_pre6-r1 72 -RMD160 8704673cbde5103fbd499998861c81a7d953034a files/digest-vdr-graphlcd-0.1.2_pre6-r1 72 -SHA256 d86ba23b7582362de195f1c50fe6f46497aed82f2966e72685d8fc89bf0802df files/digest-vdr-graphlcd-0.1.2_pre6-r1 72 +MD5 ccbd801b62f1827b801358532980cd5a files/digest-vdr-graphlcd-0.1.2_pre6-r1 262 +RMD160 57944c4327a7a4a6035b1a7df09bd248d64a9f18 files/digest-vdr-graphlcd-0.1.2_pre6-r1 262 +SHA256 9750d20743f6572f8ce54f1ff9c4251500e89ae48d57cb4e576ed5cc0cbd426e files/digest-vdr-graphlcd-0.1.2_pre6-r1 262 MD5 507d59b9796312e258732bccb923e0aa files/digest-vdr-graphlcd-0.1.3 247 RMD160 3f02a2d6d1b8c2185979c412c85d3e84d2504be6 files/digest-vdr-graphlcd-0.1.3 247 SHA256 990f5369e29f626a3f387ced1c4c22eb9bf51f888d146d00fe38da720919d914 files/digest-vdr-graphlcd-0.1.3 247 MD5 507d59b9796312e258732bccb923e0aa files/digest-vdr-graphlcd-0.1.3-r1 247 RMD160 3f02a2d6d1b8c2185979c412c85d3e84d2504be6 files/digest-vdr-graphlcd-0.1.3-r1 247 SHA256 990f5369e29f626a3f387ced1c4c22eb9bf51f888d146d00fe38da720919d914 files/digest-vdr-graphlcd-0.1.3-r1 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFcuvUt2vP6XvVdOcRAv5LAJ4n7yqcUH76LdTTZ3ZWUTFHpNAJtQCgjtA5 +IlOFsT0bXqhCZvZzAmB7Rrk= +=Lb1/ +-----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1 index 6f5a86db7c88..d5efab3b24ad 100644 --- a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1 +++ b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1 @@ -1 +1,3 @@ MD5 358e8483887a3ee86f3282aaf0e56522 vdr-graphlcd-0.1.2-pre6.tgz 232345 +RMD160 5e47c30c9a7b5f7649a8cf12c38da73fa9bf76ae vdr-graphlcd-0.1.2-pre6.tgz 232345 +SHA256 3f5d772d392373c744a2945254039cfc4846f505683d90569845ef8be8c8aafd vdr-graphlcd-0.1.2-pre6.tgz 232345 diff --git a/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff new file mode 100644 index 000000000000..63a47f1bceb9 --- /dev/null +++ b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff @@ -0,0 +1,36 @@ +diff -ru graphlcd-0.1.3-orig/display.c graphlcd-0.1.3/display.c +--- graphlcd-0.1.3-orig/display.c 2006-12-03 16:18:11.526195337 +0100 ++++ graphlcd-0.1.3/display.c 2006-12-03 16:18:47.994898923 +0100 +@@ -2025,7 +2025,7 @@ + else + { + if (GraphLCDSetup.BrightnessDelay < 1 +- || ((TimeMs() - LastTimeBrightness) > (uint64) (GraphLCDSetup.BrightnessDelay*1000))) ++ || ((TimeMs() - LastTimeBrightness) > (uint64_t) (GraphLCDSetup.BrightnessDelay*1000))) + { + LCD->SetBrightness(GraphLCDSetup.BrightnessIdle); + nCurrentBrightness = GraphLCDSetup.BrightnessIdle; +diff -ru graphlcd-0.1.3-orig/display.h graphlcd-0.1.3/display.h +--- graphlcd-0.1.3-orig/display.h 2006-12-03 16:18:11.526195337 +0100 ++++ graphlcd-0.1.3/display.h 2006-12-03 16:18:40.497109608 +0100 +@@ -200,7 +200,7 @@ + + /** Set Brightness depends user activity */ + void SetBrightness(); +- uint64 LastTimeBrightness; ++ uint64_t LastTimeBrightness; + int nCurrentBrightness; + bool bBrightnessActive; + }; +diff -ru graphlcd-0.1.3-orig/tags graphlcd-0.1.3/tags +--- graphlcd-0.1.3-orig/tags 2006-12-03 16:18:11.526195337 +0100 ++++ graphlcd-0.1.3/tags 2006-12-03 16:19:05.319033056 +0100 +@@ -71,7 +71,7 @@ + LIBDIR Makefile /^LIBDIR = ..\/..\/lib$/;" m + LastState display.h /^ ThreadState LastState;$/;" m class:cGraphLCDDisplay + LastTime display.h /^ time_t LastTime;$/;" m class:cGraphLCDDisplay +-LastTimeBrightness display.h /^ uint64 LastTimeBrightness;$/;" m class:cGraphLCDDisplay ++LastTimeBrightness display.h /^ uint64_t LastTimeBrightness;$/;" m class:cGraphLCDDisplay + LastTimeCheckSym display.h /^ time_t LastTimeCheckSym;$/;" m class:cGraphLCDDisplay + LastTimeModSym display.h /^ time_t LastTimeModSym;$/;" m class:cGraphLCDDisplay + Load layout.c /^bool cFontElement::Load(const std::string & url)$/;" f class:cFontElement diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild index 0f270170b0a6..32bd0e8523e0 100644 --- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild +++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild,v 1.1 2006/09/09 21:26:29 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild,v 1.2 2006/12/03 15:22:53 zzam Exp $ inherit eutils vdr-plugin @@ -17,12 +17,13 @@ IUSE="truetype" DEPEND=">=media-video/vdr-1.2.6 >=app-misc/graphlcd-base-${PV}" +PATCHES="${FILESDIR}/0.1.3/radiotext-lcr-service.diff + ${FILESDIR}/0.1.3/graphlcd-0.1.3-span.diff + ${FILESDIR}/${P}-uint64.diff" + src_unpack() { vdr-plugin_src_unpack - epatch ${FILESDIR}/0.1.3/radiotext-lcr-service.diff - epatch ${FILESDIR}/0.1.3/graphlcd-0.1.3-span.diff - sed -i "s:/usr/local:/usr:" Makefile }