removed dead vdr-subtitles dir

5 files changed, 217 insertions, 13 deletions

diff --git a/media-plugins/vdr-skinelchi/ChangeLog b/media-plugins/vdr-skinelchi/ChangeLog
index e3f6b7eede02..922d79cc224b 100644
--- a/media-plugins/vdr-skinelchi/ChangeLog
+++ b/media-plugins/vdr-skinelchi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2009/10/20 18:31:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/ChangeLog,v 1.25 2010/12/01 18:29:21 hd_brummy Exp $
+
+  20 Oct 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-skinelchi-0.1.1_pre2-r3.ebuild,
+  +files/vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff,
+  +files/compile-fix.diff:
+  readded last x86 stable
 
 *vdr-skinelchi-0.2.1-r1 (20 Oct 2009)
 
diff --git a/media-plugins/vdr-skinelchi/Manifest b/media-plugins/vdr-skinelchi/Manifest
index 00da3dcc23ca..556ecd4c805e 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX compile-fix.diff 851 RMD160 0a3f3b505bb5cfaeb6bfc73e1d8b1a1f9459703f SHA1 1bf19020672434a569853a4bb8508efb08de5ad9 SHA256 3b325b2f14879cbccdf633a228dc8f85bdbb0fee7743c580ddd6d3153c9ffab2
 AUX rc-addon-0.1.1_pre2-r1.sh 647 RMD160 4748df1afb928c7a0384a80aad80ca543b9e6ddb SHA1 8a08cb011826f21c0b2bff8f8915ee8cd2889e74 SHA256 e08f0f84bf4863a360f37f5a46503c47ed4aead3b2ee842b08fee80196e71865
+AUX vdr-skinelchi-0.1.1_pre2-PatchCollection-FireFly.diff 5002 RMD160 a5dac8ec644c392e991afd09fcfba2c96c40ae90 SHA1 9436ce12d0782099683054fb81e784651d01d4ef SHA256 a8c779824e774c61e9838a4be40ad6e770668ceefbdefe507686d3bcc93919ec
+DIST vdr-skinelchi-0.1.1_pre2-vdr-1.5.5-getfont.diff.bz2 3568 RMD160 877cbdbd0cc15dfd20f1c317bd0bbd482bd3ae09 SHA1 13789f62e7d5bcff55e79bcf286ccbe7607fd76f SHA256 91f2502486b6ca6b59876143bda736f10d2e7f25a7e4f88cd820fdbddd63242e
+DIST vdr-skinelchi-0.1.1pre2.tgz 61489 RMD160 fd28310c2b2e03b58c818b72934d66443127e8f5 SHA1 80ce3b2e00e1c03f1ce674924c98290b2385c9d3 SHA256 8a1a79bde62ad26618a8d9cab19b41b1e65443c1ffa3d919f4a899d1557918b2
 DIST vdr-skinelchi-0.2.1.tar.bz2 61194 RMD160 89b7ba0dfcb79632818b03ad817adb17c849d72c SHA1 ccdb458b234d5dc9b4cd3096b1f1d4256e0fa360 SHA256 8b5f3ef1013e56b37981333965cb03d44f5442297912e993963ece8f50234b95
+EBUILD vdr-skinelchi-0.1.1_pre2-r3.ebuild 1213 RMD160 8e2acd8b747b7c0c3cb87d52d0aacdd7fb67843f SHA1 9f5cb86ebbda494bb49b567ed9c7cb37f5a6c849 SHA256 312db14e22b956c686f8878e88f385cd95cde9d3dd56e83fb0c1a2d57bd167b4
 EBUILD vdr-skinelchi-0.2.1-r1.ebuild 997 RMD160 d8fa2cd2891ff8c5c4ce776ca12e1d76980980ee SHA1 05fba38c23662043102ce8841380865d74a01aa2 SHA256 33a72b389f37c002b3eaba47f55aa8be02c257a7fa318301cc901c8f0d46b3db
-MISC ChangeLog 4557 RMD160 5405d0f0ecbf2597e9b4d5fa38456365704ec6d8 SHA1 ee6a9f6b01c85913ff593f07e810e66afba6df16 SHA256 76cc9e78ab8b5110e8498429892156374acfd5151dd982e3c4c9de425d14b8d8
+MISC ChangeLog 4769 RMD160 3a83e0a61d996021f7ea3898904f41db935ccc54 SHA1 c0a930672018b6e8cda8a4616edbe6bbcc1ff50d SHA256 b784f1124ced3ef0e0a5d29d12b4526b71b122e17a50c28b981a40d6710fe977
 MISC metadata.xml 335 RMD160 eb5fcf03c21510453d995cce8ee8f8a6324e6545 SHA1 e8105cf5fdbf0be508311933b8e34db224e9bc51 SHA256 f8790d655b9660f52dfddc7d5785248a334bae37ef607c6b87f50ed597e76573
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFK3gImdn07HTTCgIoRApQTAKChrATZr3V/qyMx/NAeKzVP+fGyCQCgj+yg
-2wnrQL3SR25aqyfbte5q00A=
-=zxcM
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-skinelchi/files/compile-fix.diff b/media-plugins/vdr-skinelchi/files/compile-fix.diff
new file mode 100644
index 000000000000..424752a9c006
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/files/compile-fix.diff
@@ -0,0 +1,21 @@
+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
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-r3.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r3.ebuild
new file mode 100644
index 000000000000..0f3bea474503
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.1.1_pre2-r3.ebuild
@@ -0,0 +1,45 @@
+# 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.10 2010/12/01 18:29:21 hd_brummy 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:"
+}
+