cleanup

(Portage version: 2.1.10.11/cvs/Linux i686)

6 files changed, 8 insertions, 314 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 98d8624096f4..e816aa9b0f1d 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.28 2012/03/12 17:22:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.29 2012/03/12 17:30:52 hd_brummy Exp $
+
+  12 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-graphtft-0.2.2-r1.ebuild, -files/vdr-graphtft-0.2.2-avutil50.patch,
+  -files/vdr-graphtft-0.2.2-gcc44.patch,
+  -files/vdr-graphtft-0.2.2-glibc210.patch,
+  -files/vdr-graphtft-0.2.2_gentoo.diff:
+  cleanup
 
 *vdr-graphtft-0.3.4 (12 Mar 2012)
 
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-avutil50.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-avutil50.patch
deleted file mode 100644
index dfec5ab3aee4..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-avutil50.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c
-===================================================================
---- graphtft-0.2.2.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c
-+++ graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c
-@@ -126,11 +126,11 @@ mpeg_frame mpeg_draw(UINT8* buf)
-    int i;
-    AVPicture avpsrc;
- 
--   avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA32, width, height);
-+   avpicture_fill(&avpsrc, buf, PIX_FMT_RGB32, 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_RGB32, width, height);
- 
- #else
- 
-Index: graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c
-===================================================================
---- graphtft-0.2.2.orig/imlibrenderer/fbrenderer/fbrenderer.c
-+++ graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c
-@@ -192,7 +192,7 @@ int FbRenderer::init(int devnum)
- 
- 	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_RGB32; 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.2.2-gcc44.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-gcc44.patch
deleted file mode 100644
index 69b2536d7d3d..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NrU5 graphtft-0.2.2.original/common.h graphtft-0.2.2/common.h
---- graphtft-0.2.2.original/common.h	2009-06-30 19:47:15.000000000 -0600
-+++ graphtft-0.2.2/common.h	2009-06-30 19:49:28.000000000 -0600
-@@ -15,10 +15,11 @@
- #ifndef ___COMMON_H
- #define ___COMMON_H
- 
- #include <string>
- #include <iconv.h>
-+#include <stdint.h>
- 
- using std::string;
- 
- enum TimeConst
- {
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-glibc210.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-glibc210.patch
deleted file mode 100644
index 231f3989a64e..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-glibc210.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur graphtft-0.2.2.orig/display.c graphtft-0.2.2/display.c
---- graphtft-0.2.2.orig/display.c	2008-11-01 16:20:50.000000000 +0200
-+++ graphtft-0.2.2/display.c	2009-07-24 21:08:35.000000000 +0300
-@@ -141,7 +141,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 --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
deleted file mode 100644
index ccadb2f007b1..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
+++ /dev/null
@@ -1,141 +0,0 @@
-# fix some path for gentoo install ( LFH conform )
-# Joerg Bornkessel <hd_brummy@g.o> 24 Mar 2009
-
-diff -Naur graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c graphtft-0.2.2/dfbrenderer/dfbrenderer.c
---- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c	2009-03-24 23:27:27.000000000 +0100
-+++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c	2009-03-24 23:35:19.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.2.2.orig/dspitems.c graphtft-0.2.2/dspitems.c
---- graphtft-0.2.2.orig/dspitems.c	2009-03-24 23:27:27.000000000 +0100
-+++ graphtft-0.2.2/dspitems.c	2009-03-24 23:31:38.000000000 +0100
-@@ -108,7 +108,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(Thms::theTheme->getDir()) 
-             + "/" + p;
-       }
-diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c
---- graphtft-0.2.2.orig/graphtft.c	2009-03-24 23:27:27.000000000 +0100
-+++ graphtft-0.2.2/graphtft.c	2009-03-24 23:40:20.000000000 +0100
-@@ -21,6 +21,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -261,14 +263,8 @@
- 
- #endif
- 
--   // try to get the config dir
--
--   if (!ConfigDirectory())
--      return false;
--
--   // init 
- 
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -284,7 +280,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!");
- 
-@@ -307,8 +303,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.2.2.orig/imlibrenderer/imlibrenderer.c graphtft-0.2.2/imlibrenderer/imlibrenderer.c
---- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c	2009-03-24 23:27:27.000000000 +0100
-+++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c	2009-03-24 23:36:06.000000000 +0100
-@@ -107,7 +107,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
-@@ -130,7 +130,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);
-@@ -201,7 +201,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
-@@ -273,7 +273,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/vdr-graphtft-0.2.2-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild
deleted file mode 100644
index d1323ad001c3..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,114 +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.2.2-r1.ebuild,v 1.7 2011/04/06 17:08:37 idl0r Exp $
-
-EAPI="2"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2
-		http://www.jwendel.de/vdr/DeepBlue-horchi-0.0.11.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE="directfb graphtft-fe imagemagick"
-
-DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft]
-		media-libs/imlib2[png,jpeg]
-		imagemagick? ( media-gfx/imagemagick[png] )
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( x11-libs/qt-gui:4
-			media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_gentoo.diff"
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-glibc210.patch"
-	"${FILESDIR}/${P}-avutil50.patch" )
-
-extpatch_v_check() {
-
-	EXTPATCH_V="`cat /var/db/pkg/media-video/vdr-*/vdr-*.ebuild | grep EXT_V | head -n 1 | cut -c8-9`"
-
-	if [ "${EXTPATCH_V}" -lt "65" ]; then
-		echo
-		eerror "You need an update of vdr with a newer EXTENSIONSPATCH version!"
-		eerror "minimal version of Extensionspatch = 65!"
-		eerror "graphtft will not work fullfilled"
-		echo
-	fi
-}
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	extpatch_v_check
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	rm -r "${S}"/documents/CVS
-}
-
-src_prepare() {
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	use graphtft-fe && sed -e Makefile \
-		-i "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	vdr-plugin_src_prepare
-
-	sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \
-		-i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \
-		-i "${S}"/imlibrenderer/fbrenderer/mpeg2decoder.c \
-		-i "${S}"/imlibrenderer/fbrenderer/mpeg2decoder.h \
-		-e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:"
-
-	sed -i "${S}"/imlibrenderer/fbrenderer/mpeg2decoder.c \
-		-i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \
-		-e "s:ffmpeg/swscale.h:libswscale/swscale.h:"
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		sed -i build.sh -e "s:qmake-qt4:qmake:"
-		./clean.sh
-		./build.sh || die "build.sh failed"
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/graphTFT/themes/DeepBlue/
-	doins -r "${WORKDIR}"/DeepBlue/*
-
-	dodoc "${S}"/documents/*
-
-	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
-}