From 0fd4062c760c88f3afc48cedbf0cb68ec035992d Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Sun, 13 Mar 2011 19:09:01 +0200 Subject: [PATCH] Added package name and version to xgettext and made 'dist' target dependent on up to date *.po files. Updated for vdr-1.7.17. --- HISTORY | 4 ++++ Makefile | 6 +++--- femon.c | 6 +++--- femonosd.c | 1 + po/de_DE.po | 2 +- po/es_ES.po | 2 +- po/et_EE.po | 2 +- po/fi_FI.po | 2 +- po/fr_FR.po | 2 +- po/it_IT.po | 2 +- po/lt_LT.po | 2 +- po/ru_RU.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 14 files changed, 21 insertions(+), 16 deletions(-) diff --git a/HISTORY b/HISTORY index 85e32bb..18b81f6 100644 --- a/HISTORY +++ b/HISTORY @@ -409,3 +409,7 @@ VDR Plugin 'femon' Revision History - Added Makefile depencency for objects. - Fixed detection of replaying. - Added support for LDFLAGS. + +2011-03-13: Version 1.7.10 + +- Updated for vdr-1.7.17. diff --git a/Makefile b/Makefile index 8c534e8..df624e4 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p ### The C++ compiler and options: CXX ?= g++ -CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses +CXXFLAGS ?= -fPIC -g -O3 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses LDFLAGS ?= -Wl,--as-needed ### The directory environment: @@ -96,7 +96,7 @@ I18Npot = $(PODIR)/$(PLUGIN).pot msgfmt -c -o $@ $< $(I18Npot): $(wildcard *.c) - xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='' -o $@ $^ + xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name='vdr-$(PLUGIN)' --package-version='$(VERSION)' --msgid-bugs-address='' -o $@ $^ %.po: $(I18Npot) msgmerge -U --no-wrap --no-location --backup=none -q $@ $< @@ -118,7 +118,7 @@ ifndef FEMON_DEBUG endif @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) -dist: clean +dist: $(I18Npo) clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) @cp -a * $(TMPDIR)/$(ARCHIVE) diff --git a/femon.c b/femon.c index 393b1db..f283636 100644 --- a/femon.c +++ b/femon.c @@ -14,11 +14,11 @@ #include "femonservice.h" #include "femontools.h" -#if defined(APIVERSNUM) && APIVERSNUM < 10716 -#error "VDR-1.7.16 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 10717 +#error "VDR-1.7.17 API version or greater is required!" #endif -static const char VERSION[] = "1.7.9"; +static const char VERSION[] = "1.7.10"; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); diff --git a/femonosd.c b/femonosd.c index e97914c..3c67def 100644 --- a/femonosd.c +++ b/femonosd.c @@ -144,6 +144,7 @@ public: virtual int Width(const char *s) const { return 50; } virtual int Height(void) const { return 20; } virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {} + virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {} }; cFemonOsd *cFemonOsd::pInstance = NULL; diff --git a/po/de_DE.po b/po/de_DE.po index dd14c2b..38a4e88 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/es_ES.po b/po/es_ES.po index d022f80..ffc273b 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/et_EE.po b/po/et_EE.po index 076ebb6..004c9e2 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index 53a3b82..4278975 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/fr_FR.po b/po/fr_FR.po index 82e1215..ea4d454 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/it_IT.po b/po/it_IT.po index c855764..be8f53d 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/lt_LT.po b/po/lt_LT.po index 04a596b..8807553 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index d71e2c6..d480f2a 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 27b9e39..44c11af 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4cb3665..91173dc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.8\n" +"Project-Id-Version: vdr-femon 1.7.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"