diff options
author | 2008-08-07 15:54:27 +0000 | |
---|---|---|
committer | 2008-08-07 15:54:27 +0000 | |
commit | ce5e23660b088345efd0067ea606cec875b66104 (patch) | |
tree | 143074d0a00c96776204cc08cb1b5ffbddcf4df1 | |
parent | backport a fix from upstream to fix build with use=-opengl, bug #234057 (diff) | |
download | historical-ce5e23660b088345efd0067ea606cec875b66104.tar.gz historical-ce5e23660b088345efd0067ea606cec875b66104.tar.bz2 historical-ce5e23660b088345efd0067ea606cec875b66104.zip |
Added new version. Truetype support here is broken, so disabled for now. Thanks to darav@gmx.de for the ebuild.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25-tuxonice-r6 i686
8 files changed, 237 insertions, 5 deletions
diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog index 2cff462f8ea5..48bf46d0efad 100644 --- a/media-plugins/vdr-text2skin/ChangeLog +++ b/media-plugins/vdr-text2skin/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-plugins/vdr-text2skin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.4 2008/08/01 20:02:48 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.5 2008/08/07 15:54:26 zzam Exp $ + +*vdr-text2skin-1.0.20070906 (07 Aug 2008) + + 07 Aug 2008; Matthias Schwarzott <zzam@gentoo.org> + +files/20070906/03_gentoo.diff, +files/20070906/04_no_direct_blit.diff, + +files/20070906/07_pkgconfig_magick.diff, + +files/20070906/06_vdr-1.5.7.diff, +files/20070906/08_cache.diff, + +vdr-text2skin-1.0.20070906.ebuild: + Added new version. Truetype support here is broken, so disabled for now. + Thanks to darav@gmx.de for the ebuild. 01 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: add GLEP 56 USE flag desc from use.local.desc diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest index c460be58fc95..acfa4d40088e 100644 --- a/media-plugins/vdr-text2skin/Manifest +++ b/media-plugins/vdr-text2skin/Manifest @@ -9,14 +9,21 @@ AUX 20070506/05_vdr-1.5.4.diff 1815 RMD160 6caa9d437a25a3ff3131c4af517f142dc4a2a AUX 20070506/06_vdr-1.5.7.diff 3122 RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 SHA1 a904d4f856757df4dc268fe1911bebafc332fdcb SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178 AUX 20070506/07_pkgconfig_magick.diff 433 RMD160 97d8e084e942d15cd881cc0156e99020bd72f61e SHA1 4212c02e5d0c0c809549e2a4295b8088f93c4ae3 SHA256 0b2f758f5a7b2a93c45f5e56e92f9f6e584985f68a2d2087f7875b7032747b87 AUX 20070506/series 128 RMD160 9b61168fb205fdba9d997592b81999cd14e1a101 SHA1 f83f19e9c19685c84715a3a65c99e3283ef88047 SHA256 bde28f27721e8aa6c1be7e11afb483312554f0a175a33dfde20884af87e31e83 +AUX 20070906/03_gentoo.diff 434 RMD160 190fb931c9481e6d692a270344b4c995e7aa03b0 SHA1 4fa89190551b6d1435195cccbc31a6ed4dfd415b SHA256 eff41ebe1807f1bbcf8d797d53ae0561d3747b1c0e5f64e8dfa80ac69e8cd63a +AUX 20070906/04_no_direct_blit.diff 440 RMD160 101738bd5ac6359deb016965d6cf3024e6a2efe2 SHA1 5a5a50ef10b93f3eb43565767f2c0b602fd79f7e SHA256 c4cdabc7e629cf71c8e6cd15dbc548e1997352c75065ad7809b3c0b84fda22b0 +AUX 20070906/06_vdr-1.5.7.diff 3122 RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 SHA1 a904d4f856757df4dc268fe1911bebafc332fdcb SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178 +AUX 20070906/07_pkgconfig_magick.diff 433 RMD160 97d8e084e942d15cd881cc0156e99020bd72f61e SHA1 4212c02e5d0c0c809549e2a4295b8088f93c4ae3 SHA256 0b2f758f5a7b2a93c45f5e56e92f9f6e584985f68a2d2087f7875b7032747b87 +AUX 20070906/08_cache.diff 365 RMD160 724a6a9947d6ef9c50ab556d75f90fcfc5766d2d SHA1 cc997ee634e96488fb98928d95a4159d6c708e36 SHA256 e89d35e6000a73ebfee59cfbb618236c4b4a25e9ff835b83d234f3741455653f DIST text2skin-1.1-cvs_ext-0.10-patched-20070506.tar.bz2 81003 RMD160 536b22e3d61ee9978319dd301b5360f220fc3b3d SHA1 a9efacdd26a03ae39234cb3c7772509802ae7e13 SHA256 e1e6314a14568402e75c9b9fb5a81d76877d22e37c81ff102c380fdaed676d0f +DIST text2skin-1.1-cvs_ext-0.11.tar.bz2 78703 RMD160 32fd05a11ef1a59b9f6211d1d5f406a26ddcf3a9 SHA1 1f428e23de74483b7bcab5e86f97c64536d32295 SHA256 b1611768ff8d9a4a682238d25a09456febeb2eecc9d71c018351e462d5c2b8da EBUILD vdr-text2skin-1.0.20070506.ebuild 1663 RMD160 88920e0b960b084c1d86728f21612a1ae1ff7bc8 SHA1 dd27413a4b1f3f9259b4b7ac172fedecee55d67f SHA256 b948bb7a3e4bc320f4f1082841e4af04dc8b468396b1d45971479d033a5a0e28 -MISC ChangeLog 1285 RMD160 dd6c1fcaab9b21803def801eca8076b8366f106f SHA1 4f4c7e421c798881faa64d2e41dab1c5e136ab09 SHA256 2c7091650bf4883b2c6ebc8558e2cca2c2bb445e3ab0d74b40201a5e9c77ce65 +EBUILD vdr-text2skin-1.0.20070906.ebuild 1690 RMD160 5cbf9812070cd5fe3d0fe77029570604e26ee189 SHA1 2637fd9124466074d992143f5331f4d4928d905d SHA256 60b4456492119091b8b418d2b1cc9d4e17e10777408c0622460f0dfa583c86ab +MISC ChangeLog 1720 RMD160 239861af5bb11a26f6d023cdc98bf06b28680b68 SHA1 ebf90c5df55a381a6afd43041893e699991ae84d SHA256 e9f577a9a7ab9a475ec0c25fbce6fc7206623945e0d880dcae2550cd6eada341 MISC metadata.xml 358 RMD160 540955e7bed6b40dcff9e3d52159c973fdb5d901 SHA1 decc90bf0f2950bcfa17628753befc76d604053b SHA256 7973e5c8a20dbfd5e15d6c8b7eef016443eb44eb21c01081464ee0a98d386a64 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiTa+4ACgkQoeSe8B0zEfwEkQCghGqfnOGjyPJwWnUz4xBKl918 -8fwAn03x4pz8A9NEDxcK1mTcl7GhFZbP -=6yZm +iEYEARECAAYFAkibGwEACgkQt2vP6XvVdOdViwCfRTYdayiAVqTi4gBbjxHgoHLH +NIYAnAoqxiG/NiQy5hKVS7oHdCAKF7FS +=yfl8 -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff b/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff new file mode 100644 index 000000000000..f9cb59dce81b --- /dev/null +++ b/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000000..6a3ccec1dfe3 --- /dev/null +++ b/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000000..7728fa337915 --- /dev/null +++ b/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff @@ -0,0 +1,94 @@ +--- 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 new file mode 100644 index 000000000000..0466fe2fc38b --- /dev/null +++ b/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..3137c91d10f1 --- /dev/null +++ b/media-plugins/vdr-text2skin/files/20070906/08_cache.diff @@ -0,0 +1,12 @@ +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/vdr-text2skin-1.0.20070906.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild new file mode 100644 index 000000000000..6e79c34fbb79 --- /dev/null +++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild @@ -0,0 +1,69 @@ +# 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 +} |