Remove warning messages.

diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb
index 220781a..b91daf1 100644 (file)
--- a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb
+++ b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb
@@ -1,6 +1,7 @@
 SUMMARY = "A set of tools for CD recording"
 HOMEPAGE = "http://www.cdrkit.org"
 SUMMARY = "A set of tools for CD recording"
 HOMEPAGE = "http://www.cdrkit.org"

-DEPENDS = "libcap bzip2"
+DEPENDS = "libcap bzip2 zlib"
+RDEPENDS_${PN} += "perl"

 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
 PR = "r1"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
 PR = "r1"

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
index 7893df7..d5548dd 100755 (executable)
--- 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}"
 SRCDATE="20110215"
 BRANCH="master"
 PV = "experimental-git${SRCDATE}"

-PR = "r11"
+PR = "r12"

 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 


@@ -32,8 +32,8 @@ SRC_URI_append_vuplus = " \
        file://enigma2_plugins_ac3lipsync_dolby.patch \
        file://enigma2_plugins_autoresolution_fix.patch \
        file://enigma2_plugins_fancontrol2.patch \
        file://enigma2_plugins_ac3lipsync_dolby.patch \
        file://enigma2_plugins_autoresolution_fix.patch \
        file://enigma2_plugins_fancontrol2.patch \

-       file://enigma2_plugins_gst_plugins_pkgname.patch \

        file://enigma2_plugins_gst10_support.patch \
        file://enigma2_plugins_gst10_support.patch \

+       file://enigma2_plugins_fix_depends_pkgname.patch \

        file://dreamboxweb.png \
        file://dreamboxwebtv.png \
        file://favicon.ico \
        file://dreamboxweb.png \
        file://dreamboxwebtv.png \
        file://favicon.ico \


@@ -49,8 +49,16 @@ inherit autotools-brokensep pythonnative pkgconfig
 
 S = "${WORKDIR}/git"
 
 
 S = "${WORKDIR}/git"
 

