From: Joerg Bornkessel Date: Sun, 25 Mar 2007 21:35:56 +0000 (+0000) Subject: patch added; ready for VDR 1.5.x X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0bf0acc2b9c00f0b94ae4c34b4497a9ab59739b;p=gentoo.git patch added; ready for VDR 1.5.x Package-Manager: portage-2.1.2.2 --- 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/Manifest b/media-plugins/vdr-mp3ng/Manifest index 31cf38041221..57d30e9adf9d 100644 --- a/media-plugins/vdr-mp3ng/Manifest +++ b/media-plugins/vdr-mp3ng/Manifest @@ -33,6 +33,10 @@ AUX vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 RMD160 f9d839082ca30ff6b782e44281261c6 MD5 c2e80e832f8316d741e9a0f9fab97c4f files/vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 RMD160 f9d839082ca30ff6b782e44281261c6483db3fee files/vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 SHA256 766a0bbdffab942a4665d9e662c5bdcee33c5a587fe6f037da5e4ae9c5a4873c files/vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 +AUX vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1863 RMD160 60f15796ea243bc891ccebe99329b2105678b1af SHA1 1e7b7c6976682076ae0617f923837b487a0db49f SHA256 7325484e3f335bfc1bdd1c4db2eff7f183d142c0d24721877976b985e83e6e20 +MD5 f57517076e9eb4173c1f735fc91ee4b6 files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1863 +RMD160 60f15796ea243bc891ccebe99329b2105678b1af files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1863 +SHA256 7325484e3f335bfc1bdd1c4db2eff7f183d142c0d24721877976b985e83e6e20 files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1863 DIST vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz 6726 RMD160 df4b3beacc5c30dee6c940cd5665143784b2b8d9 SHA1 04125a578ba9ffb19b6140596d6b9cfabdb47713 SHA256 f4f947f7fa38c261c39af0cffb30a69bb641884b9efd26f5d73742170c3a6628 DIST vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289 RMD160 8ba70bc7054017e2fc6e7738f34604a444b4b5c1 SHA1 8eb74807308c8dfcb2df140bf8aabfbf224951c2 SHA256 c92b220b878c98001bc6293aaa72d3247368a4d8c785e883f8fb24c4e4a09f12 DIST vdr-mp3ng-pictures-0.0.1.tar.gz 170089 RMD160 8a509f90dce9102ee5b39d1536aad0e31060a9c6 SHA1 ccea02aad849131ef44bb84dce57a306ad2fa22a SHA256 962d3e85b3e19e7ef1bfdd4b66947b3c5327f5691c42454b4840fdb7ec5b2288 @@ -40,14 +44,14 @@ EBUILD vdr-mp3ng-0.0.1_pre3.ebuild 1652 RMD160 5bdd745db7ba2049554fe77742c9a824e MD5 6b7f4af5d47a375f372cbe32d89c59a9 vdr-mp3ng-0.0.1_pre3.ebuild 1652 RMD160 5bdd745db7ba2049554fe77742c9a824eef33623 vdr-mp3ng-0.0.1_pre3.ebuild 1652 SHA256 593642af5a025ab70208438ca3abd7d43f39affd24d8209a03cae6108540c5d8 vdr-mp3ng-0.0.1_pre3.ebuild 1652 -EBUILD vdr-mp3ng-0.0.1_pre4.ebuild 1798 RMD160 7d7539110bb763a0cae82d9ebef1162a3ab9666e SHA1 5c9871e6e7bf8896db98120fc605b1721ab5083c SHA256 38b483b138ace9964adfce00bff7f1da0ff95959dae55d7fe092e0f3de0e2c34 -MD5 47c25786397c5704dc6ae99208d48bf0 vdr-mp3ng-0.0.1_pre4.ebuild 1798 -RMD160 7d7539110bb763a0cae82d9ebef1162a3ab9666e vdr-mp3ng-0.0.1_pre4.ebuild 1798 -SHA256 38b483b138ace9964adfce00bff7f1da0ff95959dae55d7fe092e0f3de0e2c34 vdr-mp3ng-0.0.1_pre4.ebuild 1798 -MISC ChangeLog 2211 RMD160 9cc3f7c2b9be6243beb85937d84959486092d876 SHA1 64ebb5838e12427c4e0427b6096589b393688972 SHA256 43201a54407c3c7a14cfbd54b1d9c2c16e2eee5e470fee2775d433efc17cd135 -MD5 0e3bd5ca6dec35d13e5cae27a81b10eb ChangeLog 2211 -RMD160 9cc3f7c2b9be6243beb85937d84959486092d876 ChangeLog 2211 -SHA256 43201a54407c3c7a14cfbd54b1d9c2c16e2eee5e470fee2775d433efc17cd135 ChangeLog 2211 +EBUILD vdr-mp3ng-0.0.1_pre4.ebuild 1838 RMD160 1d5c18d207e3146c6a0dcb8ee9d35178df4313b6 SHA1 5efdb4f4264bc5ff062a0e2e8a4c81609fa09953 SHA256 490510ccc1522ab05168fe45759432f8c86b29cb514602c00a7357a8cc456f05 +MD5 6be7a1de1949302a013c880d9bdf58aa vdr-mp3ng-0.0.1_pre4.ebuild 1838 +RMD160 1d5c18d207e3146c6a0dcb8ee9d35178df4313b6 vdr-mp3ng-0.0.1_pre4.ebuild 1838 +SHA256 490510ccc1522ab05168fe45759432f8c86b29cb514602c00a7357a8cc456f05 vdr-mp3ng-0.0.1_pre4.ebuild 1838 +MISC ChangeLog 2378 RMD160 11eee91071f82f709f9dfc8a1fe0ac570eb476eb SHA1 6a56b574772e6b5158b86e23290662d4f663a2c1 SHA256 d44247d2ad25ed9304c383edb43ffff5ebc75f012eed084cd28715060cc52bf0 +MD5 a759a109c12d8d1ceb8f65a4b09e0a95 ChangeLog 2378 +RMD160 11eee91071f82f709f9dfc8a1fe0ac570eb476eb ChangeLog 2378 +SHA256 d44247d2ad25ed9304c383edb43ffff5ebc75f012eed084cd28715060cc52bf0 ChangeLog 2378 MISC metadata.xml 507 RMD160 7425b2372eae01b047b9a174b3e2e0a2634a7212 SHA1 8eb0440d967faa5b391695b0b495a0c701a9e95c SHA256 ffb3ea14c929caeb6a595b599f09fe286a2885eed968844a5e1eeb702a331118 MD5 4ad6e2a484dfcc523b5b7545544d1ce5 metadata.xml 507 RMD160 7425b2372eae01b047b9a174b3e2e0a2634a7212 metadata.xml 507 @@ -59,10 +63,10 @@ MD5 c4c264a9bae80db3e761bdfafb5acaa1 files/digest-vdr-mp3ng-0.0.1_pre4 858 RMD160 398d1d5579654b6e4519365d1b86a6be17d78658 files/digest-vdr-mp3ng-0.0.1_pre4 858 SHA256 fd9f2c397cbefb26d6e9b9709ac596ceddf3bcaac0418d64ee388174dd582695 files/digest-vdr-mp3ng-0.0.1_pre4 858 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) -Comment: no further Information +Version: GnuPG v1.4.5 (GNU/Linux) +Comment: added by hd_brummy@gentoo.org -iD8DBQFFBYwAdn07HTTCgIoRAmqtAJ9VDGPgOkL0TexM/V3aqvBl+YYt+ACfTDL2 -j1WkF10DMZ8ULYs0sp6kA6s= -=DdZN +iD8DBQFGBut2dn07HTTCgIoRAvbIAJ4m6B8rSo+zfWRq0HeFKZC2Av6fIQCeNjvb +A/4+DKnJsIGgM4WDozxKvkw= +=483m -----END PGP SIGNATURE----- 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