media-plugins/vdr-reelbox: version bump

svn path=/testing/; revision=637

5 files changed, 127 insertions, 2 deletions

diff --git a/media-plugins/vdr-reelbox/ChangeLog b/media-plugins/vdr-reelbox/ChangeLog
index 9e90389..3c382c5 100644
--- a/media-plugins/vdr-reelbox/ChangeLog
+++ b/media-plugins/vdr-reelbox/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-plugins/vdr-reelbox
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jan 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-reelbox-3.13986.ebuild, +files/reelbox-3.13986_makefile.diff,
+  +files/save-setup_3.13986.diff:
+  version bump
+
   30 Nov 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-reelbox-3.12384-r1.ebuild:
   ffmpeg-0.5 fix added
diff --git a/media-plugins/vdr-reelbox/Manifest b/media-plugins/vdr-reelbox/Manifest
index 4901759..2ed2203 100644
--- a/media-plugins/vdr-reelbox/Manifest
+++ b/media-plugins/vdr-reelbox/Manifest
@@ -7,18 +7,22 @@ AUX reelbox-3.12384-vdr-1.7.4.diff 1438 RMD160 8c344ed73ecdd389b7919a3e90635a7b8
 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 reelbox-3.13986_makefile.diff 1324 RMD160 3f988e99feef9a0adca3b6820a17ad8503404a18 SHA1 fe8beb1bb53c0bd2783ad110fa9f5578d7c29d7a SHA256 5167dd6e203d5bf30ece6ffd6f270d0dac1ca95bedd10ce15149fb59387eee05
 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
 AUX save-setup_3.12384.diff 884 RMD160 690bf64f172c59710476fe595ee01f3c570db944 SHA1 55daba66fcfb61e73232cea143f5763332163058 SHA256 a8a473ee9780e6b3fa644453439cf68097bd40b4ef2ad5800b105b6ba5a64f20
+AUX save-setup_3.13986.diff 884 RMD160 690bf64f172c59710476fe595ee01f3c570db944 SHA1 55daba66fcfb61e73232cea143f5763332163058 SHA256 a8a473ee9780e6b3fa644453439cf68097bd40b4ef2ad5800b105b6ba5a64f20
 AUX vdr-reelbox-3.9302_makefile.diff 1042 RMD160 36194ad2bba086d1d53b027321cafbeb9293b4c2 SHA1 575f4adb8715a7c23f97608ae5e3c9b15ae80cbd SHA256 39b759c22d3bcecc2d116125636d85150a5e0797c8df614ae1d26236c968a5fc
 DIST vdr-reelbox-3.11210.tgz 162319 RMD160 afd1408e5aa492488a35760f9969779442a5f5d7 SHA1 566991a6da8f077417bc982f02565ddc656fe73a SHA256 598dc82124099302116b1e671ed32742f09c8d5a67bbe412419f61d99dffaf7b
 DIST vdr-reelbox-3.12133.tgz 162912 RMD160 f5351bd917079591c8a6b72f5179d6b741407efd SHA1 ff8a92e935851e5334bd4e22d01db8ca6244e6a6 SHA256 82256d4c77d27a9262546aba75f0a58ecc57f28e72ae78dee32e67ac57e51dc7
 DIST vdr-reelbox-3.12384.tgz 168266 RMD160 a138ceb62763039876b5a89f25e5a12bf37d890c SHA1 e41cec7bc9af45804122aeaa01f16863c49bb71d SHA256 e8a45adabafa26688c47987b267d5c7e4f7e6405e83bea3063e4e23689cbde96
+DIST vdr-reelbox-3.13986.tgz 169712 RMD160 b399f8f393dd2ee4c08bfd9b110ea4ef11bccd15 SHA1 bf23d2a555ee950f260bf9761a89fe4fc3b48360 SHA256 c29389e71c6bef6e20292ee088bacb94cd087e5c41465240fe2a3e0ca60aaf82
 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 1655 RMD160 ad10171e6fee373c192f4d7abfce840a192425b9 SHA1 52a22ea3e0c54acdfb906d182b127d20f9ab27ea SHA256 2a03b1258dc4455b19b11fcb9c88aa7d69ab0894aa50687443f1b3fd77adcd52
 EBUILD vdr-reelbox-3.12384.ebuild 1690 RMD160 8abbdfb00f3cb2282502bcad551e698516cc1533 SHA1 fd6ddb893462bc82103d68eecafde9e344d37d58 SHA256 4828202d56dc8aae6025e27b8679ce073e01252d1a6f27e8187bcdd0092b1139
+EBUILD vdr-reelbox-3.13986.ebuild 1108 RMD160 36efd4982a380433073ffecf82702c2c7f7a3b83 SHA1 66efc47e80b723919fa327584e569eff1d7ab8db SHA256 1377590f0a5919d27b7092c43af0f3c6b9abfb1e2b41c4da6798a72b3a5133c1
 EBUILD vdr-reelbox-3.9302.ebuild 982 RMD160 eb1c3942188b73e6383cb57804461c6145713498 SHA1 5d5bae21fde3d1f7398d14e897b8ea716f7ce6b7 SHA256 dd2be30eebdfe1bac7596c703a7e344638bc013190f778d3662f00efba6f248b
