X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2.bb;h=1c5492f5c6cc297fac60780a5c22780531323294;hp=8fadfd6a4606242143e7f37e7b806f9c56f027ea;hb=a2c7a260efd3947171e3110efb2c6c31bb79fec2;hpb=a6b296b9f0504de63a1a852ff472a8ec4197c4df diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 8fadfd6..1c5492f 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -6,7 +6,7 @@ DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \ dreambox-dvbincludes freetype libdvbsi++ python swig-native \ libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \ gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi \ - hostap-daemon bridge-utils ntfs-3g dosfstools \ + hostap-daemon bridge-utils ntfs-3g dosfstools util-linux \ " RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \ @@ -16,11 +16,12 @@ RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugin gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \ gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \ gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \ + gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-bad-faad \ " -RDEPENDS = "python-codecs python-core python-lang python-re python-threading \ +RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \ python-xml python-fcntl python-stringold python-pickle python-netclient \ - glibc-gconv-iso8859-15 ethtool \ + glibc-gconv-iso8859-15 ethtool parted \ ${RDEPENDS_GST} \ " @@ -77,12 +78,18 @@ DEPENDS += "opera-hbbtv" RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv" DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data" -RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams kernel-module-usbserial" +RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams \ + kernel-module-ppp-async kernel-module-ppp-deflate kernel-module-ppp-synctty kernel-module-ppp-generic kernel-module-usbserial \ +" 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-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd-utils-nanddump mtd-utils-ubinize" +RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd" PN = "enigma2" -PR = "r43" +PR = "r80" SRCDATE = "20121128" #SRCDATE is NOT used by git to checkout a specific revision @@ -105,7 +112,10 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \ file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \ file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \ - file://enigma2_wirelessaccesspoint.patch;patch=1;pnum=1 \ + file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \ + file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \ + file://enigma2_vuplus_fix_standby_name.patch \ + file://enigma2_vuplus_fix_standby_name_skin.patch \ file://MyriadPro-Regular.otf \ file://MyriadPro-Semibold.otf \ file://MyriadPro-SemiboldIt.otf \ @@ -114,7 +124,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t file://number_key \ " -SRC_URI_append = " ${@base_contains("MACHINE_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}" +SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}" def change_po(): import os @@ -174,10 +184,10 @@ do_compile_prepend_vuplus() { } EXTRA_OECONF = " \ - ${@base_contains("MACHINE_FEATURES", "display-text-vfd", "--with-display-text-vfd" , "", d)} \ - ${@base_contains("MACHINE_FEATURES", "display-graphic-vfd", "--with-display-graphic-vfd" , "", d)} \ - ${@base_contains("MACHINE_FEATURES", "right-half-vfd-skin", "--with-set-right-half-vfd-skin" , "", d)} \ - ${@base_contains("MACHINE_FEATURES", "enable-rc-kbd", "--with-remote-keyboard" , "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "display-text-vfd", "--with-display-text-vfd" , "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "display-graphic-vfd", "--with-display-graphic-vfd" , "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "right-half-vfd-skin", "--with-set-right-half-vfd-skin" , "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "enable-rc-kbd", "--with-remote-keyboard" , "", d)} \ BUILD_SYS=${BUILD_SYS} \ HOST_SYS=${HOST_SYS} \ STAGING_INCDIR=${STAGING_INCDIR} \ @@ -194,3 +204,4 @@ python populate_packages_prepend() { RCONFLICTS_${PN} = "dreambox-keymaps" RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)" +