some packages updated.

- dvbsnoop : fix invalid source url.
- plugin : fix install bugs.
- module : fix checksum.
- conf : change feed server url.

5 files changed, 70 insertions, 12 deletions

diff --git a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
index f901865..3ebdf7f 100644
--- a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -2,5 +2,5 @@ SRCDATE = "20130125"
 
 MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "f6649e439300780cae3f1856a17ee9cb"
-SRC_URI[sha256sum] = "de6d7eee54ce265e00811124b16e2545fe72c78596957ac35e257363446eb84d"
+SRC_URI[md5sum] = "8fc526839d549cac0ab40284cd336654"
+SRC_URI[sha256sum] = "bdd09d7987ee88027f9b877ed79ac029b0e9b7b08553979ab5372e08e04374b4"
diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index ed8a5e4..7e7f4ae 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -9,7 +9,7 @@ BUILDHISTORY_COMMIT = "1"
 
 DISTRO = "vuplus"
 DISTRO_NAME = "vuplus"
-DISTRO_VERSION = "2.2.0"
+DISTRO_VERSION = "1.0.0"
 DISTRO_PR ?= ""
 
 # meta/conf/distro/include/default-distrovars.inc
@@ -18,8 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
-#DISTRO_FEED_URI = "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/feeds/stable"
-DISTRO_FEED_URI = "http://192.168.102.71/ipk"
+DISTRO_FEED_URI = "http://archive.vuplus.com/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
diff --git a/meta-openvuplus/recipes-vuplus/dvbsnoop/dvbsnoop.bb b/meta-openvuplus/recipes-vuplus/dvbsnoop/dvbsnoop.bb
index c9d81b7..e2d3bca 100644
--- a/meta-openvuplus/recipes-vuplus/dvbsnoop/dvbsnoop.bb
+++ b/meta-openvuplus/recipes-vuplus/dvbsnoop/dvbsnoop.bb
@@ -3,14 +3,13 @@ DESCRIPTION = "DVBsnoop by rasc@users.sourceforge.net"
 MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-SRCDATE = "20081001"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r0"
 
-SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/dvb/dvbsnoop;method=ext \
+PR = "r1"
+
+SRC_URI = "git://git.code.sf.net/p/tuxbox-cvs/apps;protocol=git;tag=${SRC_REV} \
            file://acinclude.m4"
 	   
-S = "${WORKDIR}/dvbsnoop"
+S = "${WORKDIR}/git/dvb/dvbsnoop"
 
 inherit autotools pkgconfig
 
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
index b8a16c8..ea99d0b 100755
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
@@ -11,7 +11,7 @@ SRCREV="c8fc96e8e51e1ef71e1709f9dd6f733007f9463e"
 SRCDATE="20110215"
 BRANCH="master"
 PV = "experimental-git${SRCDATE}"
-PR = "r7"
+PR = "r8"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -34,7 +34,8 @@ SRC_URI_append_vuplus = " \
 	   file://enigma2_plugins_gst_plugins_pkgname.patch;patch=1;pnum=1 \
            file://dreamboxweb.png \
            file://dreamboxwebtv.png \
-           file://favicon.ico"
+           file://favicon.ico \
+	   file://Makefile.am "
 
 FILES_${PN} += " /usr/share/enigma2 /usr/share/fonts "
 FILES_${PN}-meta = "${datadir}/meta"
@@ -84,6 +85,9 @@ do_unpack_append(){
 	modify_po()
 }
 
+do_install_prepend_vuplus() {
+	mv ${WORKDIR}/Makefile.am ${S}/easymedia/po
+}
 
 do_install_append_vuplus() {
 	install -m 0644 ${WORKDIR}/dreamboxweb.png ${D}/usr/lib/enigma2/python/Plugins/Extensions/WebInterface/web-data/img/
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/Makefile.am b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/Makefile.am
new file mode 100644
index 0000000..c6e5fb4
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/Makefile.am
@@ -0,0 +1,56 @@
+#
+# to use this for the localisation of other plugins,
+# just change the DOMAIN to the name of the Plugin.
+# It is assumed, that the domain ist the same as
+# the directory name of the plugin.
+#
+
+DOMAIN=EasyMedia
+installdir = /usr/lib/enigma2/python/Plugins/Extensions/$(DOMAIN)
+#GETTEXT=./pygettext.py
+GETTEXT=xgettext
+
+#MSGFMT = ./msgfmt.py
+MSGFMT = msgfmt
+
+LANGS := de it nl
+LANGPO := $(foreach LANG, $(LANGS),$(LANG).po)
+LANGMO := $(foreach LANG, $(LANGS),$(LANG).mo)
+
+default: $(DOMAIN).pot $(LANGPO) merge $(LANGMO)
+	for lang in $(LANGS); do \
+		mkdir -p $$lang/LC_MESSAGES; \
+		cp $$lang.mo $$lang/LC_MESSAGES/$(DOMAIN).mo; \
+	done
+
+merge:
+	#for lang in $(LANGS); do msgmerge --no-location -s -N -U $$lang.po $(DOMAIN).pot; done
+
+
+# the TRANSLATORS: allows putting translation comments before the to-be-translated line.
+$(DOMAIN).pot:
+	$(GETTEXT) -L python --add-comments="TRANSLATORS:" -d $(DOMAIN) -s -o $(DOMAIN).pot ../src/*.py
+	for lang in $(LANGS); do msgmerge --no-location -s -N -U $$lang.po $(DOMAIN).pot; done
+	msguniq -o $(DOMAIN)uniq.pot $(DOMAIN).pot
+	$(RM) $(DOMAIN).pot
+	mv $(DOMAIN)uniq.pot $(DOMAIN).pot
+
+.PHONY: $(DOMAIN).pot
+
+
+%.mo: %.po
+	$(MSGFMT) -o $@ $<
+
+%.po:
+	msginit -l $@ -o $@ -i $(DOMAIN).pot --no-translator
+
+CLEANFILES = $(foreach LANG, $(LANGS),$(LANG).mo)
+
+clean-local:
+	$(RM) -r $(LANGS)
+
+install-data-am: default
+	for lang in $(LANGS); do \
+		mkdir -p $(DESTDIR)$(installdir)/locale/$$lang/LC_MESSAGES; \
+		cp $$lang.mo $(DESTDIR)$(installdir)/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+	done