media-plugins/vdr-reelbox: compile fix

svn path=/testing/; revision=626

4 files changed, 31 insertions, 3 deletions

diff --git a/media-plugins/vdr-reelbox/ChangeLog b/media-plugins/vdr-reelbox/ChangeLog
index 85f8753..0054436 100644
--- a/media-plugins/vdr-reelbox/ChangeLog
+++ b/media-plugins/vdr-reelbox/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Nov 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-reelbox-3.12384-r1.ebuild, +files/reelbox-3.12384_p1-vdr-1.7.4.diff:
+  compile fix
+
   05 Jul 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-reelbox-3.11210.ebuild, vdr-reelbox-3.12133.ebuild:
   fixed depend
diff --git a/media-plugins/vdr-reelbox/Manifest b/media-plugins/vdr-reelbox/Manifest
index 3c10662..4bb67d0 100644
--- a/media-plugins/vdr-reelbox/Manifest
+++ b/media-plugins/vdr-reelbox/Manifest
@@ -5,6 +5,7 @@ AUX reelbox-3.11210_makefile.diff 1094 RMD160 69f83b118e8b2dbc7fba72631c96dd2ba8
 AUX reelbox-3.12133_makefile.diff 1094 RMD160 69f83b118e8b2dbc7fba72631c96dd2ba81cf68b SHA1 60159e6bef9be8691708a47d6e04dd8cccd9ceed SHA256 185e7857565c0c0f32e8de7070f1f0b1481c9de544dd63c54229c4a87085c04f
 AUX reelbox-3.12384-vdr-1.7.4.diff 1438 RMD160 8c344ed73ecdd389b7919a3e90635a7b8eabc7d4 SHA1 71b8d953af659d6061c7517ae92e25fa0f56940a SHA256 5aef1e7d9d31698ba0a2308196287e10b969f7d7324ef2a7dd206ff3e7119f14
 AUX reelbox-3.12384_makefile.diff 1324 RMD160 3f988e99feef9a0adca3b6820a17ad8503404a18 SHA1 fe8beb1bb53c0bd2783ad110fa9f5578d7c29d7a SHA256 5167dd6e203d5bf30ece6ffd6f270d0dac1ca95bedd10ce15149fb59387eee05
+AUX reelbox-3.12384_p1-vdr-1.7.4.diff 871 RMD160 75262d7d84f10b8b5b59d49456f63f4404da13eb SHA1 0b6a0fe3d462ad760803fba4f2fc898ac3b46bdf SHA256 867cb72de76a51279ea75f64ad534610b2a07219984d077c3c4d510804d0f4a0
 AUX reelbox-3.12384_reelbox_c.diff 440 RMD160 16322f469302d00c93297d7b9d894821484381d4 SHA1 5760103fd8531fbdf6e016e3a75ccaa132d0763d SHA256 37f4e64ec9aafbba8a8a66b05ca38161d6464dc71309c0ecb9fc03bea4c9da35
 AUX save-setup_3.11210.diff 449 RMD160 451bd528f2f5b7c1d372ec143fe138be9b646a3d SHA1 927eddedc1cf38ba212df6672ac84ca3b6c625ef SHA256 0e4b142764b720df089ccba9be72c80220ce22982b72737842cfb053bb452563
 AUX save-setup_3.12133.diff 449 RMD160 451bd528f2f5b7c1d372ec143fe138be9b646a3d SHA1 927eddedc1cf38ba212df6672ac84ca3b6c625ef SHA256 0e4b142764b720df089ccba9be72c80220ce22982b72737842cfb053bb452563
@@ -16,8 +17,8 @@ DIST vdr-reelbox-3.12384.tgz 168266 RMD160 a138ceb62763039876b5a89f25e5a12bf37d8
 DIST vdr-reelbox-3.9302.tgz 140337 RMD160 740c9b258f7890d6f5f00f12723b970c9da82979 SHA1 9c1fbf94c03a812e6b036ffb2ccf65665ba22326 SHA256 f91ef36ebb0da57930485394b5bc2f05b1e06b9f7a4bcc06b0aec70c5cee9c29
 EBUILD vdr-reelbox-3.11210.ebuild 1475 RMD160 60afb1900a150b880563901c3fa611fa50ae3d20 SHA1 78a71f8103396796f361e0b91f35fea5dab0006c SHA256 16578abb7c22e14240b1785faa68355fce2a7ffedd120530a2622b9382cfbc62
 EBUILD vdr-reelbox-3.12133.ebuild 1451 RMD160 7b8ad6f57d03c364b874234c915e7bbb36363f88 SHA1 59545bea7edfd29d19ea174c403e84c1b3827dbe SHA256 306abac524a4a5e495cea668b01d09531f2a846f0d2ad79fc6103cb9075b5728
