diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-10-01 16:25:38 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-10-01 16:25:38 +0000 |
| commit | 3e624ddb8de45af5246665d4c1b7796ce4cda801 (patch) | |
| tree | 60e7229c2cac094fd1d5b1cdd3682379da0f20e9 /media-plugins | |
| parent | Stable on ppc64; bug #194178 (diff) | |
| download | gentoo-2-3e624ddb8de45af5246665d4c1b7796ce4cda801.tar.gz gentoo-2-3e624ddb8de45af5246665d4c1b7796ce4cda801.tar.bz2 gentoo-2-3e624ddb8de45af5246665d4c1b7796ce4cda801.zip | |
Make it compile against vdr-1.5.9.
(Portage version: 2.1.3.11)
Diffstat (limited to 'media-plugins')
3 files changed, 67 insertions, 2 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index 1f7c7a21a473..4c040a342987 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.47 2007/07/31 20:25:16 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.48 2007/10/01 16:25:37 zzam Exp $ + + 01 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/vdr-softdevice-20070711-vdr-1.5.9.diff, + vdr-softdevice-0.4.0.20070711-r1.ebuild: + Make it compile against vdr-1.5.9. *vdr-softdevice-0.4.0.20070711-r1 (31 Jul 2007) diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff new file mode 100644 index 000000000000..73f22ebedbe3 --- /dev/null +++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff @@ -0,0 +1,50 @@ +diff -ru softdevice.cvs.orig/softdevice.c softdevice.cvs/softdevice.c +--- softdevice.cvs.orig/softdevice.c 2007-07-24 04:10:13.000000000 -0700 ++++ softdevice.cvs/softdevice.c 2007-08-26 18:06:33.000000000 -0700 +@@ -119,7 +119,7 @@ + static cOsd *osd; + public: + cSoftOsdProvider(cVideoOut *VideoOut); +- virtual cOsd *CreateOsd(int Left, int Top); ++ virtual cOsd *CreateOsd(int Left, int Top, uint Level); + static cOsd *GetOsd(); + }; + +@@ -130,9 +130,9 @@ + videoOut = VideoOut; + } + +-cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top) ++cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top, uint Level) + { +- osd = new cSoftOsd(videoOut, Left, Top); ++ osd = new cSoftOsd(videoOut, Left, Top, Level); + return osd; + } + +diff -ru softdevice.cvs.orig/SoftOsd.c softdevice.cvs/SoftOsd.c +--- softdevice.cvs.orig/SoftOsd.c 2007-07-24 04:10:11.000000000 -0700 ++++ softdevice.cvs/SoftOsd.c 2007-08-26 18:14:57.000000000 -0700 +@@ -46,8 +46,8 @@ + /* --------------------------------------------------------------------------- + */ + +-cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y) +- : cOsd(X, Y),active(false),close(false) { ++cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y, uint level) ++ : cOsd(X, Y, 0),active(false),close(false) { + OSDDEB("cSoftOsd constructor\n"); + OutputConvert=&cSoftOsd::ARGB_to_ARGB32; + bitmap_Format=PF_None; // forces a clear after first SetMode +diff -ru softdevice.cvs.orig/SoftOsd.h softdevice.cvs/SoftOsd.h +--- softdevice.cvs.orig/SoftOsd.h 2007-07-24 04:10:11.000000000 -0700 ++++ softdevice.cvs/SoftOsd.h 2007-08-26 18:13:17.000000000 -0700 +@@ -91,7 +91,7 @@ + int ScreenOsdWidth; + int ScreenOsdHeight; + public: +- cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs); ++ cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs, uint level); + virtual ~cSoftOsd(); + virtual void Flush(void); + diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild index e8d1bff4e9c5..6976a52c6c91 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.4.0.20070711-r1.ebuild,v 1.1 2007/07/31 20:25:16 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild,v 1.2 2007/10/01 16:25:37 zzam Exp $ inherit vdr-plugin versionator @@ -90,6 +90,16 @@ pkg_setup() { fi } +src_unpack() { + vdr-plugin_src_unpack unpack + cd "${S}" + + if has_version ">=media-video/vdr-1.5.9"; then + epatch "${FILESDIR}"/${PN}-${SNAP_V}-vdr-1.5.9.diff + fi + vdr-plugin_src_unpack all_but_unpack +} + src_compile() { local MYOPTS="" MYOPTS="${MYOPTS} --disable-vidix" |