From 633e6c2b707504b9e47220443a460c3ffc339b97 Mon Sep 17 00:00:00 2001 From: Jörg Bornkessel Date: Sun, 25 Mar 2007 21:35:56 +0000 Subject: patch added; ready for VDR 1.5.x (Portage version: 2.1.2.2) --- media-plugins/vdr-mp3ng/ChangeLog | 8 ++- .../files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff | 62 ++++++++++++++++++++++ .../vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild | 5 +- 3 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff (limited to 'media-plugins/vdr-mp3ng') diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog index cdb7a8afbace..4a15878228f6 100644 --- a/media-plugins/vdr-mp3ng/ChangeLog +++ b/media-plugins/vdr-mp3ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-mp3ng -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.9 2006/09/11 16:17:17 hd_brummy Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.10 2007/03/25 21:35:56 hd_brummy Exp $ + + 25 Mar 2007; Joerg Bornkessel + +files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff, vdr-mp3ng-0.0.1_pre4.ebuild: + patch added; ready for VDR 1.5.x 11 Sep 2006; Joerg Bornkessel -files/vdr-mp3ng-0.0.1_pre4-span.diff, vdr-mp3ng-0.0.1_pre4.ebuild: diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff new file mode 100644 index 000000000000..77d1d6e64053 --- /dev/null +++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff @@ -0,0 +1,62 @@ +fix for VDR 1.5.x + +Joerg Bornkessel 25 Mar 2007 +diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/mp3ng.c mp3ng-0.9.13-MKIV-pre3/mp3ng.c +--- mp3ng-0.9.13-MKIV-pre3.orig/mp3ng.c 2007-03-25 23:09:14.000000000 +0200 ++++ mp3ng-0.9.13-MKIV-pre3/mp3ng.c 2007-03-25 23:14:16.000000000 +0200 +@@ -370,7 +370,12 @@ + HideStatus(); + if(visible) { + delete osd; osd=0; ++#if APIVERSNUM > 10500 ++ visible = bigwin = false; ¦ ++ SetNeedsFastResponse(visible); ++#else + needsFastResponse=visible=bigwin=false; ++#endif + } + } + +@@ -581,7 +586,12 @@ + osd->Flush(); + + ShowStatus(true); ++#if APIVERSNUM > 10500 ++ visible=true; ++ SetNeedsFastResponse(visible); ++#else + needsFastResponse=visible=true; ++#endif + fliptime=listtime=0; flipint=0; flip=-1; top=lastTop=-1; lastIndex=lastTotal=-1; + delete lastMode; lastMode=0; + } +diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/mplayer.c mp3ng-0.9.13-MKIV-pre3/mplayer.c +--- mp3ng-0.9.13-MKIV-pre3.orig/mplayer.c 2007-03-25 23:09:14.000000000 +0200 ++++ mp3ng-0.9.13-MKIV-pre3/mplayer.c 2007-03-25 23:18:09.000000000 +0200 +@@ -219,7 +219,12 @@ + #else + Interface->Close(); + #endif ++#if APIVERSNUM > 10500 ++ visible = modeOnly = false; ++ SetNeedsFastResponse(visible); ++#else + needsFastResponse=visible=modeOnly=false; ++#endif + } + } + +@@ -251,7 +256,13 @@ + Interface->Clear(); + if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent); + #endif ++#if APIVERSNUM > 10500 ++ visible = true; ++ SetNeedsFastResponse(visible); ++ modeOnly=false; ++#else + needsFastResponse=visible=true; modeOnly=false; ++#endif + if(file) { + #if VDRVERSNUM >= 10307 + display->SetTitle(file->Path()); diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild index bf11a14b678f..df193ec913e9 100644 --- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild +++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.2 2006/09/11 16:17:17 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.3 2007/03/25 21:35:56 hd_brummy Exp $ inherit vdr-plugin eutils @@ -35,6 +35,7 @@ src_unpack() { epatch ${FILESDIR}/${P}-gentoo.diff epatch ${FILESDIR}/${P}-gcc4.diff epatch ${DISTDIR}/${P}-span-0.0.3.diff.tar.gz + epatch ${FILESDIR}/${P}-vdr-1.5.1.diff use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile -- cgit v1.2.3-65-gdbad