-DEPENDS = "python-pyopenssl python-gdata streamripper python-mutagen python-daap"
-DEPENDS += "enigma2"
+DEPENDS = " \
+       enigma2 \
+       python-pyopenssl \
+       python-gdata \
+       streamripper \
+       python-mutagen \
+       python-daap \
+       enigma2-plugin-extensions-openwebif \
+       gstreamer1.0-plugins-bad \
+       "

 
 def modify_po():
     import os
 
 def modify_po():
     import os

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/enigma2_plugins_fix_depends_pkgname.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/enigma2_plugins_fix_depends_pkgname.patch
new file mode 100644 (file)
index 0000000..26774b3
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/enigma2_plugins_fix_depends_pkgname.patch
@@ -0,0 +1,63 @@
+diff --git a/dreammediathek/CONTROL/control b/dreammediathek/CONTROL/control
+index 20a5b16..d11d7a5 100644
+--- a/dreammediathek/CONTROL/control
++++ b/dreammediathek/CONTROL/control
+@@ -3,4 +3,4 @@ Version: 20110131
+ Description: Play rtp Stream on your Dreambox 
+ Maintainer: nixkoenner@newnigma2.to
+ Homepage: http://www.newnigma2.to
+-Depends: enigma2 (>> 2.6git20090409), twisted-web
++Depends: enigma2 (>> 2.6git20090409), python-twisted-web
+diff --git a/lastfm/CONTROL/control b/lastfm/CONTROL/control
+index 6255b30..672d6e1 100644
+--- a/lastfm/CONTROL/control
++++ b/lastfm/CONTROL/control
+@@ -2,4 +2,4 @@ Package: enigma2-plugin-extensions-lastfm
+ Version: 0.4-20070408-r0
+ Description: a client to use last.fm, the social music revolution 
+ Maintainer: 3c5x9 <3c5x9@gmx.net>
+-Depends: enigma2 (>> 1.0git20070908), python-twisted-web, gst-plugin-neonhttpsrc, python-crypt
++Depends: enigma2 (>> 1.0git20070908), python-twisted-web, gstreamer1.0-plugins-bad-neonhttpsrc, python-crypt
+diff --git a/mytube/CONTROL/control b/mytube/CONTROL/control
+index 43f3093..1ed65f1 100644
+--- a/mytube/CONTROL/control
++++ b/mytube/CONTROL/control
+@@ -3,4 +3,4 @@ Version: 1.0-20090420-r0
+ Description: MyTube Player for direct playback of Youtube movies
+ Maintainer: Mladen Horvat <acid-burn@opendreambox.org>
+ Homepage: http://www.dream-multimedia-tv.de/
+-Depends: enigma2 (>= 2.6git20090520), python-twisted-web, python-gdata, gst-plugin-flv
++Depends: enigma2 (>= 2.6git20090520), python-twisted-web, python-gdata, gstreamer1.0-plugins-good-flv
+diff --git a/netcaster/CONTROL/control b/netcaster/CONTROL/control
+index 0e69a47..f3d72d1 100644
+--- a/netcaster/CONTROL/control
++++ b/netcaster/CONTROL/control
+@@ -3,4 +3,4 @@ Version: 0.1-20072203-r0
+ Description: Player for Network and Internet Streams
+ Maintainer: 3c5x9 <3c5x9@gmx.net>
+ Homepage: http://enigma2-plugins.schwerkraft.elitedvb.net/
+-Depends: enigma2 (>= 1.0git20071803), gst-plugin-neonhttpsrc (>= 0.10.4), gst-plugin-icydemux (>= 0.10.14)
++Depends: enigma2 (>= 1.0git20071803), gstreamer1.0-plugins-bad-neonhttpsrc (>= 0.10.4), gstreamer1.0-plugins-good-icydemux (>= 0.10.14)
+diff --git a/podcast/CONTROL/control b/podcast/CONTROL/control
+index 4bce2da..9ab1c85 100644
+--- a/podcast/CONTROL/control
++++ b/podcast/CONTROL/control
+@@ -3,4 +3,4 @@ Version: 0.1-r0
+ Description: Stream podcasts
+ Maintainer: Nabil Hanna <nabil1978@web.de>
+ Homepage: http://www.lt-forums.org/ali
+-Depends: enigma2 (>= 2.6git20090520), gst-plugin-neonhttpsrc, python-twisted-web
++Depends: enigma2 (>= 2.6git20090520), gstreamer1.0-plugins-bad-neonhttpsrc, python-twisted-web
+diff --git a/zdfmediathek/src/plugin.py b/zdfmediathek/src/plugin.py
+index b46d12f..b4fd3f5 100644
+--- a/zdfmediathek/src/plugin.py
++++ b/zdfmediathek/src/plugin.py
+@@ -46,7 +46,7 @@ PLAY_MP4 = False
+ if not deviceName.startswith("dm7025"):
+       try:
+               #FIXMEE add better check ! ? !
+-              for line in popen("opkg info gst-plugin-rtsp").readlines():
++              for line in popen("opkg info gstreamer1.0-plugins-good-rtsp").readlines():
+                       if line.find("Version: ") != -1:
+                               if line[9:] >= "0.10.23-r7.1":
+                                       PLAY_MP4 = True

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/enigma2_plugins_gst_plugins_pkgname.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/enigma2_plugins_gst_plugins_pkgname.patch
deleted file mode 100644 (file)
index d12bc61..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins/enigma2_plugins_gst_plugins_pkgname.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/lastfm/CONTROL/control b/lastfm/CONTROL/control
-index 6255b30..d955011 100644
---- a/lastfm/CONTROL/control
-+++ b/lastfm/CONTROL/control
-@@ -2,4 +2,4 @@ Package: enigma2-plugin-extensions-lastfm
- Version: 0.4-20070408-r0
- Description: a client to use last.fm, the social music revolution 
- Maintainer: 3c5x9 <3c5x9@gmx.net>
--Depends: enigma2 (>> 1.0git20070908), python-twisted-web, gst-plugin-neonhttpsrc, python-crypt
-+Depends: enigma2 (>> 1.0git20070908), python-twisted-web, gstreamer1.0-plugins-bad-neonhttpsrc, python-crypt
-diff --git a/mytube/CONTROL/control b/mytube/CONTROL/control
-index 43f3093..6f343c9 100644
---- a/mytube/CONTROL/control
-+++ b/mytube/CONTROL/control
-@@ -3,4 +3,4 @@ Version: 1.0-20090420-r0
- Description: MyTube Player for direct playback of Youtube movies
- Maintainer: Mladen Horvat <acid-burn@opendreambox.org>
- Homepage: http://www.dream-multimedia-tv.de/
--Depends: enigma2 (>= 2.6git20090520), python-twisted-web, python-gdata, gst-plugin-flv
-+Depends: enigma2 (>= 2.6git20090520), python-twisted-web, python-gdata, gstreamer1.0-plugins-good-flv
-diff --git a/netcaster/CONTROL/control b/netcaster/CONTROL/control
-index 0e69a47..83ac563 100644
---- a/netcaster/CONTROL/control
-+++ b/netcaster/CONTROL/control
-@@ -3,4 +3,4 @@ Version: 0.1-20072203-r0
- Description: Player for Network and Internet Streams
- Maintainer: 3c5x9 <3c5x9@gmx.net>
- Homepage: http://enigma2-plugins.schwerkraft.elitedvb.net/
--Depends: enigma2 (>= 1.0git20071803), gst-plugin-neonhttpsrc (>= 0.10.4), gst-plugin-icydemux (>= 0.10.14)
-+Depends: enigma2 (>= 1.0git20071803), gstreamer1.0-plugins-bad-neonhttpsrc (>= 0.10.4), gstreamer1.0-plugins-good-icydemux (>= 0.10.14)
-diff --git a/podcast/CONTROL/control b/podcast/CONTROL/control
-index 4bce2da..24209f5 100644
---- a/podcast/CONTROL/control
-+++ b/podcast/CONTROL/control
-@@ -3,4 +3,4 @@ Version: 0.1-r0
- Description: Stream podcasts
- Maintainer: Nabil Hanna <nabil1978@web.de>
- Homepage: http://www.lt-forums.org/ali
--Depends: enigma2 (>= 2.6git20090520), gst-plugin-neonhttpsrc, python-twisted-web
-+Depends: enigma2 (>= 2.6git20090520), gstreamer1.0-plugins-good-neonhttpsrc, pythons-twisted-web
-diff --git a/zdfmediathek/src/plugin.py b/zdfmediathek/src/plugin.py
-index b46d12f..3b27d56 100644
---- a/zdfmediathek/src/plugin.py
-+++ b/zdfmediathek/src/plugin.py
-@@ -46,7 +46,7 @@ PLAY_MP4 = False
- if not deviceName.startswith("dm7025"):
-       try:
-               #FIXMEE add better check ! ? !
--              for line in popen("opkg info gst-plugin-rtsp").readlines():
-+              for line in popen("opkg info gstreamer1.0-plugins-good-rtsp").readlines():
-                       if line.find("Version: ") != -1:
-                               if line[9:] >= "0.10.23-r7.1":
-                                       PLAY_MP4 = True

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 6774be2..dd25ec4 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -28,6 +28,23 @@ DEPENDS = " \
         util-linux \
        "
 
         util-linux \
        "
 

