diff --git a/.gitignore b/.gitignore index e69de29..2f6588a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/skinenigmang-logos-xpm-hi-20070702.tgz +/vdr-skinenigmang-0.1.2.tgz diff --git a/GraphicsMagick_support.diff b/GraphicsMagick_support.diff new file mode 100644 index 0000000..b57e09e --- /dev/null +++ b/GraphicsMagick_support.diff @@ -0,0 +1,90 @@ +commit 4001478a343b9631ade6be4192b2b12e1b8508b9 +Author: Andreas Mair +Date: Sat May 5 12:49:11 2012 +0200 + + Add support for building with GraphicsMagick instead of ImageMagick. (Patch by Ville Skyttä) + +diff --git a/Makefile b/Makefile +index bcf316c..5efa340 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,8 +10,8 @@ + # Debugging on/off + #SKINENIGMA_DEBUG = 1 + +-# If you have installed ImageMagick and want to use +-# images in event's and recording's details. ++# If you have installed ImageMagick and want to use images in events' ++# and recordings' details. Set to GRAPHICS to use GraphicsMagick. + #HAVE_IMAGEMAGICK = 1 + + # If you are using the epgsearch plugin and want to see the number of +@@ -129,8 +129,13 @@ OBJS = $(PLUGIN).o enigma.o config.o logo.o tools.o status.o texteffects.o setup + + ifdef HAVE_IMAGEMAGICK + OBJS += bitmap.o ++ifneq ($(HAVE_IMAGEMAGICK), GRAPHICS) + LIBS += -lMagick++ + INCLUDES += -I/usr/include/ImageMagick -I/usr/local/include/ImageMagick ++else ++LIBS += $(shell pkg-config --libs GraphicsMagick++) ++INCLUDES += $(shell pkg-config --cflags GraphicsMagick++) ++endif + endif + + ifneq ($(shell which freetype-config),) +diff --git a/README b/README +index c4de521..10526bd 100644 +--- a/README ++++ b/README +@@ -46,8 +46,8 @@ This turns usage of logos in the main menu completely off. This might + also improve the performance of the menus. EXPERIMENTAL!!! + + HAVE_IMAGEMAGICK = 1 +-If you have installed ImageMagick and want to use images in event's +-and recording's details. ++If you have installed ImageMagick and want to use images in events' ++and recordings' details. Set to GRAPHICS to use GraphicsMagick. + + SKINENIGMA_DISABLE_SIGNALINFO = 1 + Do not include code to show signal strength and signal-to-noise ratio. +diff --git a/bitmap.c b/bitmap.c +index 536c700..ff3e7aa 100644 +--- a/bitmap.c ++++ b/bitmap.c +@@ -15,6 +15,11 @@ using namespace Magick; + #include + + #include ++ ++void cOSDImageBitmap::Init(void) ++{ ++ InitializeMagick(NULL); ++} + + cOSDImageBitmap::cOSDImageBitmap() + {} +diff --git a/bitmap.h b/bitmap.h +index 507d7f7..63644cb 100644 +--- a/bitmap.h ++++ b/bitmap.h +@@ -18,6 +18,7 @@ public: + cOSDImageBitmap(); + ~cOSDImageBitmap(); + bool DrawImage(const char *fileNameP, int x, int y, int w, int h, int colors, cBitmap *bmp); ++ static void Init(void); + + private: + bool DrawMagick(const char *Filename, int x, int y, int height, int width, int colors, cBitmap *bmp); +diff --git a/logo.c b/logo.c +index 470c5b1..3eb2a24 100644 +--- a/logo.c ++++ b/logo.c +@@ -18,6 +18,7 @@ cEnigmaLogoCache::cEnigmaLogoCache(unsigned int cacheSizeP) :cacheSizeM(cacheSiz + { + #ifdef HAVE_IMAGEMAGICK + bmpImage = new cBitmap(8, 8, 1); ++ cOSDImageBitmap::Init(); + #endif + } + diff --git a/disappearing_symbols.diff b/disappearing_symbols.diff new file mode 100644 index 0000000..bfcb08f --- /dev/null +++ b/disappearing_symbols.diff @@ -0,0 +1,61 @@ +commit aae9aadc381d4f67326a25c80214c2b7ef04e10a +Author: Andreas Mair +Date: Mon Apr 30 20:06:58 2012 +0200 + + Fixed disappearing symbols in channel info osd if signal strength and quality are shown. + +diff --git a/enigma.c b/enigma.c +index 826d671..97827de 100644 +--- a/enigma.c ++++ b/enigma.c +@@ -335,7 +335,6 @@ cSkinEnigmaDisplayChannel::cSkinEnigmaDisplayChannel(bool WithInfo) + fShowLogo = EnigmaConfig.showLogo; + xFirstSymbol = 0; + #ifndef DISABLE_SIGNALINFO +- xSignalBarLeft = EnigmaConfig.showSignalInfo ? 0 : -1; + nStrBarWidth = 10000; + nSnrBarWidth = 10000; + #if VDRVERSNUM < 10719 +@@ -403,6 +402,9 @@ cSkinEnigmaDisplayChannel::cSkinEnigmaDisplayChannel(bool WithInfo) + cString date = DayDateTime(); + int w = pFontDate->Width(date); + xDateLeft = xTitleRight - xIndent - w - SmallGap; ++#ifndef DISABLE_SIGNALINFO ++ xSignalBarLeft = EnigmaConfig.showSignalInfo ? (xBottomRight - xIndent - MIN_CI_SIGNALBAR) : -1; ++#endif + + // create osd + osd = cOsdProvider::NewOsd(OsdSize.x, OsdSize.y + (Setup.ChannelInfoPos ? 0 : (OsdSize.h - yBottomBottom)) ); +@@ -553,7 +555,6 @@ void cSkinEnigmaDisplayChannel::DrawSymbols(const cChannel *Channel) + int ys = yBottomTop + (yBottomBottom - yBottomTop - SymbolHeight) / 2; + + #ifndef DISABLE_SIGNALINFO +- UpdateSignal(); + if (xSignalBarLeft >= 0) + xs = xSignalBarLeft - Gap; + #endif //DISABLE_SIGNALINFO +@@ -697,23 +698,18 @@ int cSkinEnigmaDisplayChannel::GetSignal(int &str, int &snr, fe_status_t & /* st + } + + void cSkinEnigmaDisplayChannel::UpdateSignal() { +- if (xSignalBarLeft < 0) ++ if (xSignalBarLeft <= 0) + return; + + int str = -1; + int snr = -1; + fe_status_t status; + if (GetSignal(str, snr, status) < 0) +- { +- xSignalBarLeft = -1; + return; +- } + + if (snr < 0 && str < 0) + return; + +- xSignalBarLeft = xBottomRight - xIndent - MIN_CI_SIGNALBAR; +- + int bw = MIN_CI_SIGNALBAR; //45; + int xSignalBarRight = xSignalBarLeft + bw; + diff --git a/sources b/sources index e69de29..60b6de3 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +736483b8d94c04f5dce5d99ebb3a3bf1 skinenigmang-logos-xpm-hi-20070702.tgz +876f26135f94dad658910ca0d920b171 vdr-skinenigmang-0.1.2.tgz diff --git a/vdr-skinenigmang-0.1.2-config.patch b/vdr-skinenigmang-0.1.2-config.patch new file mode 100644 index 0000000..4f1a838 --- /dev/null +++ b/vdr-skinenigmang-0.1.2-config.patch @@ -0,0 +1,35 @@ +diff -up skinenigmang-0.1.2/README~ skinenigmang-0.1.2/README +--- skinenigmang-0.1.2/README~ 2012-05-04 12:59:44.000000000 +0300 ++++ skinenigmang-0.1.2/README 2012-05-04 13:07:27.786479829 +0300 +@@ -92,10 +92,10 @@ + Path to the TrueTypeFonts (*.ttf) (Default: /fonts). + + -i path, --epgimages=path +- Path to the epgimages (Default: /epgimages). ++ Path to the epgimages (Default: /var/cache/vdr/epgimages). + + -l path, --logodir=path +- Path to the logos (Default: /plugins/skinenigmang). ++ Path to the logos (Default: /usr/share/vdr). + + + Usage +diff -up skinenigmang-0.1.2/skinenigmang.c~ skinenigmang-0.1.2/skinenigmang.c +--- skinenigmang-0.1.2/skinenigmang.c~ 2012-05-02 09:20:26.000000000 +0300 ++++ skinenigmang-0.1.2/skinenigmang.c 2012-05-04 13:07:36.903357269 +0300 +@@ -121,13 +121,13 @@ bool cPluginSkinEnigma::Start(void) + + if (!fLogodirSet) { + // set logo directory +- EnigmaConfig.SetLogoDir(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)); ++ EnigmaConfig.SetLogoDir("/usr/share/vdr"); + fLogodirSet = true; + } + if (!fImagesDirSet) { + // set epgimages directory + char *dir = NULL; +- if (-1 != asprintf(&dir, "%s/epgimages", cPlugin::ConfigDirectory(PLUGIN_NAME_I18N))) { ++ if (-1 != asprintf(&dir, "%s/epgimages", "/var/cache/vdr")) { + EnigmaConfig.SetImagesDir(dir); + fImagesDirSet = true; + free(dir); diff --git a/vdr-skinenigmang-fsf-fix.patch b/vdr-skinenigmang-fsf-fix.patch new file mode 100644 index 0000000..9e4b46c --- /dev/null +++ b/vdr-skinenigmang-fsf-fix.patch @@ -0,0 +1,20 @@ +--- screenshot-0.0.13/COPYING.orig 2012-05-05 17:54:21.646516046 +0200 ++++ screenshot-0.0.13/COPYING 2012-05-05 17:57:49.785534163 +0200 +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -305,7 +305,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + Also add information on how to contact you by electronic and paper mail. diff --git a/vdr-skinenigmang.conf b/vdr-skinenigmang.conf new file mode 100644 index 0000000..42a5b54 --- /dev/null +++ b/vdr-skinenigmang.conf @@ -0,0 +1,6 @@ +# Configuration snippet for vdr-skinenigmang -*- sh -*- +# +# Add command line options to pass to the skinenigmang plugin to PLUGIN_OPTIONS. +# See /usr/share/doc/vdr-skinenigmang-*/README for info about available options. + +PLUGIN_OPTIONS="" diff --git a/vdr-skinenigmang.spec b/vdr-skinenigmang.spec new file mode 100644 index 0000000..32e0bb8 --- /dev/null +++ b/vdr-skinenigmang.spec @@ -0,0 +1,102 @@ +%global pname skinenigmang + +Name: vdr-%{pname} +Version: 0.1.2 +Release: 5%{?dist} +Summary: A skin for VDR based on the Enigma text2skin add on + +Group: Applications/Multimedia +License: GPL+ +URL: http://andreas.vdr-developer.org/enigmang/ +Source0: http://andreas.vdr-developer.org/enigmang/download/vdr-skinenigmang-%{version}.tgz +Source1: http://andreas.vdr-developer.org/enigmang/download/skinenigmang-logos-xpm-hi-20070702.tgz +Source2: %{name}.conf +Patch0: %{name}-0.1.2-config.patch +Patch1: %{name}-fsf-fix.patch +# http://projects.vdr-developer.org/projects/plg-skinenigmang/repository/revisions/4001478a343b9631ade6be4192b2b12e1b8508b9 +Patch2: GraphicsMagick_support.diff +# http://projects.vdr-developer.org/projects/plg-skinenigmang/repository/revisions/aae9aadc381d4f67326a25c80214c2b7ef04e10a/diff.diff +Patch3: disappearing_symbols.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: freetype-devel +BuildRequires: GraphicsMagick-c++-devel +BuildRequires: vdr-devel >= 1.6.0-41 +Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} + +%description +VDR plugin: %{pname} - %{summary} + +%prep +%setup -q -n %{pname}-%{version} -a 1 +mv skinenigmang/HISTORY HISTORY.logos +mv skinenigmang/README README.logos +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README + +%build +make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr \ + HAVE_IMAGEMAGICK=GRAPHICS + +%install +install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir} +install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \ + $RPM_BUILD_ROOT%{vdr_plugindir} + +# skinenigmang.conf +install -Dpm 644 %{SOURCE2} \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf + +# themes +install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/themes +install -pm 644 themes/*.theme $RPM_BUILD_ROOT%{vdr_vardir}/themes + +# flags,icons +install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir} +cp -a skinenigmang/{flags,icons} $RPM_BUILD_ROOT%{vdr_datadir} + +# Locale +install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale +cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale +%find_lang %{name} + + +%files -f %{name}.lang +%doc COPYING HISTORY* README* +%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf +%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} +%{vdr_vardir}/themes/EnigmaNG-*.theme +%{vdr_datadir}/flags +%{vdr_datadir}/icons + + +%changelog +* Sun Jun 17 2012 Martin Gansser - 0.1.2-5 +- fixed wrong url +- changed license type from GPLv2+ to GPL+ + +* Thu Jun 14 2012 Martin Gansser - 0.1.2-4 +- more spec file cleanups +- fixed copying of source file to build dir + +* Tue Jun 12 2012 Martin Gansser - 0.1.2-3 +- added config patch +- added flag and icons in file section +- spec file cleanup + +* Sat Jun 2 2012 Martin Gansser - 0.1.2-2 +- added patch for GraphicsMagick support +- added patch for disappearing symbols + +* Mon Apr 30 2012 Martin Gansser - 0.1.2-1 +- spec cleanup + +* Tue Sep 20 2011 Sebastian Vahl - 0.1.1-2 +- spec cleanup + +* Sat Sep 17 2011 Sebastian Vahl - 0.1.1-1 +- initial release