-MISC ChangeLog 2504 RMD160 71dc5c699ef1f58a1cebd256d29522ba83243601 SHA1 3bbf8b6a7e03672b748a5108652e767a8b65e53f SHA256 84327d6ada39a3563aebec13dc2721b2686ea4a5ad374d2fd90c25019a7a69c9
+MISC ChangeLog 2678 RMD160 ea8af34bb3fec0a8dfdb8a547e66df44e3097bd2 SHA1 059df1718b79f266d2c244150fa2d3eafdc64648 SHA256 c697352072134ed7345d2c93b1067a673a5c523c4e75d52d7392b31872019121
 MISC metadata.xml 352 RMD160 57a3a02b1c7da27ff3277627eed5645a1812adcc SHA1 15007ef9f352900614d270f14e511414f2669576 SHA256 54b2ad3aff6816a964885c849410e0e67777000713e98b776217b7d509ba0ad2
diff --git a/media-plugins/vdr-reelbox/files/reelbox-3.13986_makefile.diff b/media-plugins/vdr-reelbox/files/reelbox-3.13986_makefile.diff
new file mode 100644
index 0000000..65ba83d
--- /dev/null
+++ b/media-plugins/vdr-reelbox/files/reelbox-3.13986_makefile.diff
@@ -0,0 +1,43 @@
+--- Makefile-org	2009-03-16 23:46:28.000000000 +0100
++++ Makefile	2009-03-16 23:48:14.000000000 +0100
+@@ -10,7 +10,7 @@
+ PLUGIN = reelbox
+ 
+ # set it if you want to compile the skin for use with the reelbox
+-REELSKIN=1
++#REELSKIN=1
+ 
+ ### The object files (add further files here):
+ 
+@@ -33,13 +33,13 @@
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+ 
+-BSPSHM = ../../../utils/bspshm
+-HDSHM = ../../../utils/hdshm3/src
++BSPSHM = ../bspshm
++HDSHM = ../hdshm3/src
+ 
+-BSPINCLUDE = -I$(BSPSHM) -I$(BSPSHM)/include
+-HDINCLUDE = -I$(HDSHM) -I$(HDSHM)/include
+-LIBMAD     ?= ../../../../temp/docimage/libs/libmad
+-LIBASOUND  ?= ../../../../temp/docimage/libs/alsa-lib
++#BSPINCLUDE = -I$(BSPSHM) -I$(BSPSHM)/include
++#HDINCLUDE = -I$(HDSHM) -I$(HDSHM)/include
++#LIBMAD     ?= ../../../../temp/docimage/libs/libmad
++#LIBASOUND  ?= ../../../../temp/docimage/libs/alsa-lib
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -47,8 +47,9 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I$(LIBASOUND)/include $(BSPINCLUDE) $(HDINCLUDE)
+-INCLUDES += -I$(LIBMAD) `freetype-config --cflags`
++#INCLUDES += -I$(LIBASOUND)/include $(BSPINCLUDE) $(HDINCLUDE)
++#INCLUDES += -I$(LIBMAD) `freetype-config --cflags`
++INCLUDES += -I$(BSPSHM) -I$(HDSHM) `freetype-config --cflags`
+ 
+ ifdef REELSKIN
+   DEFINES += -DREELSKIN
diff --git a/media-plugins/vdr-reelbox/files/save-setup_3.13986.diff b/media-plugins/vdr-reelbox/files/save-setup_3.13986.diff
new file mode 100644
index 0000000..a034b11
--- /dev/null
+++ b/media-plugins/vdr-reelbox/files/save-setup_3.13986.diff
@@ -0,0 +1,24 @@
+diff -ru reelbox-3.10388.orig/setupmenu.c reelbox-3.10388/setupmenu.c
+--- reelbox-3.10388.orig/setupmenu.c	2009-01-19 13:22:30.000000000 +0100
++++ reelbox-3.10388/setupmenu.c	2009-01-19 17:10:08.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 -ru reelbox-3.10388.orig/VideoPlayerPipHd.c reelbox-3.10388/VideoPlayerPipHd.c
+--- reelbox-3.10388.orig/VideoPlayerPipHd.c	2009-01-19 13:22:30.000000000 +0100
++++ reelbox-3.10388/VideoPlayerPipHd.c	2009-01-19 17:03:12.000000000 +0100
+@@ -39,6 +39,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 --git a/media-plugins/vdr-reelbox/vdr-reelbox-3.13986.ebuild b/media-plugins/vdr-reelbox/vdr-reelbox-3.13986.ebuild
new file mode 100644
index 0000000..17f6c72
--- /dev/null
+++ b/media-plugins/vdr-reelbox/vdr-reelbox-3.13986.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+RESTRICT="mirror"
+
+DESCRIPTION="VDR Plugin: for the Reel eHD PCI card"
+HOMEPAGE="http://www.reel-multimedia.com"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+S="${WORKDIR}/${PN}-3"
+
+DEPEND=">=media-video/vdr-1.6.0
+		>=media-video/reelbox-ehd-headers-${PV}
+	    media-video/ffmpeg
+		media-libs/libmad
+		media-libs/libpng
+		media-libs/alsa-lib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	epatch "${FILESDIR}/reelbox-${PV}_makefile.diff"
+
+	sed -i "${WORKDIR}"/bspshm/hostlib/bspshmlib.c \
+		-e "s:\"../driver/bspshm.h\":<bspshm.h>:"
+
+	sed -i "${WORKDIR}"/hdshm3/src/hostlib/hdshmlib.c \
+		-e "s:\"../driver/hdshm.h\":<hdshm.h>:"
+
+	if has_version ">=media-video/ffmpeg-0.4.9_p20070616"
+	then
+		sed -i Makefile -e "s:# -lswscale: -lswscale:g"
+	fi
+
+	epatch "${FILESDIR}/save-setup-${PV}.diff"
+
+	sed -e "s:/dev/fb0:/dev/fb_reel:g" -i HdFbTrueColorOsd.c VideoPlayerPipHd.c
+}