From 373c61d86a7129dfe1922a1b00c43f832954646b Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 16 Nov 2006 10:42:42 +0000 Subject: [PATCH] Added fix for volume-display and recording marker. Package-Manager: portage-2.1.2_rc1-r7 --- media-plugins/vdr-skinelchi/ChangeLog | 9 +- media-plugins/vdr-skinelchi/Manifest | 25 +++- .../files/digest-vdr-skinelchi-0.1.1_pre2-r2 | 3 + ...hi-0.1.1_pre2-PatchCollection-FireFly.diff | 138 ++++++++++++++++++ .../vdr-skinelchi-0.1.1_pre2-r2.ebuild | 37 +++++ 5 files changed, 204 insertions(+), 8 deletions(-) create mode 100644 media-plugins/vdr-skinelchi/files/digest-vdr-skinelchi-0.1.1_pre2-r2 create mode 100644 media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff create mode 100644 media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r2.ebuild diff --git a/media-plugins/vdr-skinelchi/ChangeLog b/media-plugins/vdr-skinelchi/ChangeLog index 285d2f3f6748..3bad971c0920 100644 --- a/media-plugins/vdr-skinelchi/ChangeLog +++ b/media-plugins/vdr-skinelchi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-skinelchi # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/ChangeLog,v 1.10 2006/11/16 10:31:49 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/ChangeLog,v 1.11 2006/11/16 10:42:42 zzam Exp $ + +*vdr-skinelchi-0.1.1_pre2-r2 (16 Nov 2006) + + 16 Nov 2006; Matthias Schwarzott + +files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff, + +vdr-skinelchi-0.1.1_pre2-r2.ebuild: + Added fix for volume-display and recording marker. 16 Nov 2006; Matthias Schwarzott vdr-skinelchi-0.1.1_pre2-r1.ebuild: diff --git a/media-plugins/vdr-skinelchi/Manifest b/media-plugins/vdr-skinelchi/Manifest index c025532231d1..2799a0c5a70f 100644 --- a/media-plugins/vdr-skinelchi/Manifest +++ b/media-plugins/vdr-skinelchi/Manifest @@ -9,6 +9,10 @@ AUX vdr-skinelchi-0.1.1_pre1-vdr-1.3.38.patch 1793 RMD160 e4d6c44ff3b35eee6fddc7 MD5 4a88c18455188b11d74c918a286bd5cb files/vdr-skinelchi-0.1.1_pre1-vdr-1.3.38.patch 1793 RMD160 e4d6c44ff3b35eee6fddc76504a8e22437a5da43 files/vdr-skinelchi-0.1.1_pre1-vdr-1.3.38.patch 1793 SHA256 21cf2035531687f4dfd4a81167f10db08eac844d5159a34d80fc006052d01436 files/vdr-skinelchi-0.1.1_pre1-vdr-1.3.38.patch 1793 +AUX vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff 5002 RMD160 a5dac8ec644c392e991afd09fcfba2c96c40ae90 SHA1 9436ce12d0782099683054fb81e784651d01d4ef SHA256 a8c779824e774c61e9838a4be40ad6e770668ceefbdefe507686d3bcc93919ec +MD5 3f743e1447e1938939f8885bd5d344b4 files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff 5002 +RMD160 a5dac8ec644c392e991afd09fcfba2c96c40ae90 files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff 5002 +SHA256 a8c779824e774c61e9838a4be40ad6e770668ceefbdefe507686d3bcc93919ec files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff 5002 DIST vdr-skinelchi-0.1.1pre1.tgz 60761 RMD160 0af7926e8298f38360c68b7836cc5bf770f9a4fe SHA1 c02b7cacac0b048955eb3592a43b1c2215733220 SHA256 d34e0d5f93c50dfc7be0f4efa143497055ae78da4d2d0eb98a1f89909aae2217 DIST vdr-skinelchi-0.1.1pre2.tgz 61489 RMD160 fd28310c2b2e03b58c818b72934d66443127e8f5 SHA1 80ce3b2e00e1c03f1ce674924c98290b2385c9d3 SHA256 8a1a79bde62ad26618a8d9cab19b41b1e65443c1ffa3d919f4a899d1557918b2 EBUILD vdr-skinelchi-0.1.1_pre1.ebuild 659 RMD160 7eefde77144b7b5d0f5533a675df9fe3ab725d79 SHA1 2328df14ef8f0a3bd4cd12de169a4802c8d82da1 SHA256 935596c91a72fb285d31ba0a36a94b42a57e63602865bf2db2a7228f7d150881 @@ -19,14 +23,18 @@ EBUILD vdr-skinelchi-0.1.1_pre2-r1.ebuild 934 RMD160 e388bdd50896b404e045cb5923d MD5 14b94a3182a552a48c1ed44b92240ff1 vdr-skinelchi-0.1.1_pre2-r1.ebuild 934 RMD160 e388bdd50896b404e045cb5923d1ed588dc0e66d vdr-skinelchi-0.1.1_pre2-r1.ebuild 934 SHA256 2a279d915e70042fb4c90063bcdef65d4793a80b1cd5b48886a1c0b9491db196 vdr-skinelchi-0.1.1_pre2-r1.ebuild 934 +EBUILD vdr-skinelchi-0.1.1_pre2-r2.ebuild 992 RMD160 837e24e7ddefeed19e26ac667aab272dceeb7e84 SHA1 ec4917dcf8f36db1267264a4735c794355cd16b5 SHA256 a0b0af0b5bdd78ceb6681b7a1447b0ab8143546696cb559308ba6d5a0802faf3 +MD5 332d7412a2bf1b98ca79bdad5a77fff7 vdr-skinelchi-0.1.1_pre2-r2.ebuild 992 +RMD160 837e24e7ddefeed19e26ac667aab272dceeb7e84 vdr-skinelchi-0.1.1_pre2-r2.ebuild 992 +SHA256 a0b0af0b5bdd78ceb6681b7a1447b0ab8143546696cb559308ba6d5a0802faf3 vdr-skinelchi-0.1.1_pre2-r2.ebuild 992 EBUILD vdr-skinelchi-0.1.1_pre2.ebuild 859 RMD160 a451f11bc55ebd2c4d243004f7ae5d92860e1f29 SHA1 ad1a124f1b914748ad4f3db355160329001263f4 SHA256 7d5e50c1de370ab7eec05ca8b52b9e0ddba910d95963ed85e4d81811dc068f80 MD5 930127253a22731d43dbb3d923a7ccfa vdr-skinelchi-0.1.1_pre2.ebuild 859 RMD160 a451f11bc55ebd2c4d243004f7ae5d92860e1f29 vdr-skinelchi-0.1.1_pre2.ebuild 859 SHA256 7d5e50c1de370ab7eec05ca8b52b9e0ddba910d95963ed85e4d81811dc068f80 vdr-skinelchi-0.1.1_pre2.ebuild 859 -MISC ChangeLog 1945 RMD160 07aae42dd0bfc3dd1f33182954a7f80bbb69bcc4 SHA1 20e025c2ce4bee0e55ee067c9e654200950a62b2 SHA256 6384201efff11bb8bc895b719a76b846c68a1b396f255fa00243c39531429868 -MD5 92393234f6250d4eb45a3b5a5caf7533 ChangeLog 1945 -RMD160 07aae42dd0bfc3dd1f33182954a7f80bbb69bcc4 ChangeLog 1945 -SHA256 6384201efff11bb8bc895b719a76b846c68a1b396f255fa00243c39531429868 ChangeLog 1945 +MISC ChangeLog 2199 RMD160 62f0d04c3325aafc16e17fdeda44a711d97b4d4a SHA1 b63e5120fd96fc860d831ac724bdcb028beb2141 SHA256 1ec1409958d075ccf839565db88218fb1dfea41b96c3e5ab75192cef0bf67df2 +MD5 08a2ada99e2026719d5c5efd79a418af ChangeLog 2199 +RMD160 62f0d04c3325aafc16e17fdeda44a711d97b4d4a ChangeLog 2199 +SHA256 1ec1409958d075ccf839565db88218fb1dfea41b96c3e5ab75192cef0bf67df2 ChangeLog 2199 MISC metadata.xml 335 RMD160 eb5fcf03c21510453d995cce8ee8f8a6324e6545 SHA1 e8105cf5fdbf0be508311933b8e34db224e9bc51 SHA256 f8790d655b9660f52dfddc7d5785248a334bae37ef607c6b87f50ed597e76573 MD5 343b9bd95a96c7fa0ca6a4a71f530168 metadata.xml 335 RMD160 eb5fcf03c21510453d995cce8ee8f8a6324e6545 metadata.xml 335 @@ -40,10 +48,13 @@ SHA256 74cce77aa57c86fab3e9335c8c40fa0c10c9154f9d7a9928d5050d68a955b906 files/di MD5 26855a8b69da9a867d2d10a2f155f16d files/digest-vdr-skinelchi-0.1.1_pre2-r1 259 RMD160 a93f6a2c6666934c564c444ccbd5fb6c1f742a19 files/digest-vdr-skinelchi-0.1.1_pre2-r1 259 SHA256 74cce77aa57c86fab3e9335c8c40fa0c10c9154f9d7a9928d5050d68a955b906 files/digest-vdr-skinelchi-0.1.1_pre2-r1 259 +MD5 26855a8b69da9a867d2d10a2f155f16d files/digest-vdr-skinelchi-0.1.1_pre2-r2 259 +RMD160 a93f6a2c6666934c564c444ccbd5fb6c1f742a19 files/digest-vdr-skinelchi-0.1.1_pre2-r2 259 +SHA256 74cce77aa57c86fab3e9335c8c40fa0c10c9154f9d7a9928d5050d68a955b906 files/digest-vdr-skinelchi-0.1.1_pre2-r2 259 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFXD4dt2vP6XvVdOcRAszIAJ93zSJvTC8R8aiQrKDISDj3Qr2+zACgmz3M -r0OuivaRt08TgLXThttf1m8= -=3r70 +iD8DBQFFXECrt2vP6XvVdOcRAl/iAKCdnFKiafouhBAO/WoKNCeFAXlYDACfephz +BCj3GxlwRdZVsFO93Umbcb4= +=Epqu -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-skinelchi/files/digest-vdr-skinelchi-0.1.1_pre2-r2 b/media-plugins/vdr-skinelchi/files/digest-vdr-skinelchi-0.1.1_pre2-r2 new file mode 100644 index 000000000000..3d54f680c2ef --- /dev/null +++ b/media-plugins/vdr-skinelchi/files/digest-vdr-skinelchi-0.1.1_pre2-r2 @@ -0,0 +1,3 @@ +MD5 ab90578ba4d0c72d0fd55181e6d3c205 vdr-skinelchi-0.1.1pre2.tgz 61489 +RMD160 fd28310c2b2e03b58c818b72934d66443127e8f5 vdr-skinelchi-0.1.1pre2.tgz 61489 +SHA256 8a1a79bde62ad26618a8d9cab19b41b1e65443c1ffa3d919f4a899d1557918b2 vdr-skinelchi-0.1.1pre2.tgz 61489 diff --git a/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff new file mode 100644 index 000000000000..c9330a02c005 --- /dev/null +++ b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff @@ -0,0 +1,138 @@ +Downloaded from http://www.vdr-portal.de/board/thread.php?postid=503036#post503036 + +diff -Nur skinelchi-0.1.1pre2/DisplayChannel.c skinelchi-0.1.1pre2-patched/DisplayChannel.c +--- skinelchi-0.1.1pre2/DisplayChannel.c 2006-02-23 23:14:52.000000000 +0100 ++++ skinelchi-0.1.1pre2-patched/DisplayChannel.c 2006-08-06 14:09:19.000000000 +0200 +@@ -984,6 +984,17 @@ + osd->DrawRectangle(x5, y6, x10 - 1, y9 - 1, Theme.Color(clrChannelEpgTitleBg)); + if (GetEvent->PresentTimeString()) { + osd->DrawText(x1 + 4, y6, GetEvent->PresentTimeString(), Theme.Color(clrChannelEpgTimeFg), cetb, font); ++ ++ if (GetEvent->Recording()) { ++ osd->DrawBitmap(x5 + 2, y6 + (lh - bmRecording.Height())/2, bmRecording, Theme.Color(clrChannelSymbolRecFg), Theme.Color(clrChannelSymbolRecBg)); ++ EventScroll.xOff = x5 + 2 + bmRecording.Width() + 6; ++ EventScroll.DestWidth = x10 - x5 - 2 - bmRecording.Width() - 6; ++ } ++ else { ++ EventScroll.xOff = x5 + 2; ++ EventScroll.DestWidth = x10 - x5 - 2; ++ } ++ + if (EventScroll.SetText(GetEvent->PresentTitle())) { + EventScroll.pos = 0; + EventScroll.dir = -1; +@@ -1239,6 +1250,14 @@ + update = true; + Unlock(); + Wait.Signal(); ++ ++ recording = false; ++ if (present) { ++ int TimerMatch = tmNone; ++ const cTimer * Timer = Timers.GetMatch(present, &TimerMatch); ++ if (Timer) ++ recording = Timer->Recording(); ++ } + } + + bool cGetEvent::Ready(void) { +@@ -1249,6 +1268,14 @@ + return r; + } + ++bool cGetEvent::Recording(void) { ++ bool r; ++ Lock(); ++ r = recording; ++ Unlock(); ++ return r; ++} ++ + void cGetEvent::Drawed(void) { + Lock(); + ready = false; +diff -Nur skinelchi-0.1.1pre2/DisplayChannel.h skinelchi-0.1.1pre2-patched/DisplayChannel.h +--- skinelchi-0.1.1pre2/DisplayChannel.h 2005-11-26 19:08:47.000000000 +0100 ++++ skinelchi-0.1.1pre2-patched/DisplayChannel.h 2006-08-06 14:09:19.000000000 +0200 +@@ -51,7 +51,7 @@ + const char *Followingtitle; + const char *Followingshorttext; + const char *Followingtimestring; +- bool ready, update; ++ bool ready, update, recording; + cCondWait Wait; + public: + cGetEvent(void); +@@ -66,6 +66,7 @@ + const char *FollowingTitle(void); + const char *FollowingShortText(void); + const char *FollowingTimeString(void); ++ bool Recording(void); + }; + + class cSkinElchiDisplayChannel : public cSkinDisplayChannel { +diff -Nur skinelchi-0.1.1pre2/DisplayVolume.c skinelchi-0.1.1pre2-patched/DisplayVolume.c +--- skinelchi-0.1.1pre2/DisplayVolume.c 2005-11-20 19:24:03.000000000 +0100 ++++ skinelchi-0.1.1pre2-patched/DisplayVolume.c 2006-08-06 14:09:19.000000000 +0200 +@@ -58,7 +58,7 @@ + tColor tr = Theme.Color(Transparent); + osd->DrawRectangle(0, lh, osd->Width() - 1, osd->Height() - 1, tr); + char *Prompt; +- asprintf(&Prompt,"%03d", Current); ++ asprintf(&Prompt,"%3d", Current * 100 / Total); + int l = font->Width(Prompt) + lhh; + osd->DrawText(lhh + 3, lh + 1, Prompt, Theme.Color(clrBackground), tr, font); + osd->DrawText(lhh, lh - 2, Prompt, Theme.Color(clrVolumePrompt), tr, font); +diff -Nur skinelchi-0.1.1pre2/Makefile skinelchi-0.1.1pre2-patched/Makefile +--- skinelchi-0.1.1pre2/Makefile 2006-02-25 02:45:30.000000000 +0100 ++++ skinelchi-0.1.1pre2-patched/Makefile 2006-08-06 14:09:19.000000000 +0200 +@@ -29,7 +29,6 @@ + + ### The directory environment: + +-DVBDIR = ../../../../DVB + VDRDIR = ../../.. + LIBDIR = ../../lib + TMPDIR = /tmp +@@ -40,7 +39,7 @@ + + ### The version number of VDR (taken from VDR's "config.h"): + +-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') + + ### The name of the distribution archive: + +@@ -49,7 +48,7 @@ + + ### Includes and Defines (add further entries here): + +-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include ++INCLUDES += -I$(VDRDIR)/include + + DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' + +@@ -107,7 +106,7 @@ + # $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@ + # $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ + $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ +- @cp $@ $(LIBDIR)/$@.$(VDRVERSION) ++ @cp $@ $(LIBDIR)/$@.$(APIVERSION) + + dist: clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) +diff -Nur skinelchi-0.1.1pre2/vdrstatus.c skinelchi-0.1.1pre2-patched/vdrstatus.c +--- skinelchi-0.1.1pre2/vdrstatus.c 2006-01-20 17:11:23.000000000 +0100 ++++ skinelchi-0.1.1pre2-patched/vdrstatus.c 2006-08-06 14:30:03.000000000 +0200 +@@ -180,7 +180,11 @@ + + void cSkinElchiStatus::SetVolume(int Volume, bool Absolute) { + VdrStatus.VolumeChange++; ++#if APIVERSNUM < 010402 + VdrStatus.Volume = Volume;//vdr 1.3.22 -> get volume always absolute ??? ++#else ++ VdrStatus.Volume = Absolute ? Volume : VdrStatus.Volume + Volume; ++#endif + } + + void cSkinElchiStatus::SetAudioTrack(int Index, const char * const *Tracks) { diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r2.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r2.ebuild new file mode 100644 index 000000000000..a557b8e9450c --- /dev/null +++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r2.ebuild,v 1.1 2006/11/16 10:42:42 zzam Exp $ + +inherit vdr-plugin + +MY_P=${P/_pre/pre} + +DESCRIPTION="Video Disk Recorder - Skin Plugin" +HOMEPAGE="http://www.vdrportal.de/board/thread.php?threadid=41915&sid=" +SRC_URI="mirror://gentoo/${MY_P}.tgz http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND=">=media-video/vdr-1.3.22 + imagemagick? ( media-gfx/imagemagick )" + +RDEPEND="x11-themes/vdr-channel-logos" + +S=${WORKDIR}/${MY_P#vdr-} + +VDR_RCADDON_FILE="${FILESDIR}/rc-addon-${PV}-r1.sh" + +PATCHES="${FILESDIR}/${P}-PatchCollection-FireFly.diff" + +src_unpack() { + vdr-plugin_src_unpack + + if use imagemagick; then + einfo "Enabling imagemagick-support." + sed -i ${S}/Makefile -e 's/^#HAVE_IMAGEMAGICK/HAVE_IMAGEMAGICK/' + fi +} + -- 2.26.2