bump; rev 30 is not offiziell released, but is tagged as 0.3.4 in svn

Package-Manager: portage-2.1.10.11/cvs/Linux i686

6 files changed, 312 insertions, 12 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index a3bd0b64ca4e..98d8624096f4 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-graphtft
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.27 2011/04/06 17:08:37 idl0r Exp $
+# 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 $
+
+*vdr-graphtft-0.3.4 (12 Mar 2012)
+
+  12 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-graphtft-0.3.4.ebuild, +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:
+  bump; rev 30 is not offiziell released, but is tagged as 0.3.4 in svn
 
   06 Apr 2011; Christian Ruppert <idl0r@gentoo.org>
   vdr-graphtft-0.2.2-r1.ebuild, vdr-graphtft-0.3.2.24.ebuild:
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 8262630e44c4..37bbce242319 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX confd 1233 RMD160 7b0183644d7ff2f2c0488ec10190e40afc11dab3 SHA1 803cf52c0b13cc2b110f8c8706f8fda15bd532a7 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063
 AUX graphtft-fe 995 RMD160 669a22a7bd3d5d7efdf7468f2f1692d118b77a09 SHA1 722a35ee6c93632d669e789897eaed2b48baec41 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107
@@ -12,21 +12,23 @@ AUX vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff 1510 RMD160 6bf209fc3ecdfbd0e398162b1e
 AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2903 RMD160 c87cb78c744955797231588b49dd883f4a8916b7 SHA1 74add8c610f22cdd91c8521fc26e4e42af4f0b86 SHA256 ef4e8dcecaa103c73b3f50d1e5c2ede2b9306f6dd5c000d84e6d64151c3cc864
 AUX vdr-graphtft-0.3.2.24_gentoo.diff 4754 RMD160 57ecff3f499eabf828fe5187238325b43e165eea SHA1 55dad00159b65690220bd337716b4a6a47ca3412 SHA256 d55e03ebe3a1e50b50178be79746ce6db25afde401f7d94de708715df3bb4d68
 AUX vdr-graphtft-0.3.2.24_makefile.diff 2202 RMD160 9c89b2c4a1a6f1511e8185c9b3e8c771aea294d6 SHA1 a191da00e9a9cea2fb0043e55039e88987ea27f5 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0
+AUX vdr-graphtft-0.3.4_gcc-4.4.x.diff 764 RMD160 b5b9a73d3842519969b6b53b758913e29264daf5 SHA1 4679f1f217c2296070f8d35e9bbad6877b7f9ac8 SHA256 eef74d7d0c866aa22f2755ba850d2b2f5fb6739f7d9d1a09850dedc324948545
+AUX vdr-graphtft-0.3.4_gentoo.diff 4673 RMD160 3446e817f5c38555c46eac0c6103574582249b17 SHA1 103e2bc970f3c2637f36f9d82429b6b3e524c14f SHA256 a4da681ef44faa45cb6a4b5657443dee90a6f0707fd9d263c2062e5ba4f266b0
+AUX vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch 1478 RMD160 451fc490e1f8163d9da96290fa9c954f5b6cf68b SHA1 249d8f6cf86c7a4ef5d171bd7c33a7dfbd5bcb49 SHA256 c3b8d97bfe7497ba73602009640624f2be573f159b913ad238ada0b3aff4a48c
 DIST DeepBlue-horchi-0.0.11.tar.bz2 2016781 RMD160 200ee708ffa091eee849965c7604ce6fc30215d5 SHA1 3296ab697f9a30b3d02840b3837be626f9454cb4 SHA256 c8e34591e9d655b6b0fe00ad8c04db9b01955c9d677d918ee27552368c4a74d7
 DIST vdr-graphtft-0.2.2.tar.bz2 155507 RMD160 daf31f493cc440f2345b7a63a69706b8e844a522 SHA1 a2534ad7ffe285c0757bad114f8e1e3af0ddc72d SHA256 ef68a6dda13ce54ec4d6b528b030dc080eeb009f269d8a282cce2b2bf298dbee
 DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 RMD160 2c767a7bf0cfa76592499953fe22141073e653ac SHA1 cc80e8b86865ec2547ad8103cac03d4ac7840a9b SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7
