From: Matthias Schwarzott Date: Sun, 3 Dec 2006 14:23:57 +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=1d44b340b67f0150fbb72bcb21d868677663e782;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-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index c6c7a7e733b2..d880d327ba33 100644 --- a/media-plugins/vdr-softdevice/ChangeLog +++ b/media-plugins/vdr-softdevice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-softdevice # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.30 2006/11/24 21:51:36 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.31 2006/12/03 14:23:57 zzam Exp $ + + 03 Dec 2006; Matthias Schwarzott + +files/vdr-softdevice-0.3.1-uint64.diff, + vdr-softdevice-0.3.1.20061124.ebuild: + Added patch to compile also with vdr-1.4.4_p1. *vdr-softdevice-0.3.1.20061124 (24 Nov 2006) diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest index 9266268830db..b8dbfd27b46b 100644 --- a/media-plugins/vdr-softdevice/Manifest +++ b/media-plugins/vdr-softdevice/Manifest @@ -25,6 +25,10 @@ AUX vdr-softdevice-0.3.1-osdmode-software-default.diff 537 RMD160 b6266883351086 MD5 01d453f0e9df9d4c45a0a5b00621f9ab files/vdr-softdevice-0.3.1-osdmode-software-default.diff 537 RMD160 b6266883351086f04ff65ff8b3253b0d7c2d9bbf files/vdr-softdevice-0.3.1-osdmode-software-default.diff 537 SHA256 e9203e71ca046db87c710a1f51ec4825032a3e0214cd91b2fa96ba6790beddaa files/vdr-softdevice-0.3.1-osdmode-software-default.diff 537 +AUX vdr-softdevice-0.3.1-uint64.diff 2347 RMD160 194138937dd075a12ca03cfc38f909f9cac3c385 SHA1 a2b39605cc4c9b85a1249e4b0665bd778006b04b SHA256 74f1905b5d9de5a5210203f7c654d91602f6b45d57fd277c84b8b6b27ab22157 +MD5 3430f1e5f704b79fa36742059e6f76ed files/vdr-softdevice-0.3.1-uint64.diff 2347 +RMD160 194138937dd075a12ca03cfc38f909f9cac3c385 files/vdr-softdevice-0.3.1-uint64.diff 2347 +SHA256 74f1905b5d9de5a5210203f7c654d91602f6b45d57fd277c84b8b6b27ab22157 files/vdr-softdevice-0.3.1-uint64.diff 2347 DIST vdr-softdevice-0.3.0.tgz 154294 RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe SHA1 89b532c536c450e2eb51fedbf2a0192e0940a179 SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a DIST vdr-softdevice-0.3.1.tgz 154509 RMD160 b582215eca1c0ce954eca54045456145488b1b34 SHA1 5f0cf60897820a6f15035174f4b5cb437afee782 SHA256 d88fc234ad6d3686b95d4848519ffdb97ee22a1fcd8cff60d737c0ecb1a43252 DIST vdr-softdevice-cvs-20061124.tar.bz2 131902 RMD160 b0bf6df5570a0bcfd8c17e36d43b868b8daac2a4 SHA1 db610e83bc0a65042ef5d327595d70182988717d SHA256 e6f12f790de569090277513d40fa8a4658063d5c4d006e9788cfc4c1b2cf0aae @@ -36,14 +40,14 @@ EBUILD vdr-softdevice-0.3.1-r2.ebuild 3394 RMD160 66d0f4c260068b6d141476d110cd5b MD5 28e971e64cc89bd3f40a0f96c6997a97 vdr-softdevice-0.3.1-r2.ebuild 3394 RMD160 66d0f4c260068b6d141476d110cd5bf939322f79 vdr-softdevice-0.3.1-r2.ebuild 3394 SHA256 932ff2d55d3b601d9473eb6e27ffd50174a2914c02e4fe9dfc404e0022ce1634 vdr-softdevice-0.3.1-r2.ebuild 3394 -EBUILD vdr-softdevice-0.3.1.20061124.ebuild 3473 RMD160 50ad0ff16daed3aef391f43d306a7f95c0969133 SHA1 9ccba4ce1d91dd138b583efb3e4f1f6555553167 SHA256 5859338f73ab650c6958694e28888ff015fab34ea032ce6e5b887729951d7ec3 -MD5 803935a1c15c4423abaa6a10eff8c151 vdr-softdevice-0.3.1.20061124.ebuild 3473 -RMD160 50ad0ff16daed3aef391f43d306a7f95c0969133 vdr-softdevice-0.3.1.20061124.ebuild 3473 -SHA256 5859338f73ab650c6958694e28888ff015fab34ea032ce6e5b887729951d7ec3 vdr-softdevice-0.3.1.20061124.ebuild 3473 -MISC ChangeLog 7341 RMD160 0155c9df08170b61fdb5ea1b8fc7adc31ed19cdf SHA1 c5f28f21afe363e088d9ed1fba2651ef290546c0 SHA256 12a1891022799daa896e5583b0c2a59d9de670504711f82ce018d07eaa6985f6 -MD5 3172a81da454691e01119cda8410206c ChangeLog 7341 -RMD160 0155c9df08170b61fdb5ea1b8fc7adc31ed19cdf ChangeLog 7341 -SHA256 12a1891022799daa896e5583b0c2a59d9de670504711f82ce018d07eaa6985f6 ChangeLog 7341 +EBUILD vdr-softdevice-0.3.1.20061124.ebuild 3520 RMD160 bd98d93a813a0234fed088859be1ac6a869e27d3 SHA1 048438c771037dd5abded3a909ffc90d2ddf56a6 SHA256 26eb7750098c9da914601f95086fe182c33c150b07190a4fbb53ecc8dc02fc59 +MD5 2a021f248147ea4fc686edbb44c0680d vdr-softdevice-0.3.1.20061124.ebuild 3520 +RMD160 bd98d93a813a0234fed088859be1ac6a869e27d3 vdr-softdevice-0.3.1.20061124.ebuild 3520 +SHA256 26eb7750098c9da914601f95086fe182c33c150b07190a4fbb53ecc8dc02fc59 vdr-softdevice-0.3.1.20061124.ebuild 3520 +MISC ChangeLog 7527 RMD160 96095b3ad155d9492529983701f5d980c5c5b197 SHA1 b7aff85ee10013957ec6d4b3f61c49a113eb3114 SHA256 ce95782228af888634c074a00192ec8c607c4eb020e6f8829bca94020080a245 +MD5 372995535ad536799fca543bef6d6e99 ChangeLog 7527 +RMD160 96095b3ad155d9492529983701f5d980c5c5b197 ChangeLog 7527 +SHA256 ce95782228af888634c074a00192ec8c607c4eb020e6f8829bca94020080a245 ChangeLog 7527 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298 @@ -60,7 +64,7 @@ SHA256 8ae7a69241616d142fcc81fb835a4400bd59094b83cc35c4051f97ce9a56f218 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFZ2lzt2vP6XvVdOcRAqdaAKDS/8hXnEU1TLrDsBaenVzIvsgrSwCgr+Wq -fardeRmyvOAiFsifX3piXBU= -=nmhj +iD8DBQFFct4Rt2vP6XvVdOcRAgyKAKDgCMb8A2OrGXoy3g6dYYbdlp/7pACfbHnV +p16SK637qH/4Y1p8GG75ULM= +=jz5j -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.1-uint64.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.1-uint64.diff new file mode 100644 index 000000000000..d169dad73bc2 --- /dev/null +++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.1-uint64.diff @@ -0,0 +1,54 @@ +diff -ru softdevice-cvs-20061124-orig/setup-softdevice.c softdevice-cvs-20061124/setup-softdevice.c +--- softdevice-cvs-20061124-orig/setup-softdevice.c 2006-12-03 15:09:47.474358718 +0100 ++++ softdevice-cvs-20061124/setup-softdevice.c 2006-12-03 15:10:34.685649821 +0100 +@@ -417,13 +417,13 @@ + + /* --------------------------------------------------------------------------- + */ +-bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64 key) ++bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64_t key) + { + #ifndef STAND_ALONE + char buffer[32]; + eKeys keySym; + +- snprintf(buffer, sizeof(buffer), "%016LX", (uint64) key); ++ snprintf(buffer, sizeof(buffer), "%016LX", (uint64_t) key); + keySym = Keys.Get(remoteName, buffer); + if (keySym >= kUser1 && keySym <= kUser9) + { +diff -ru softdevice-cvs-20061124-orig/setup-softdevice.h softdevice-cvs-20061124/setup-softdevice.h +--- softdevice-cvs-20061124-orig/setup-softdevice.h 2006-12-03 15:09:47.478359677 +0100 ++++ softdevice-cvs-20061124/setup-softdevice.h 2006-12-03 15:10:09.871715782 +0100 +@@ -121,7 +121,7 @@ + char *getPPValue(void); + void CropModeNext(void); + +- virtual bool CatchRemoteKey(const char *remoteName, uint64 key); ++ virtual bool CatchRemoteKey(const char *remoteName, uint64_t key); + + int xvAspect; + int xvMaxArea; +diff -ru softdevice-cvs-20061124-orig/VdrReplacements.h softdevice-cvs-20061124/VdrReplacements.h +--- softdevice-cvs-20061124-orig/VdrReplacements.h 2006-12-03 15:09:47.478359677 +0100 ++++ softdevice-cvs-20061124/VdrReplacements.h 2006-12-03 15:10:43.715809044 +0100 +@@ -30,7 +30,6 @@ + + #define tr(out) out + +-typedef unsigned long long int uint64; + typedef int eKeys; + + class cSoftRemote { +diff -ru softdevice-cvs-20061124-orig/video.h softdevice-cvs-20061124/video.h +--- softdevice-cvs-20061124-orig/video.h 2006-12-03 15:09:47.474358718 +0100 ++++ softdevice-cvs-20061124/video.h 2006-12-03 15:09:58.953104351 +0100 +@@ -39,7 +39,7 @@ + public: + cSoftRemote(const char *Name) : cRemote(Name) {}; + virtual ~cSoftRemote() {}; +- virtual bool PutKey(uint64 Code, bool Repeat = false, ++ virtual bool PutKey(uint64_t Code, bool Repeat = false, + bool Release = false) + { return Put(Code,Repeat,Release); }; + }; diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild index b451e5e66391..bc9142620325 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.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-softdevice/vdr-softdevice-0.3.1.20061124.ebuild,v 1.1 2006/11/24 21:51:36 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061124.ebuild,v 1.2 2006/12/03 14:23:57 zzam Exp $ inherit vdr-plugin @@ -48,7 +48,8 @@ DEPEND="${RDEPEND} PATCHES=" ${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff ${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch - ${FILESDIR}/vdr-softdevice-0.3.1-osdmode-software-default.diff" + ${FILESDIR}/vdr-softdevice-0.3.1-osdmode-software-default.diff + ${FILESDIR}/vdr-softdevice-0.3.1-uint64.diff" pkg_setup() { vdr-plugin_pkg_setup