cleanup

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

12 files changed, 14 insertions, 784 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 422e3903fd11..12862c45158b 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-plugins/vdr-graphtft
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.36 2013/06/17 20:08:39 scarabeus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.37 2014/01/08 12:46:48 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-graphtft-0.3.2.24.ebuild, -files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff,
+  -files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff,
+  -files/vdr-graphtft-0.3.2.24_gentoo.diff,
+  -files/vdr-graphtft-0.3.2.24_makefile.diff, -vdr-graphtft-0.3.4.ebuild,
+  -files/vdr-graphtft-0.3.4_ffmpeg-1.patch,
+  -files/vdr-graphtft-0.3.4_gcc-4.4.x.diff,
+  -files/vdr-graphtft-0.3.4_gentoo.diff,
+  -files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch,
+  -files/vdr-1.7.27.diff:
+  cleanup
 
   17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> vdr-graphtft-0.3.7.ebuild:
   Include mem.h so we build against libav9. Fixes bug#443228.
diff --git a/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff b/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff
deleted file mode 100644
index 9d8d499b5168..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
---- graphtft-30.orig/dspitems.c	2012-04-07 03:09:26.000000000 +0200
-+++ graphtft-30/dspitems.c	2012-04-07 03:11:03.000000000 +0200
-@@ -397,7 +397,7 @@
-          else if (strcasecmp(var, "Path") == 0)
-             return Str::notNull(recording->FileName());
-          else if (strcasecmp(var, "Time") == 0)
--            return formatDateTime(recording->start, fmt, buf, sizeof(buf));
-+            return formatDateTime(recording->Start(), fmt, buf, sizeof(buf));
-          else if (strcasecmp(var, "EventID") == 0)
-             return Str::toStr(!recording->Info() ? na : (int)recording->Info()->EventID());
-          else if (strcasecmp(var, "SubTitle") == 0)
-diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
---- graphtft-30.orig/graphtft.c	2012-04-07 03:16:05.000000000 +0200
-+++ graphtft-30/graphtft.c	2012-04-07 03:19:52.000000000 +0200
-@@ -311,7 +311,7 @@
-    GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
--   RegisterI18n(Phrases);
-+//   RegisterI18n(Phrases);
- #endif
- 
-    display = new cGraphTFTDisplay(THEMEVERSION);
-diff -Naur graphtft-30.orig/graphtft.h graphtft-30/graphtft.h
---- graphtft-30.orig/graphtft.h	2012-04-07 03:16:05.000000000 +0200
-+++ graphtft-30/graphtft.h	2012-04-07 03:21:04.000000000 +0200
-@@ -16,7 +16,7 @@
- #include <vdr/config.h>
- 
- #if APIVERSNUM < 10507
--#  include "i18n.h"
-+//#  include "i18n.h"
- #  define trNOOP(s) (s)
- #endif
- 
-diff -Naur graphtft-30.orig/Makefile graphtft-30/Makefile
---- graphtft-30.orig/Makefile	2012-04-07 03:16:05.000000000 +0200
-+++ graphtft-30/Makefile	2012-04-07 03:18:44.000000000 +0200
-@@ -240,7 +240,7 @@
- ### The object files (add further files here):
- 
- COMMONOBJS = $(PLUGIN).o dspitems.o display.o \
--	i18n.o setup.o osd.o scan.o theme.o common.o sysinfo.o \
-+	setup.o osd.o scan.o theme.o common.o sysinfo.o \
-    touchthread.o
- 
- # transfer.o
-@@ -311,10 +311,10 @@
- 
- ### Targets:
- 
--all: libvdr-$(PLUGIN).so i18n
-+all: libvdr-$(PLUGIN).so
- 	@cp libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
- 
--alli: libvdr-$(PLUGIN).so i18n
-+alli: libvdr-$(PLUGIN).so
- 
- libvdr-$(PLUGIN).so: $(COMMONOBJS) $(IMLIBOBJS) $(DFBOBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ $(LIBS) -o $@
-diff -Naur graphtft-30.orig/setup.h graphtft-30/setup.h
---- graphtft-30.orig/setup.h	2012-04-07 03:16:05.000000000 +0200
-+++ graphtft-30/setup.h	2012-04-07 03:21:41.000000000 +0200
-@@ -22,7 +22,7 @@
- #include "theme.h"
- 
- #if APIVERSNUM < 10507
--#  include "i18n.h"
-+//#  include "i18n.h"
- #endif
- 
- //***************************************************************************
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff
deleted file mode 100644
index 0f62d20d7f15..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur graphtft-0.2.2.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c
---- graphtft-0.2.2.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c	2008-11-01 10:02:54.000000000 +0200
-+++ graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c	2009-07-24 21:11:58.000000000 +0300
-@@ -126,11 +126,11 @@
-    int i;
-    AVPicture avpsrc;
- 
--   avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA32, width, height);
-+   avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA, width, height);
- 
- #ifndef HAVE_SWSCALE
- 
--   img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGBA32, width, height);
-+   img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGBA, width, height);
- 
- #else
- 
-diff -ur graphtft-0.2.2.orig/imlibrenderer/fbrenderer/fbrenderer.c graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c
---- graphtft-0.2.2.orig/imlibrenderer/fbrenderer/fbrenderer.c	2008-11-01 10:02:05.000000000 +0200
-+++ graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c	2009-07-24 21:11:39.000000000 +0300
-@@ -192,7 +192,7 @@
- 
- 	switch (fb_vinfo.bits_per_pixel) 
-    {
--		case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGBA32; break;
-+		case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGBA; break;
- 		case 24: tell(4, "fbdevout.c: using 24 bit depth"); fb_type = PIX_FMT_RGB24;  break;
- 		case 16: tell(4, "fbdevout.c: using 16 bit depth"); fb_type = PIX_FMT_RGB565; break;
- 		default: tell(4, "fbdevout.c: color depth not supported -> %i bits per pixel",
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff
deleted file mode 100644
index da23096138fe..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-based on patch
-http://www.vdr-portal.de/board/thread.php?postid=846248#post846248H
-Joerg Bornkessel <hd_brummy@g.o> 22 Aug 2009
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/common.h vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/common.h
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/common.h	2008-12-17 22:56:39.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/common.h	2009-10-06 18:39:53.574720223 +0200
-@@ -17,6 +17,7 @@
- 
- #include <string>
- #include <iconv.h>
-+#include <stdint.h>
- 
- using std::string;
- 
-
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/display.c vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/display.c
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/display.c	2009-02-15 16:06:59.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/display.c	2009-10-06 18:39:53.578713784 +0200
-@@ -158,7 +158,7 @@
- 
- int cGraphTFTDisplay::Init(const char* dev, const char* cfgDir, int port)
- {
--   char* pos = 0;
-+   const char* pos = 0;
-    int devnum = na;
- 
- #ifdef HAVE_DFB
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/scan.h vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/scan.h
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/scan.h	2008-12-17 22:56:39.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/scan.h	2009-10-06 18:39:53.578713784 +0200
-@@ -12,6 +12,7 @@
- // Includes
- //***************************************************************************
- 
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- 
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/theme.c
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c	2009-02-15 16:06:59.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/theme.c	2009-10-06 18:39:53.578713784 +0200
-@@ -112,7 +112,7 @@
-    {
-       s++;
- 
--      if (!(e = strchr(s, '}')))
-+      if (!(e = (char *)strchr(s, '}')))
-       {
-          tell(0, "Parsing of [%s] failed, missing bracket '}'", expression);
-          return fail;
-diff -Naur graphtft-24.orig/graphtft-fe/common.cc graphtft-24/graphtft-fe/common.cc
---- graphtft-24.orig/graphtft-fe/common.cc	2009-10-23 15:10:20.000000000 +0200
-+++ graphtft-24/graphtft-fe/common.cc	2009-10-23 15:11:11.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #include <graphtft.hpp>
- 
-diff -Naur graphtft-24.orig/graphtft-fe/graphtft.hpp graphtft-24/graphtft-fe/graphtft.hpp
---- graphtft-24.orig/graphtft-fe/graphtft.hpp	2009-10-23 15:10:20.000000000 +0200
-+++ graphtft-24/graphtft-fe/graphtft.hpp	2009-10-23 15:11:36.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <X11/Xlib.h>
- #include <Imlib2.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #define __FRONTEND
- #include <../common.h>
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gentoo.diff
deleted file mode 100644
index 9665affdb83e..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gentoo.diff
+++ /dev/null
@@ -1,141 +0,0 @@
-addapted to gentoo vdr path
-Joerg Bornkessel <hd_brummy@g.o> 22 Aug 2009
-diff -Naur graphtft-0.3.1.orig/dfbrenderer/dfbrenderer.c graphtft-0.3.1/dfbrenderer/dfbrenderer.c
---- graphtft-0.3.1.orig/dfbrenderer/dfbrenderer.c	2009-03-23 19:46:26.000000000 +0100
-+++ graphtft-0.3.1/dfbrenderer/dfbrenderer.c	2009-03-23 19:49:09.000000000 +0100
-@@ -231,7 +231,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -255,7 +255,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    fontPaths[count] = path;
-    free(path);
-@@ -464,7 +464,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s\n", fpath);
-@@ -538,7 +538,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s\n", fpath);
-diff -Naur graphtft-0.3.1.orig/dspitems.c graphtft-0.3.1/dspitems.c
---- graphtft-0.3.1.orig/dspitems.c	2009-03-23 19:46:26.000000000 +0100
-+++ graphtft-0.3.1/dspitems.c	2009-03-23 19:49:56.000000000 +0100
-@@ -113,7 +113,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(Thms::theTheme->getDir()) 
-             + "/" + p;
-       }
-diff -Naur graphtft-0.3.1.orig/graphtft.c graphtft-0.3.1/graphtft.c
---- graphtft-0.3.1.orig/graphtft.c	2009-03-23 19:46:26.000000000 +0100
-+++ graphtft-0.3.1/graphtft.c	2009-03-23 19:54:23.000000000 +0100
-@@ -22,6 +22,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -296,15 +298,9 @@
- 
- #endif
- 
--   // try to get the config dir
--
--   if (!ConfigDirectory())
--      return false;
--
--   // init 
- 
-    GraphTFTSetup.setClient(this);
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -320,7 +316,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   if (display->Init(_dev, ConfigDirectory(), port) != success)
-+   if (display->Init(_dev, DATA_DIR, port) != success)
-    {
-       tell(0, "Error: Initializing graphTFT device faild, aborting!");
- 
-@@ -353,8 +349,8 @@
- 
-    // look for the themes in the config directory
- 
--   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
--            ConfigDirectory());
-+   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
-+            DATA_DIR);
- 
-    p = popen(buffer, "r");
- 
-diff -Naur graphtft-0.3.1.orig/imlibrenderer/imlibrenderer.c graphtft-0.3.1/imlibrenderer/imlibrenderer.c
---- graphtft-0.3.1.orig/imlibrenderer/imlibrenderer.c	2009-03-23 19:46:26.000000000 +0100
-+++ graphtft-0.3.1/imlibrenderer/imlibrenderer.c	2009-03-23 19:55:19.000000000 +0100
-@@ -123,7 +123,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -146,7 +146,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    imlib_add_path_to_font_path(path);
-    free(path);
-@@ -217,7 +217,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
-@@ -289,7 +289,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff
deleted file mode 100644
index f638be630069..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009
-Matthias Schwarzott <zzam@g.o> 23 Okt 2009
-diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile
---- graphtft-24.orig/Makefile	2009-10-21 21:53:56.000000000 +0200
-+++ graphtft-24/Makefile	2009-10-21 21:57:24.000000000 +0200
-@@ -158,10 +158,10 @@
- DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
- ifdef HAVE_IMLIB
--  LIBS += `imlib2-config --libs`
-+  LIBS += $(shell imlib2-config --libs)
- 
-   ifdef HAVE_IMAGE_MAGICK
--    LIBS += `Magick++-config --libs`
-+    LIBS += $(shell Magick++-config --libs)
-     DEFINES += -DHAVE_IMAGE_MAGICK
-   endif
- 
-@@ -170,8 +170,8 @@
- endif
- 
- ifdef HAVE_GTOP
--  GTOP_INC = `pkg-config libgtop-2.0 --cflags`
--  GTOP_LIB = `pkg-config libgtop-2.0 --libs`
-+  GTOP_INC = $(shell pkg-config libgtop-2.0 --cflags)
-+  GTOP_LIB = $(shell pkg-config libgtop-2.0 --libs)
- 
-   DEFINES += -DWITH_SYSINFO
-   LIBS += $(GTOP_LIB)
-@@ -186,8 +186,8 @@
- endif
- 
- ifdef HAVE_DFB
--  INCLUDES += `directfb-config --cflags`
--  LIBS += `directfb-config --libs`
-+  INCLUDES += $(shell directfb-config --cflags)
-+  LIBS += $(shell directfb-config --libs)
-   DEFINES += -DHAVE_DFB
- endif
- 
-diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
---- graphtft-24.orig/graphtft-fe/Makefile	2009-10-22 17:39:55.000000000 +0200
-+++ graphtft-24/graphtft-fe/Makefile	2009-10-22 17:41:29.000000000 +0200
-@@ -1,9 +1,9 @@
- 
- CXX           = g++
- CXXFLAGS      = -pipe -ggdb -O2 -Wall -W -D_REENTRANT -fPIC
--INCPATH       = -I. `Magick++-config --cppflags`
-+INCPATH       = -I. $(shell Magick++-config --cppflags)
- LFLAGS        = -Wl,--no-undefined
--LIBS          = -lpthread `imlib2-config --libs` `Magick++-config --libs`
-+LIBS          = -lpthread $(shell imlib2-config --libs) $(shell Magick++-config --libs)
- AR            = ar
- 
- TARGET = graphtft-fe
-diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
---- graphtft-24.orig/graphtft-fe/Makefile	2009-10-23 16:20:43.000000000 +0200
-+++ graphtft-24/graphtft-fe/Makefile	2009-10-23 16:21:20.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- all: 
- 	echo Build graphTFT Frontend
--	@(make $(TARGET))
-+	@$(MAKE) $(TARGET)
- 
- 
- $(TARGET): $(OBJECTS)
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_ffmpeg-1.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_ffmpeg-1.patch
deleted file mode 100644
index 76de1ad5fd6e..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_ffmpeg-1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: graphtft-30/imlibrenderer/dvbrenderer/mpeg2encoder.c
-===================================================================
---- graphtft-30.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c
-+++ graphtft-30/imlibrenderer/dvbrenderer/mpeg2encoder.c
-@@ -51,7 +51,6 @@ void mpeg_init(int video_width, int vide
-    int i = 0;
-    int status;
- 
--   avcodec_init();
-    avcodec_register_all();
-     
-    codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO);
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff
deleted file mode 100644
index 4e32c187ac10..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc
---- graphtft-30.orig/graphtft-fe/common.cc	2012-03-12 02:10:38.000000000 +0100
-+++ graphtft-30/graphtft-fe/common.cc	2012-03-12 02:30:16.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #include <graphtft.hpp>
- 
-diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp
---- graphtft-30.orig/graphtft-fe/graphtft.hpp	2012-03-12 02:10:38.000000000 +0100
-+++ graphtft-30/graphtft-fe/graphtft.hpp	2012-03-12 02:30:57.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <X11/Xlib.h>
- #include <Imlib2.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #define __FRONTEND
- #include <../common.h>
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff
deleted file mode 100644
index ea0e7ad3d748..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c
---- graphtft-30.orig/dfbrenderer/dfbrenderer.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/dfbrenderer/dfbrenderer.c	2012-03-12 03:29:35.000000000 +0100
-@@ -257,7 +257,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -281,7 +281,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    fontPaths[count] = path;
-    free(path);
-@@ -483,7 +483,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s", fpath);
-@@ -561,7 +561,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s", fpath);
-diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
---- graphtft-30.orig/dspitems.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/dspitems.c	2012-03-12 03:30:16.000000000 +0100
-@@ -107,7 +107,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(Thms::theTheme->getDir()) 
-             + "/" + p;
-       }
-diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
---- graphtft-30.orig/graphtft.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/graphtft.c	2012-03-12 03:32:48.000000000 +0100
-@@ -22,6 +22,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -300,13 +302,13 @@
- 
-    // try to get the config dir
- 
--   if (!ConfigDirectory())
--      return false;
-+//   if (!ConfigDirectory())
-+//      return false;
- 
-    // init 
- 
-    GraphTFTSetup.setClient(this);
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -322,7 +324,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   if (display->Init(_dev, ConfigDirectory(), port) != success)
-+   if (display->Init(_dev, DATA_DIR, port) != success)
-    {
-       tell(0, "Error: Initializing graphTFT device faild, aborting!");
- 
-@@ -355,8 +357,8 @@
- 
-    // look for the themes in the config directory
- 
--   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
--            ConfigDirectory());
-+   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
-+            DATA_DIR);
- 
-    p = popen(buffer, "r");
- 
-diff -Naur graphtft-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c
---- graphtft-30.orig/imlibrenderer/imlibrenderer.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/imlibrenderer/imlibrenderer.c	2012-03-12 03:33:54.000000000 +0100
-@@ -123,7 +123,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -146,7 +146,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    imlib_add_path_to_font_path(path);
-    free(path);
-@@ -217,7 +217,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
-@@ -291,7 +291,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
deleted file mode 100644
index a2e5a6665e73..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- graphtft-0.3.4/display.c.orig	2011-10-18 10:55:14.000000000 +0200
-+++ graphtft-0.3.4/display.c	2012-03-11 11:52:32.545415663 +0100
-@@ -931,12 +931,15 @@
- // Osd Channel Switch
- //***************************************************************************
- 
--void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber) 
--{
-+#if VDRVERSNUM >= 10726
-+void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber, bool LiveView) {
-+#else
-+void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber) {
-+    bool LiveView = Device && Device->IsPrimaryDevice() && !EITScanner.UsesDevice(Device);
-+#endif
-    tell(5, "ChannelSwitch on %p: %d", Device, ChannelNumber);
- 
--   if (Device->IsPrimaryDevice() 
--       && !EITScanner.UsesDevice(Device) 
-+   if (LiveView 
-        && _channel != ChannelNumber 
-        && cDevice::CurrentChannel() != _channel) 
-    {
---- graphtft-0.3.4/display.h.orig	2011-10-18 10:55:14.000000000 +0200
-+++ graphtft-0.3.4/display.h	2012-03-11 11:57:28.705392921 +0100
-@@ -348,7 +348,11 @@
- 
-       // status interface
- 
-+#if VDRVERSNUM >= 10726
-+      virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber, bool LiveView);
-+#else
-       virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber);
-+#endif
-       virtual void OsdSetEvent(const cEvent* event);
-       virtual void OsdSetRecording(const cRecording* recording);
-       virtual void OsdChannel(const char* Text);
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild
deleted file mode 100644
index 78e24d52208a..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild,v 1.8 2011/04/06 17:08:37 idl0r Exp $
-
-EAPI="3"
-
-RESTRICT="test"
-
-inherit eutils vdr-plugin flag-o-matic
-
-S="${WORKDIR}/graphtft-24"
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
-IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
-
-DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft]
-		media-libs/imlib2[png,jpeg]
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
-		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
-		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
-		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
-
-PATCHES=("${FILESDIR}/${P}_gentoo.diff"
-		"${FILESDIR}/${P}_makefile.diff"
-		"${FILESDIR}/${P}_gcc-4.4.x.diff"
-		"${FILESDIR}/${P}_ffmpeg-0.5.diff")
-
-src_prepare() {
-
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	! use touchscreen && sed -i Makefile -e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	vdr-plugin_src_prepare
-
-	sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \
-		-i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \
-		-e "s:libavutil/avcodec.h:libavcodec/avcodec.h:"
-
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		emake
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	if use graphtft-fe; then
-		echo
-		elog "Graphtft-fe user:"
-		elog "Edit /etc/conf.d/vdr.graphtft"
-		elog "/etc/init.d/graphtft-fe start"
-		echo
-	fi
-}
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
deleted file mode 100644
index 42446cd4337e..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild,v 1.3 2013/01/24 13:05:14 aballier Exp $
-
-EAPI="4"
-
-RESTRICT="test"
-
-inherit eutils vdr-plugin flag-o-matic
-
-S="${WORKDIR}/graphtft-30"
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
-IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
-
-DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft]
-		media-libs/imlib2[png,jpeg]
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
-		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
-		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
-		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
-
-PATCHES=("${FILESDIR}/${P}_gentoo.diff"
-		"${FILESDIR}/${PN}-0.3.2.24_makefile.diff"
-		"${FILESDIR}/${P}_gcc-4.4.x.diff"
-		"${FILESDIR}/${P}_vdr-1.7.26_ChannelSwitch.patch"
-		"${FILESDIR}/${P}_ffmpeg-1.patch")
-
-src_prepare() {
-
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	! use touchscreen && sed -i Makefile -e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	vdr-plugin_src_prepare
-
-	sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \
-		-i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \
-		-e "s:libavutil/avcodec.h:libavcodec/avcodec.h:"
-
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-
-	if has_version ">=media-video/vdr-1.7.27"; then
-		epatch "${FILESDIR}/vdr-1.7.27.diff"
-	fi
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		emake
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	if use graphtft-fe; then
-		echo
-		elog "Graphtft-fe user:"
-		elog "Edit /etc/conf.d/vdr.graphtft"
-		elog "/etc/init.d/graphtft-fe start"
-		echo
-	fi
-}