diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-05-07 08:45:59 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-05-07 08:45:59 +0000 |
commit | 44cd27f589d567e33b9dd29af6283ee0a1e7e518 (patch) | |
tree | e4673196316fede29b790f2754390af839c82465 | |
parent | svn path=/testing/; revision=551 (diff) | |
download | testing-44cd27f589d567e33b9dd29af6283ee0a1e7e518.tar.gz testing-44cd27f589d567e33b9dd29af6283ee0a1e7e518.tar.bz2 testing-44cd27f589d567e33b9dd29af6283ee0a1e7e518.zip |
media-plugins/vdr-reelbox: version bump
svn path=/testing/; revision=553
-rw-r--r-- | media-plugins/vdr-reelbox/ChangeLog | 6 | ||||
-rw-r--r-- | media-plugins/vdr-reelbox/Manifest | 9 | ||||
-rw-r--r-- | media-plugins/vdr-reelbox/files/gcc-4.3.x_12133.diff | 11 | ||||
-rw-r--r-- | media-plugins/vdr-reelbox/files/reelbox-12133_makefile.diff | 38 | ||||
-rw-r--r-- | media-plugins/vdr-reelbox/files/save-setup_12133.diff | 11 | ||||
-rw-r--r-- | media-plugins/vdr-reelbox/vdr-reelbox-3.11210.ebuild | 27 | ||||
-rw-r--r-- | media-plugins/vdr-reelbox/vdr-reelbox-3.12133.ebuild | 58 |
7 files changed, 140 insertions, 20 deletions
diff --git a/media-plugins/vdr-reelbox/ChangeLog b/media-plugins/vdr-reelbox/ChangeLog index 81bd58b..5bfbe9a 100644 --- a/media-plugins/vdr-reelbox/ChangeLog +++ b/media-plugins/vdr-reelbox/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-reelbox-3.11210.ebuild, +vdr-reelbox-3.12133.ebuild, + +files/gcc-4.3.x_12133.diff, +files/reelbox-12133_makefile.diff, + +files/save-setup_12133.diff: + version bump + 17 Mar 2009; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-reelbox-3.11210.ebuild, +files/gcc-4.3.x_11210.diff, +files/reelbox-11210_makefile.diff, +files/save-setup_11210.diff: diff --git a/media-plugins/vdr-reelbox/Manifest b/media-plugins/vdr-reelbox/Manifest index a63e84a..0053504 100644 --- a/media-plugins/vdr-reelbox/Manifest +++ b/media-plugins/vdr-reelbox/Manifest @@ -1,11 +1,16 @@ AUX gcc-4.3.x_11210.diff 372 RMD160 35b5d13b483d61414397bf31402be0be8d3126d1 SHA1 afcf8128431f19997c6d44ac4de3505b08adcb7f SHA256 134dd6556519a2b16fba42b61ddcb9b0763fd62d5ab0455b19b00d7d512a5c00 +AUX gcc-4.3.x_12133.diff 372 RMD160 35b5d13b483d61414397bf31402be0be8d3126d1 SHA1 afcf8128431f19997c6d44ac4de3505b08adcb7f SHA256 134dd6556519a2b16fba42b61ddcb9b0763fd62d5ab0455b19b00d7d512a5c00 AUX patches/vdr-1.7.x-truecolor-ehd-9302.diff 54271 RMD160 9dd04d0c0baf8a11e6c2064f5806b516affae5a1 SHA1 300991db319199a5d8cc5bb7c5b497d2f0cf3b9d SHA256 9fe1794c6f111b7b26606ce09ee55b66a9e2c8c1636a453848c945cd32c607a4 AUX reelbox-11210_makefile.diff 1094 RMD160 69f83b118e8b2dbc7fba72631c96dd2ba81cf68b SHA1 60159e6bef9be8691708a47d6e04dd8cccd9ceed SHA256 185e7857565c0c0f32e8de7070f1f0b1481c9de544dd63c54229c4a87085c04f +AUX reelbox-12133_makefile.diff 1094 RMD160 69f83b118e8b2dbc7fba72631c96dd2ba81cf68b SHA1 60159e6bef9be8691708a47d6e04dd8cccd9ceed SHA256 185e7857565c0c0f32e8de7070f1f0b1481c9de544dd63c54229c4a87085c04f AUX save-setup_11210.diff 449 RMD160 451bd528f2f5b7c1d372ec143fe138be9b646a3d SHA1 927eddedc1cf38ba212df6672ac84ca3b6c625ef SHA256 0e4b142764b720df089ccba9be72c80220ce22982b72737842cfb053bb452563 +AUX save-setup_12133.diff 449 RMD160 451bd528f2f5b7c1d372ec143fe138be9b646a3d SHA1 927eddedc1cf38ba212df6672ac84ca3b6c625ef SHA256 0e4b142764b720df089ccba9be72c80220ce22982b72737842cfb053bb452563 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.9302.tgz 140337 RMD160 740c9b258f7890d6f5f00f12723b970c9da82979 SHA1 9c1fbf94c03a812e6b036ffb2ccf65665ba22326 SHA256 f91ef36ebb0da57930485394b5bc2f05b1e06b9f7a4bcc06b0aec70c5cee9c29 -EBUILD vdr-reelbox-3.11210.ebuild 1615 RMD160 9fe945d6ecfc7dba701f12cddf8685e3adb72fc1 SHA1 2a74d4b539bd0b5d204c1f41749d6eed1a48e37b SHA256 b46f43e031a6be27e653e64ef1dda007a8151635de3915aabe994b5f0733d219 +EBUILD vdr-reelbox-3.11210.ebuild 1475 RMD160 c42f9fa50f983d9c1a451f9acfa63f825ee0b277 SHA1 e97579f0b584f5b8cb0fe9664488d144ee6b79f4 SHA256 33e91bde2ee53467e12325c67c29fe49d426944fc55ee945b3f9a8a137d16601 +EBUILD vdr-reelbox-3.12133.ebuild 1475 RMD160 c42f9fa50f983d9c1a451f9acfa63f825ee0b277 SHA1 e97579f0b584f5b8cb0fe9664488d144ee6b79f4 SHA256 33e91bde2ee53467e12325c67c29fe49d426944fc55ee945b3f9a8a137d16601 EBUILD vdr-reelbox-3.9302.ebuild 982 RMD160 eb1c3942188b73e6383cb57804461c6145713498 SHA1 5d5bae21fde3d1f7398d14e897b8ea716f7ce6b7 SHA256 dd2be30eebdfe1bac7596c703a7e344638bc013190f778d3662f00efba6f248b -MISC ChangeLog 555 RMD160 9143f160042d3efc1ad3f97bd5ac54736a21a3d5 SHA1 c5a72eb8e38dd16063eb512e28c24e08c9a3f856 SHA256 511d1cdd0da63e19d508ae2cc77f55486cc037aeffccb5e28457f8ee817753f4 +MISC ChangeLog 784 RMD160 cdf8c22d3b7022e24a0c073526619b06c7b609c7 SHA1 87d411f13c2545f76d35553cd8054442d36d085f SHA256 fcd2a85627b818b5fdb56ba1afd20cc0d07b81e6b6904325a2ad9b2a8a50d3bb MISC metadata.xml 352 RMD160 57a3a02b1c7da27ff3277627eed5645a1812adcc SHA1 15007ef9f352900614d270f14e511414f2669576 SHA256 54b2ad3aff6816a964885c849410e0e67777000713e98b776217b7d509ba0ad2 diff --git a/media-plugins/vdr-reelbox/files/gcc-4.3.x_12133.diff b/media-plugins/vdr-reelbox/files/gcc-4.3.x_12133.diff new file mode 100644 index 0000000..980302e --- /dev/null +++ b/media-plugins/vdr-reelbox/files/gcc-4.3.x_12133.diff @@ -0,0 +1,11 @@ +diff -Naur vdr-reelbox-3.orig/VideoPlayerPipHd.c vdr-reelbox-3/VideoPlayerPipHd.c +--- vdr-reelbox-3.orig/VideoPlayerPipHd.c 2009-03-17 15:45:21.554259015 +0100 ++++ vdr-reelbox-3/VideoPlayerPipHd.c 2009-03-17 15:48:33.715925162 +0100 +@@ -31,6 +31,7 @@ + #include <fcntl.h> + #include <sys/mman.h> + #include <vdr/thread.h> ++#include <stdlib.h> + + extern "C" { + #ifdef REELVDR diff --git a/media-plugins/vdr-reelbox/files/reelbox-12133_makefile.diff b/media-plugins/vdr-reelbox/files/reelbox-12133_makefile.diff new file mode 100644 index 0000000..83caf23 --- /dev/null +++ b/media-plugins/vdr-reelbox/files/reelbox-12133_makefile.diff @@ -0,0 +1,38 @@ +diff -Naur vdr-reelbox-3.orig/Makefile vdr-reelbox-3/Makefile +--- vdr-reelbox-3.orig/Makefile 2009-03-17 14:33:33.873629658 +0100 ++++ vdr-reelbox-3/Makefile 2009-03-17 14:37:09.940664031 +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,8 @@ + LIBDIR = ../../lib + TMPDIR = /tmp + +-BSPSHM = ../../../utils/bspshm +-HDSHM = ../../../utils/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 ++BSPSHM = ../bspshm ++HDSHM = ../hdshm3/src + + ### Allow user defined options to overwrite defaults: + +@@ -47,8 +42,7 @@ + + ### Includes and Defines (add further entries here): + +-INCLUDES += -I$(LIBASOUND)/include $(BSPINCLUDE) $(HDINCLUDE) +-INCLUDES += -I$(LIBMAD) `freetype-config --cflags` ++INCLUDES += -I$(BSPSHM) -I$(HDSHM) -I/usr/include/freetype2 + + ifdef REELSKIN + DEFINES += -DREELSKIN diff --git a/media-plugins/vdr-reelbox/files/save-setup_12133.diff b/media-plugins/vdr-reelbox/files/save-setup_12133.diff new file mode 100644 index 0000000..5824014 --- /dev/null +++ b/media-plugins/vdr-reelbox/files/save-setup_12133.diff @@ -0,0 +1,11 @@ +diff -Naur vdr-reelbox-3.orig/setupmenu.c vdr-reelbox-3/setupmenu.c +--- vdr-reelbox-3.orig/setupmenu.c 2009-03-17 15:45:21.444260764 +0100 ++++ vdr-reelbox-3/setupmenu.c 2009-03-17 15:46:33.234248325 +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.11210.ebuild b/media-plugins/vdr-reelbox/vdr-reelbox-3.11210.ebuild index a983891..46b92c0 100644 --- a/media-plugins/vdr-reelbox/vdr-reelbox-3.11210.ebuild +++ b/media-plugins/vdr-reelbox/vdr-reelbox-3.11210.ebuild @@ -10,8 +10,7 @@ S="${WORKDIR}/${PN}-3" DESCRIPTION="VDR Plugin: for the Reel eHD PCI card" HOMEPAGE="http://www.reel-multimedia.com" -SRC_URI="http://quacks.fratzengeballer.org/distfiles/${P}.tgz - http://vdr.websitec.de/download/${PN}/${P}.tgz" +SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" @@ -21,7 +20,7 @@ IUSE="" S="${WORKDIR}/${PN}-3" DEPEND=">=media-video/vdr-1.6.0 - >=media-video/reelbox-ehd-headers-11210 + >=media-video/reelbox-ehd-headers-${PV} media-video/ffmpeg media-libs/libmad media-libs/libpng @@ -34,9 +33,9 @@ src_prepare() { # small compile fix sed -e "s:char\* fs453_settings_tab:const char\* fs453_settings_tab:" -i "${S}"/fs453settings.c - epatch "${FILESDIR}/reelbox-11210_makefile.diff" - epatch "${FILESDIR}/gcc-4.3.x_11210.diff" - epatch "${FILESDIR}/save-setup_11210.diff" + epatch "${FILESDIR}/reelbox-${PV}_makefile.diff" + epatch "${FILESDIR}/gcc-4.3.x_${PV}.diff" + epatch "${FILESDIR}/save-setup_${PV}.diff" sed -i "${WORKDIR}"/bspshm/hostlib/bspshmlib.c \ -e "s:\"../driver/bspshm.h\":<bspshm.h>:" @@ -44,24 +43,16 @@ src_prepare() { 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 - # ffmpeg-0.4.9_p20081219 - #epatch "${FILESDIR}/vdr-reelbox-ffmpeg.diff" - - sed -i Makefile \ - -e "s:# -lswscale: -lswscale:g" + if has_version ">=media-video/ffmpeg-0.4.9_p20070616"; then + sed -i Makefile -e "s:# -lswscale: -lswscale:g" fi - if has_version ">=media-plugins/vdr-osdpip-0.1.10261" - then + if has_version ">=media-plugins/vdr-osdpip-0.1.10261"; then epatch "${FILESDIR}/vdr-reelbox-pip.diff" fi - if [ ! -z "$EHD_FRAMEBUFFER" ] - then + if [ ! -z "$EHD_FRAMEBUFFER" ]; then einfo "Changing framebuffer device to $EHD_FRAMEBUFFER" find . -type f -exec sed -i "s:/dev/fb0:${EHD_FRAMEBUFFER}:g" {} \; fi - } diff --git a/media-plugins/vdr-reelbox/vdr-reelbox-3.12133.ebuild b/media-plugins/vdr-reelbox/vdr-reelbox-3.12133.ebuild new file mode 100644 index 0000000..46b92c0 --- /dev/null +++ b/media-plugins/vdr-reelbox/vdr-reelbox-3.12133.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit vdr-plugin + +S="${WORKDIR}/${PN}-3" + +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 + + # small compile fix + sed -e "s:char\* fs453_settings_tab:const char\* fs453_settings_tab:" -i "${S}"/fs453settings.c + + epatch "${FILESDIR}/reelbox-${PV}_makefile.diff" + epatch "${FILESDIR}/gcc-4.3.x_${PV}.diff" + epatch "${FILESDIR}/save-setup_${PV}.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 + + if has_version ">=media-plugins/vdr-osdpip-0.1.10261"; then + epatch "${FILESDIR}/vdr-reelbox-pip.diff" + fi + + if [ ! -z "$EHD_FRAMEBUFFER" ]; then + einfo "Changing framebuffer device to $EHD_FRAMEBUFFER" + find . -type f -exec sed -i "s:/dev/fb0:${EHD_FRAMEBUFFER}:g" {} \; + fi +} |