+DEPENDS += " \
+       wireless-tools \
+       wpa-supplicant \
+       python-twisted \
+       curlftpfs \
+       fuse \
+       virtual/kernel \
+       aio-grab \
+       librtmp \
+       cdrkit \
+       libcddb \
+       libcdio \
+       avahi \
+       gstreamer1.0-plugins-good \
+       gstreamer1.0-plugins-bad \
+       "
+

 RDEPENDS_${PN} = " \
        alsa-conf \
         ethtool \
 RDEPENDS_${PN} = " \
        alsa-conf \
         ethtool \


@@ -172,7 +189,7 @@ RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-
 RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils"
 
 RDEPENDS_enigma2-plugin-extensions-streamtv = " \
 RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils"
 
 RDEPENDS_enigma2-plugin-extensions-streamtv = " \

-       librtmp1 \
+       librtmp \

        ${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-bad-rtmp", "gst-plugins-bad-rtmp", d)} \
 "
 
        ${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-bad-rtmp", "gst-plugins-bad-rtmp", d)} \
 "
 


@@ -189,7 +206,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 "
 
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 "
 
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"

-RDEPENDS_enigma2-plugin-systemplugins-netdrive = "curlftpfs kernel-module-fuse libfuse2"
+RDEPENDS_enigma2-plugin-systemplugins-netdrive = "curlftpfs kernel-module-fuse fuse"

 
 RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd-utils-nanddump mtd-utils-ubinize"
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd-utils-nanddump mtd-utils-ubinize"
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"


@@ -319,3 +336,9 @@ python populate_packages_prepend() {
     do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
 }
 
     do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
 }
 

+INSANE_SKIP_${PN} = "already-stripped"
+INSANE_SKIP_enigma2-plugin-extensions-webbrowser = "build-deps"
+INSANE_SKIP_enigma2-plugin-extensions-modem = "build-deps"
+
+
+