cleanup, fixed not found logo DIR

(Portage version: 2.1.6.13/cvs/Linux i686)

7 files changed, 16 insertions, 275 deletions

diff --git a/media-plugins/vdr-skinelchi/ChangeLog b/media-plugins/vdr-skinelchi/ChangeLog
index 8a67921b5c68..e3f6b7eede02 100644
--- a/media-plugins/vdr-skinelchi/ChangeLog
+++ b/media-plugins/vdr-skinelchi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-skinelchi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/ChangeLog,v 1.23 2009/07/26 21:14:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/ChangeLog,v 1.24 2009/10/20 18:31:35 hd_brummy Exp $
+
+*vdr-skinelchi-0.2.1-r1 (20 Oct 2009)
+
+  20 Oct 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-skinelchi-0.1.1_pre2-r1.ebuild, -vdr-skinelchi-0.1.1_pre2-r2.ebuild,
+  -vdr-skinelchi-0.1.1_pre2-r3.ebuild,
+  -files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff,
+  -vdr-skinelchi-0.2.1.ebuild, +vdr-skinelchi-0.2.1-r1.ebuild,
+  -files/compile-fix.diff:
+  cleanup, fixed not found logo DIR
 
 *vdr-skinelchi-0.2.1 (26 Jul 2009)
 
diff --git a/media-plugins/vdr-skinelchi/files/compile-fix.diff b/media-plugins/vdr-skinelchi/files/compile-fix.diff
deleted file mode 100644
index 424752a9c006..000000000000
--- a/media-plugins/vdr-skinelchi/files/compile-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur skinelchi-0.1.1pre2.orig/DisplayChannel.c skinelchi-0.1.1pre2/DisplayChannel.c
---- skinelchi-0.1.1pre2.orig/DisplayChannel.c	2008-03-25 23:13:26.037309537 +0100
-+++ skinelchi-0.1.1pre2/DisplayChannel.c	2008-03-25 23:25:04.984510602 +0100
-@@ -1347,7 +1347,7 @@
- 		presentshorttext = strdup(present->ShortText());
- 	    else
- 		presentshorttext = "";
--	    if (present->GetTimeString())
-+	    if ((const char*)present->GetTimeString())
- 		presenttimestring = strdup(present->GetTimeString());
- 	    else
- 		presenttimestring = "";
-@@ -1363,7 +1363,7 @@
- 	    	followingshorttext = strdup(following->ShortText());
- 	    else
- 		followingshorttext = "";
--	    if (following->GetTimeString())
-+	    if ((const char*)following->GetTimeString())
- 		followingtimestring = strdup(following->GetTimeString());
- 	    else
- 		followingtimestring = "";
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
deleted file mode 100644
index c9330a02c005..000000000000
--- a/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-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-r1.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r1.ebuild
deleted file mode 100644
index b1f690a63cb7..000000000000
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.5 2008/12/17 16:45:55 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"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if use imagemagick; then
-		elog "Enabling imagemagick-support."
-		sed -i "${S}"/Makefile -e 's/^#HAVE_IMAGEMAGICK/HAVE_IMAGEMAGICK/'
-	fi
-}
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
deleted file mode 100644
index 890ee6f92d55..000000000000
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 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.5 2008/12/17 16:45:55 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"
-
-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
-		elog "Enabling imagemagick-support."
-		sed -i "${S}"/Makefile -e 's/^#HAVE_IMAGEMAGICK/HAVE_IMAGEMAGICK/'
-	fi
-}
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r3.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r3.ebuild
deleted file mode 100644
index b428c1e51733..000000000000
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 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-r3.ebuild,v 1.8 2009/03/12 20:50:45 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
-	mirror://gentoo/${P}-vdr-1.5.5-getfont.diff.bz2"
-
-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"
-	"${WORKDIR}/${P}-vdr-1.5.5-getfont.diff"
-	"${FILESDIR}/compile-fix.diff")
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if use imagemagick; then
-		elog "Enabling imagemagick-support."
-		sed -i "${S}"/Makefile -e 's/^#HAVE_IMAGEMAGICK/HAVE_IMAGEMAGICK/'
-	fi
-
-	sed -i DisplayMenu.h -e "s:uint64:uint64_t:"
-
-	#fix compile warnings , gcc-1.4.x
-	sed -i symbols/*.xpm -e "s:static char:static const char:"
-}
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.1.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.1-r1.ebuild
index 572d26f3f37c..e57c201e06ef 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.1.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.2.1.ebuild,v 1.1 2009/07/26 21:14:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.1-r1.ebuild,v 1.1 2009/10/20 18:31:35 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -32,4 +32,8 @@ src_unpack() {
 		sed -i "${S}"/Makefile \
 			-e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
 	fi
+
+	sed -i "${S}"/DisplayChannel.c \
+		-e "s:/hqlogos::" \
+		-e "s:/logos::"
 }