-EBUILD vdr-reelbox-3.12384-r1.ebuild 1596 RMD160 603695a9d92df23b0052ccbd773b7e1b57479332 SHA1 6f32f0e986e2b96c9014748b1f2b226b2b758b24 SHA256 ef0b5291a30229a01be81dc019f4236c5cdf8c13d9899cc60b6b26d8db44e052
+EBUILD vdr-reelbox-3.12384-r1.ebuild 1599 RMD160 baebf0fb2e03af7e55b5f60f7d4d26e6f745adce SHA1 fab4e554251b9ae67898657a717fe863dbfbe0e0 SHA256 6c6d53c2a5bd6efa8da67bba35edd7ed09b49719a53429fd7e3b129ff244b62e
 EBUILD vdr-reelbox-3.12384.ebuild 1690 RMD160 8abbdfb00f3cb2282502bcad551e698516cc1533 SHA1 fd6ddb893462bc82103d68eecafde9e344d37d58 SHA256 4828202d56dc8aae6025e27b8679ce073e01252d1a6f27e8187bcdd0092b1139
 EBUILD vdr-reelbox-3.9302.ebuild 982 RMD160 eb1c3942188b73e6383cb57804461c6145713498 SHA1 5d5bae21fde3d1f7398d14e897b8ea716f7ce6b7 SHA256 dd2be30eebdfe1bac7596c703a7e344638bc013190f778d3662f00efba6f248b
-MISC ChangeLog 2247 RMD160 52cfa597f804d8c0f8077c6f6fbccbbf2d9b3816 SHA1 f38d4c9fe45bd3a3c24ea57e6dd983a057f1c2bc SHA256 541f6f005b418f21e20540d8b8cb9add1a506f72a4f3fcbe212835aba60c0c6b
+MISC ChangeLog 2392 RMD160 b81488b3d604a1abf22c341a0114741ac3e38946 SHA1 f119190b4008f6dfa52e1eb5f7a8fc4c2f148dcd SHA256 f2c4b51c4eae1f19fac8ab5503c8a8566e6e45a4e14c2a5bf16ce0955181e0d6
 MISC metadata.xml 352 RMD160 57a3a02b1c7da27ff3277627eed5645a1812adcc SHA1 15007ef9f352900614d270f14e511414f2669576 SHA256 54b2ad3aff6816a964885c849410e0e67777000713e98b776217b7d509ba0ad2
diff --git a/media-plugins/vdr-reelbox/files/reelbox-3.12384_p1-vdr-1.7.4.diff b/media-plugins/vdr-reelbox/files/reelbox-3.12384_p1-vdr-1.7.4.diff
new file mode 100644
index 0000000..8267b33
--- /dev/null
+++ b/media-plugins/vdr-reelbox/files/reelbox-3.12384_p1-vdr-1.7.4.diff
@@ -0,0 +1,23 @@
+diff -Naur vdr-reelbox-3.orig/VideoPlayerPipHd.c vdr-reelbox-3/VideoPlayerPipHd.c
+--- vdr-reelbox-3.orig/VideoPlayerPipHd.c	2009-11-16 17:16:18.000000000 +0100
++++ vdr-reelbox-3/VideoPlayerPipHd.c	2009-11-16 17:21:46.000000000 +0100
+@@ -45,6 +45,8 @@
+ // I like standards...
+ typedef unsigned char uchar;
+ 
++#include <stdlib.h>
++
+ #define PICS_BUF 16
+ #define HDFB_DEVICE "/dev/fb0"
+ #define ES_BUFFER_SIZE (262144)
+diff -Naur vdr-reelbox-3.orig/setupmenu.c vdr-reelbox-3/setupmenu.c
+--- vdr-reelbox-3.orig/setupmenu.c	2009-11-16 17:16:18.000000000 +0100
++++ vdr-reelbox-3/setupmenu.c	2009-11-16 17:19:50.000000000 +0100
+@@ -27,6 +27,7 @@
+ 
+     if (state == osUnknown && key == kOk)
+     {
++        if (HasSubMenu()) return cMenuSetupPage::ProcessKey(key);
+         const char *text = Get(Current())->Text();
+ 
+         if ( text && strstr(text, tr("Video Settings")) )
diff --git a/media-plugins/vdr-reelbox/vdr-reelbox-3.12384-r1.ebuild b/media-plugins/vdr-reelbox/vdr-reelbox-3.12384-r1.ebuild
index e616332..928d816 100644
--- a/media-plugins/vdr-reelbox/vdr-reelbox-3.12384-r1.ebuild
+++ b/media-plugins/vdr-reelbox/vdr-reelbox-3.12384-r1.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
 
 	if has_version ">=media-video/vdr-1.7.4"
 	then
-		epatch "${FILESDIR}/reelbox-3.12384-vdr-1.7.4.diff"
+		epatch "${FILESDIR}/reelbox-3.12384_p1-vdr-1.7.4.diff"
 	else
 		epatch "${FILESDIR}/save-setup_3.12384.diff"
 	fi