summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2010-12-30 18:57:41 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2010-12-30 18:57:41 +0000
commit2c5faa75ff6f6aac61f64850c4a2257bd55f5afa (patch)
tree6b24633fc740cafe811d0751390795a1afa1d96f /media-plugins
parentRespect LDFLAGS (bug #337865), CC. Reword postinst message. (diff)
downloadgentoo-2-2c5faa75ff6f6aac61f64850c4a2257bd55f5afa.tar.gz
gentoo-2-2c5faa75ff6f6aac61f64850c4a2257bd55f5afa.tar.bz2
gentoo-2-2c5faa75ff6f6aac61f64850c4a2257bd55f5afa.zip
version bump; cleanup
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-text2skin/ChangeLog17
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff44
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/02_uint64.diff22
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff13
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff15
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff66
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff94
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff12
-rw-r--r--media-plugins/vdr-text2skin/files/20070506/series7
-rw-r--r--media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff13
-rw-r--r--media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff15
-rw-r--r--media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff94
-rw-r--r--media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff12
-rw-r--r--media-plugins/vdr-text2skin/files/20070906/08_cache.diff12
-rw-r--r--media-plugins/vdr-text2skin/metadata.xml4
-rw-r--r--media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild66
-rw-r--r--media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild69
-rw-r--r--media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild55
18 files changed, 73 insertions, 557 deletions
diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index 9e116bc05854..fcf20e44e648 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,21 @@
# ChangeLog for media-plugins/vdr-text2skin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.8 2010/03/14 14:18:32 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.9 2010/12/30 18:57:40 hd_brummy Exp $
+
+*vdr-text2skin-1.3.1 (30 Dec 2010)
+
+ 30 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+ -files/20070506/06_vdr-1.5.7.diff, -files/20070906/04_no_direct_blit.diff,
+ -vdr-text2skin-1.0.20070506.ebuild, -files/20070506/01_gcc-4.diff,
+ -files/20070506/02_uint64.diff, -files/20070506/03_gentoo.diff,
+ -files/20070506/04_no_direct_blit.diff,
+ -files/20070506/07_pkgconfig_magick.diff,
+ -files/20070906/07_pkgconfig_magick.diff,
+ -vdr-text2skin-1.0.20070906.ebuild, +vdr-text2skin-1.3.1.ebuild,
+ -files/20070506/05_vdr-1.5.4.diff, -files/20070506/series,
+ -files/20070906/06_vdr-1.5.7.diff, -files/20070906/03_gentoo.diff,
+ -files/20070906/08_cache.diff, metadata.xml:
+ version bump; cleanup
14 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
vdr-text2skin-1.3.ebuild:
diff --git a/media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff b/media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff
deleted file mode 100644
index 6bade6cc1570..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/object.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/xml/object.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/object.h
-@@ -55,7 +55,7 @@ public:
- uint Type(void) const { return mRefreshType; }
- bool Parse(const std::string &Text);
- bool ParseChanged(const std::string &Text);
-- cxRefresh &cxRefresh::operator=(const cxRefresh &b);
-+ cxRefresh &operator=(const cxRefresh &b);
-
- private:
- uint mRefreshType;
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/skin.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/xml/skin.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/skin.h
-@@ -28,21 +28,21 @@ public:
- bool Limit( int ma, int min ) const {
- return mMajor < ma ? true : (mMajor == ma ? mMinor <= min : false);
- }
-- bool cxVersion::operator==( const cxVersion &v ) const {
-+ bool operator==( const cxVersion &v ) const {
- return mMajor == v.mMajor && mMinor == v.mMinor;
- }
-- bool cxVersion::operator>=( const cxVersion &v ) const {
-+ bool operator>=( const cxVersion &v ) const {
- return Require( v.mMajor , v.mMinor);
- }
-- bool cxVersion::operator>=( const char *c ) const {
-+ bool operator>=( const char *c ) const {
- cxVersion v;
- if( !v.Parse(c) ) return false;
- return Require( v.mMajor , v.mMinor);
- }
-- bool cxVersion::operator<=( const cxVersion &v ) const {
-+ bool operator<=( const cxVersion &v ) const {
- return Limit( v.mMajor , v.mMinor );
- }
-- bool cxVersion::operator<=( const char *c ) const {
-+ bool operator<=( const char *c ) const {
- cxVersion v;
- if( !v.Parse(c) ) return false;
- return Limit( v.mMajor , v.mMinor);
diff --git a/media-plugins/vdr-text2skin/files/20070506/02_uint64.diff b/media-plugins/vdr-text2skin/files/20070506/02_uint64.diff
deleted file mode 100644
index 4b2da8cf6e40..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/02_uint64.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/common.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/common.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/common.h
-@@ -17,7 +17,7 @@
- # else
- # define Dprintf(x...)
- # endif
--# define Dbench(x) uint64 bench_##x = time_ms()
-+# define Dbench(x) uint64_t bench_##x = time_ms()
- # define Ddiff(t,x) fprintf(stderr, "%s took %llu ms\n", t, time_ms() - bench_##x)
- #else
- # define Dprintf(x...)
-@@ -25,7 +25,7 @@
- # define Ddiff(t,x)
- #endif
-
--#define DStartBench(x) uint64 bench_##x = time_ms()
-+#define DStartBench(x) uint64_t bench_##x = time_ms()
- #define DShowBench(t,x) fprintf(stderr, "%s took %llu ms\n", t, time_ms() - bench_##x)
-
- #if VDRVERSNUM >= 10318
diff --git a/media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff b/media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff
deleted file mode 100644
index f9cb59dce81b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/common.c
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/common.c
-+++ text2skin-1.1-cvs_ext-0.10/common.c
-@@ -15,7 +15,7 @@
- const std::string &SkinPath(void)
- {
- // should never change
-- static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
-+ static std::string path = "/usr/share/vdr/" PLUGIN_NAME_I18N;
- return path;
- }
-
diff --git a/media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff b/media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff
deleted file mode 100644
index 6a3ccec1dfe3..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/screen.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-@@ -8,8 +8,8 @@
- #include "common.h"
- #include <vdr/osd.h>
-
--// #undef DIRECTBLIT
--#define DIRECTBLIT
-+#undef DIRECTBLIT
-+// #define DIRECTBLIT
-
- class cText2SkinScreen {
- /* Skin Editor */
diff --git a/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff b/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff
deleted file mode 100644
index 8269ca01701a..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/graphtft/font.c
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/graphtft/font.c
-+++ text2skin-1.1-cvs_ext-0.10/graphtft/font.c
-@@ -38,6 +38,15 @@ cGraphtftFont::~cGraphtftFont()
-
- bool cGraphtftFont::Load(string Filename, string CacheName, int Size, int Language, int Width, int format)
- {
-+#if VDRVERSNUM >= 10507
-+ if ( _cache.find(CacheName) != _cache.end() )
-+ return true;
-+ cFont* newFont = cFont::CreateFont(Filename.c_str(), Size);
-+ if ( newFont == NULL )
-+ return false;
-+ _cache[CacheName] = newFont;
-+ return true;
-+#else
- if ( _cache.find(CacheName) != _cache.end() )
- return true;
-
-@@ -187,6 +196,7 @@ bool cGraphtftFont::Load(string Filename
- delete(font_data);
- // Something went wrong!
- return false;
-+#endif
- }
-
- const cFont* cGraphtftFont::GetFont(string CacheName){
-@@ -209,11 +219,13 @@ void cGraphtftFont::Clear()
- for (; it != _cache.end(); ++it)
- delete((*it).second);
- _cache.clear();
-+#if VDRVERSNUM < 10507
-
- del_map::iterator del_it = _del.begin();
- for (; del_it != _del.end(); ++del_it)
- delete((*del_it).second);
- _del.clear();
-+#endif
- }
-
- cGraphtftFont GraphtftFont;
-Index: text2skin-1.1-cvs_ext-0.10/graphtft/font.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/graphtft/font.h
-+++ text2skin-1.1-cvs_ext-0.10/graphtft/font.h
-@@ -24,7 +24,9 @@ class cGraphtftFont
- {
- private:
- typedef map<string,cFont*> cache_map;
-+#if VDRVERSNUM < 10507
- typedef map<string,cFont::tPixelData*> del_map;
-+#endif
-
- public:
- cGraphtftFont();
-@@ -40,7 +42,9 @@ private:
- FT_Face _face;
- FT_GlyphSlot _slot;
- cache_map _cache;
-+#if VDRVERSNUM < 10507
- del_map _del;
-+#endif
-
- };
-
diff --git a/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff b/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff
deleted file mode 100644
index 7728fa337915..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig 2007-08-13 08:54:41.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c 2007-08-13 09:17:43.000000000 -0700
-@@ -31,8 +31,13 @@
- const cFont *res = NULL;
- #ifdef HAVE_FREETYPE
- char *cachename;
-+#if VDRVERSNUM >= 10507
-+ asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
-+ if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
-+#else
- asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
- if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
-+#endif
- res = mFontCache.GetFont(cachename);
- else
- esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
---- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig 2007-08-13 07:34:10.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c 2007-08-13 08:53:31.000000000 -0700
-@@ -491,7 +491,11 @@
-
- cText2SkinI18n::~cText2SkinI18n() {
- for (int i = 0; mPhrases[i][0]; ++i) {
-+#if VDRVERSNUM >= 10507
-+ for (int j = 0; j < I18nLanguages()->Size(); ++j)
-+#else
- for (int j = 0; j < I18nNumLanguages; ++j)
-+#endif
- free((void*)mPhrases[i][j]);
- }
- free(mPhrases);
-@@ -507,7 +511,11 @@
- memset(&p, 0, sizeof(tI18nPhrase));
- Text += 17;
-
-+#if VDRVERSNUM >= 10507
-+ for (i = 0; i < I18nLanguages()->Size(); ++i) {
-+#else
- for (i = 0; i < I18nNumLanguages; ++i) {
-+#endif
- char *langs = strdup(I18nLanguageCode(i));
- char *ptr = langs, *ep;
- std::string text;
-@@ -525,7 +533,11 @@
- }
-
- int idx = mNumPhrases++;
-+#if VDRVERSNUM >= 10507
-+ for (i = 0; i < I18nLanguages()->Size(); ++i)
-+#else
- for (i = 0; i < I18nNumLanguages; ++i)
-+#endif
- if (!p[i]) p[i] = "";
- mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
- memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
-@@ -539,7 +551,9 @@
-
- bool cText2SkinI18n::Load(const std::string &Filename) {
- if (cText2SkinFile::Load(Filename)) {
-+#if VDRVERSNUM <= 10506
- I18nRegister(mPhrases, mIdentity.c_str());
-+#endif
- return true;
- }
- return false;
---- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig 2007-08-13 09:54:04.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c 2007-08-13 09:57:10.000000000 -0700
-@@ -130,8 +130,13 @@
-
- void cText2SkinStatus::OsdClear(void)
- {
-+#if VDRVERSNUM >= 10507
-+ if (I18nCurrentLanguage() != mLastLanguage) {
-+ mLastLanguage = I18nCurrentLanguage();
-+#else
- if (Setup.OSDLanguage != mLastLanguage) {
- mLastLanguage = Setup.OSDLanguage;
-+#endif
- cxString::Reparse();
- }
-
---- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig 2007-08-13 09:46:25.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c 2007-08-13 10:30:11.000000000 -0700
-@@ -49,7 +49,11 @@
-
- bool cText2SkinPlugin::Start(void) {
- RegisterI18n(Phrases);
-+#if VDRVERSNUM >= 10507
-+ Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
-+#else
- Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
-+#endif
- cText2SkinLoader::Start();
- return true;
- }
diff --git a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
deleted file mode 100644
index 0466fe2fc38b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10/Makefile.orig 2008-05-06 22:27:03.133654132 +0200
-+++ text2skin-1.1-cvs_ext-0.10/Makefile 2008-05-06 22:28:19.793658721 +0200
-@@ -80,7 +80,8 @@
-
- ifdef HAVE_IMAGEMAGICK
- DEFINES += -DHAVE_IMAGEMAGICK
-- LIBS += -lMagick -lMagick++
-+ INCLUDES += $(shell pkg-config --cflags ImageMagick++)
-+ LIBS += $(shell pkg-config --libs ImageMagick++)
- # LIBS += $(shell Magick++-config --ldflags --libs)
- endif
-
diff --git a/media-plugins/vdr-text2skin/files/20070506/series b/media-plugins/vdr-text2skin/files/20070506/series
deleted file mode 100644
index 6c4b49da5bda..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/series
+++ /dev/null
@@ -1,7 +0,0 @@
-01_gcc-4.diff
-02_uint64.diff
-03_gentoo.diff
-04_no_direct_blit.diff
-05_vdr-1.5.4.diff
-06_vdr-1.5.7.diff
-07_pkgconfig_magick.diff
diff --git a/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff b/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff
deleted file mode 100644
index f9cb59dce81b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/common.c
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/common.c
-+++ text2skin-1.1-cvs_ext-0.10/common.c
-@@ -15,7 +15,7 @@
- const std::string &SkinPath(void)
- {
- // should never change
-- static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
-+ static std::string path = "/usr/share/vdr/" PLUGIN_NAME_I18N;
- return path;
- }
-
diff --git a/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff b/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff
deleted file mode 100644
index 6a3ccec1dfe3..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/screen.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-@@ -8,8 +8,8 @@
- #include "common.h"
- #include <vdr/osd.h>
-
--// #undef DIRECTBLIT
--#define DIRECTBLIT
-+#undef DIRECTBLIT
-+// #define DIRECTBLIT
-
- class cText2SkinScreen {
- /* Skin Editor */
diff --git a/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff b/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff
deleted file mode 100644
index 7728fa337915..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig 2007-08-13 08:54:41.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c 2007-08-13 09:17:43.000000000 -0700
-@@ -31,8 +31,13 @@
- const cFont *res = NULL;
- #ifdef HAVE_FREETYPE
- char *cachename;
-+#if VDRVERSNUM >= 10507
-+ asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
-+ if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
-+#else
- asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
- if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
-+#endif
- res = mFontCache.GetFont(cachename);
- else
- esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
---- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig 2007-08-13 07:34:10.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c 2007-08-13 08:53:31.000000000 -0700
-@@ -491,7 +491,11 @@
-
- cText2SkinI18n::~cText2SkinI18n() {
- for (int i = 0; mPhrases[i][0]; ++i) {
-+#if VDRVERSNUM >= 10507
-+ for (int j = 0; j < I18nLanguages()->Size(); ++j)
-+#else
- for (int j = 0; j < I18nNumLanguages; ++j)
-+#endif
- free((void*)mPhrases[i][j]);
- }
- free(mPhrases);
-@@ -507,7 +511,11 @@
- memset(&p, 0, sizeof(tI18nPhrase));
- Text += 17;
-
-+#if VDRVERSNUM >= 10507
-+ for (i = 0; i < I18nLanguages()->Size(); ++i) {
-+#else
- for (i = 0; i < I18nNumLanguages; ++i) {
-+#endif
- char *langs = strdup(I18nLanguageCode(i));
- char *ptr = langs, *ep;
- std::string text;
-@@ -525,7 +533,11 @@
- }
-
- int idx = mNumPhrases++;
-+#if VDRVERSNUM >= 10507
-+ for (i = 0; i < I18nLanguages()->Size(); ++i)
-+#else
- for (i = 0; i < I18nNumLanguages; ++i)
-+#endif
- if (!p[i]) p[i] = "";
- mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
- memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
-@@ -539,7 +551,9 @@
-
- bool cText2SkinI18n::Load(const std::string &Filename) {
- if (cText2SkinFile::Load(Filename)) {
-+#if VDRVERSNUM <= 10506
- I18nRegister(mPhrases, mIdentity.c_str());
-+#endif
- return true;
- }
- return false;
---- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig 2007-08-13 09:54:04.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c 2007-08-13 09:57:10.000000000 -0700
-@@ -130,8 +130,13 @@
-
- void cText2SkinStatus::OsdClear(void)
- {
-+#if VDRVERSNUM >= 10507
-+ if (I18nCurrentLanguage() != mLastLanguage) {
-+ mLastLanguage = I18nCurrentLanguage();
-+#else
- if (Setup.OSDLanguage != mLastLanguage) {
- mLastLanguage = Setup.OSDLanguage;
-+#endif
- cxString::Reparse();
- }
-
---- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig 2007-08-13 09:46:25.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c 2007-08-13 10:30:11.000000000 -0700
-@@ -49,7 +49,11 @@
-
- bool cText2SkinPlugin::Start(void) {
- RegisterI18n(Phrases);
-+#if VDRVERSNUM >= 10507
-+ Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
-+#else
- Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
-+#endif
- cText2SkinLoader::Start();
- return true;
- }
diff --git a/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff
deleted file mode 100644
index 0466fe2fc38b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10/Makefile.orig 2008-05-06 22:27:03.133654132 +0200
-+++ text2skin-1.1-cvs_ext-0.10/Makefile 2008-05-06 22:28:19.793658721 +0200
-@@ -80,7 +80,8 @@
-
- ifdef HAVE_IMAGEMAGICK
- DEFINES += -DHAVE_IMAGEMAGICK
-- LIBS += -lMagick -lMagick++
-+ INCLUDES += $(shell pkg-config --cflags ImageMagick++)
-+ LIBS += $(shell pkg-config --libs ImageMagick++)
- # LIBS += $(shell Magick++-config --ldflags --libs)
- endif
-
diff --git a/media-plugins/vdr-text2skin/files/20070906/08_cache.diff b/media-plugins/vdr-text2skin/files/20070906/08_cache.diff
deleted file mode 100644
index 3137c91d10f1..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/08_cache.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/common.c
-===================================================================
---- cache.h.orig 2008-08-03 21:38:24.000000000 +0200
-+++ cache.h 2008-08-03 21:38:56.000000000 +0200
-@@ -8,6 +8,7 @@
- #include <map>
- #include <vector>
- #include <string>
-+#include "common.h"
-
- template<class key_type, class data_type>
- class cxCache {
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
index 00fd356c467c..2083a4329d62 100644
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ b/media-plugins/vdr-text2skin/metadata.xml
@@ -6,8 +6,8 @@
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
-<use>
+<!-- <use>
<flag name='direct_blit'>not buffer picture, faster, but only for modified
skins</flag>
-</use>
+</use> -->
</pkgmetadata>
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
deleted file mode 100644
index 1c2eb4853121..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
+++ /dev/null
@@ -1,66 +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-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.5 2008/05/06 20:35:14 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 3)
-MY_BASE="text2skin-1.1-cvs_ext-0.10"
-MY_P="${MY_BASE}-patched-${MY_PV}"
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://www.magoa.net/linux/"
-SRC_URI="ftp://merkur.2y.net/pub/vdr/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="truetype direct_blit"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.18
- media-gfx/imagemagick
- truetype? ( media-libs/freetype )
- !media-plugins/vdr-text2skin-cvs"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=("${FILESDIR}/${MY_PV}/01_gcc-4.diff"
- "${FILESDIR}/${MY_PV}/02_uint64.diff"
- "${FILESDIR}/${MY_PV}/03_gentoo.diff"
- "${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff"
- "${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff"
- "${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff")
-
-S="${WORKDIR}/${MY_BASE}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_unpack() {
- vdr-plugin_src_unpack unpack
-
- cd "${S}"
- use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
- sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::'
-
- if ! use direct_blit; then
- epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff"
- fi
-
- vdr-plugin_src_unpack all_but_unpack
-}
-
-src_install() {
- vdr-plugin_src_install
-
- keepdir "${SKINDIR}"
-
- exeinto "${SKINDIR}/contrib"
- doexe "${S}"/contrib/skin_to_*.pl
- doexe "${S}"/contrib/transform.pl
-
- dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild
deleted file mode 100644
index 6e79c34fbb79..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild
+++ /dev/null
@@ -1,69 +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-text2skin/vdr-text2skin-1.0.20070906.ebuild,v 1.1 2008/08/07 15:54:26 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 3)
-MY_BASE="text2skin-1.1-cvs_ext-0.11"
-MY_P="${MY_BASE}"
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://www.magoa.net/linux/"
-SRC_URI="http://vdr.gekrumbel.de/mirror/text2skin-chr13/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-#IUSE="truetype direct_blit"
-IUSE="direct_blit"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.18
- media-gfx/imagemagick
- !media-plugins/vdr-text2skin-cvs"
-# truetype? ( media-libs/freetype )
-
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=("${FILESDIR}/${MY_PV}/03_gentoo.diff"
- "${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff"
- "${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff"
- "${FILESDIR}/${MY_PV}/08_cache.diff")
-
-S="${WORKDIR}/${MY_BASE}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_unpack() {
- vdr-plugin_src_unpack unpack
-
- cd "${S}"
-
- #truetype support broken!
- #use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
- sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-
- sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::'
-
- if ! use direct_blit; then
- epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff"
- fi
-
- vdr-plugin_src_unpack all_but_unpack
-}
-
-src_install() {
- vdr-plugin_src_install
-
- keepdir "${SKINDIR}"
-
- exeinto "${SKINDIR}/contrib"
- doexe "${S}"/contrib/skin_to_*.pl
- doexe "${S}"/contrib/transform.pl
-
- dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
new file mode 100644
index 000000000000..7b579622086e
--- /dev/null
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild,v 1.1 2010/12/30 18:57:40 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin versionator
+
+UPLOAD_NR=344 # changes with every version / new file :-(
+
+DESCRIPTION="VDR text2skin PlugIn"
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
+SRC_URI="http://projects.vdr-developer.org/attachments/download/${UPLOAD_NR}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+#IUSE="truetype direct_blit"
+IUSE="+truetype"
+
+COMMON_DEPEND=">=media-video/vdr-1.6.0
+ media-gfx/imagemagick
+ truetype? ( media-libs/freetype )"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}"
+
+SKINDIR=/usr/share/vdr/${VDRPLUGIN}
+ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
+
+src_prepare() {
+ sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
+
+ use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
+
+ if ! has_version ">=media-video/vdr-1.7.13"; then
+ sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
+ fi
+
+ vdr-plugin_src_prepare
+}
+
+src_install() {
+ vdr-plugin_src_install
+
+ keepdir "${SKINDIR}"
+
+ exeinto "${SKINDIR}/contrib"
+ doexe "${S}"/contrib/skin_to_*.pl
+ doexe "${S}"/contrib/transform.pl
+
+ dodoc "${S}"/Docs/*.txt
+}