+DIST vdr-graphtft-0.3.4.tar.gz 176477 RMD160 5dcb4d6890cb6e7262dafc2a44a2b33db926d0e8 SHA1 d05647f1256ec07047507fba15645374c3bde06a SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313
 EBUILD vdr-graphtft-0.2.2-r1.ebuild 2753 RMD160 e270014dd08a6cf5777f0fcaeac1261c8112c3b6 SHA1 3a04328dea8e5e15ccbab275f0441ffd75aff8e6 SHA256 fe38193c49ed617a377112ef97d98fc7471d3a1400203e0801c0affbfd22aa3f
 EBUILD vdr-graphtft-0.3.2.24.ebuild 2383 RMD160 cd7af4a1638b60a81ea5c1504c637de64c60220e SHA1 4dfdd4d1e681fd0cea6b71b1a39304c58ef91dc8 SHA256 68ec5c3af45e9065fe3958051f31a12a410858350dcf8ffb96331b95425590cf
-MISC ChangeLog 6217 RMD160 fdbba23cdbac6900c8546ba89266f5e065fb17c0 SHA1 c632176a744ea8b1f839e9d57bf07898b6a3265b SHA256 b872d75d0f3e81a31a2b9124cf204a25b93a6650eff9f9c48809d4e45ef78f35
+EBUILD vdr-graphtft-0.3.4.ebuild 2386 RMD160 878700d63530e545c6ad65f7aca7de65ebbc17af SHA1 b7218c5ad2936da5e50f7c0716d3fac20c156bd7 SHA256 d268f768be54b84f577d9de426c86caf8cbb7ed9990730b4503b07289ea08145
+MISC ChangeLog 6557 RMD160 b315967cee64a441c4cc985655ed673fbf6cb41a SHA1 51ed2ac0578fece73c73151ee2d8c263ddb36f89 SHA256 263bc46c08dd740c6ff49ff4dd6258cfaaeee70d3fb60822214e8fc981225d5c
 MISC metadata.xml 659 RMD160 3fd53b58573a60e87e1f2d78f0ec7de700121244 SHA1 85ba547e5e7cf18e3554b372b9c5ffa1e94c2002 SHA256 305a976d2549db15f2261c7415fd81a8d06ec93956cd10ed271096c7cf9ad5bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iQEcBAEBCAAGBQJNnJ4bAAoJEMOx0zmdw4Z1uX4H/AgX9IFP7BZf0IfNMkyVft7j
-fnmFtXzjj6Y76AVYY67EnKT09VKFZp56cX5B1C7lRuX48gx5mFHm63foH6/IRnEZ
-ROEXnDFxG4n2MxDyM6o+3bM6/dmXwviQPfwRkmou8yclo/SXmU+a/B6Vm8LYqX30
-opP1dxaF32aurXkao05SGK33z5txFM9NNvTEBp/sHW9rnD81l75JXLuRolV1tZXV
-7B+4XE8Zfwq5zrcchBDxHt5O9i5meAFOORXBQisgo/1ILP7U8G2NMM50u+Kpu/sT
-J4f6CyVih6b/NXFDqsit8JcJn3aFSY0jIjToP8M028/GsqZLm7/cVcEBRjWKU+M=
-=4m2r
+iD8DBQFPXjJvdn07HTTCgIoRAjEVAJ4iisS5jk0ghvCvN3IkmLNKMZtI8gCggFM2
+QdEyHDv7jvx/UvHhyqYWFI8=
+=w6x0
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..4e32c187ac10
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..ea0e7ad3d748
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff
@@ -0,0 +1,139 @@
+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
new file mode 100644
index 000000000000..a2e5a6665e73
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
@@ -0,0 +1,36 @@
+--- 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.4.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
new file mode 100644
index 000000000000..0ea92767ef32
--- /dev/null
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 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.1 2012/03/12 17:22:31 hd_brummy 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")
+
+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
+}