From: hschang Date: Tue, 13 May 2014 05:14:11 +0000 (+0900) Subject: [dvbapp] cleanup dvbapp and patches, plugins X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=commitdiff_plain;h=59ff08b73cdbe6114eccc410d0223228a2e9e09c [dvbapp] cleanup dvbapp and patches, plugins - remove comments - remove factorytest, vuplusevent - fix skin of wirelessLanSetup --- diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 138da34..ec2e2f3 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -89,7 +89,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd" PN = "enigma2" -PR = "r69" +PR = "r70" SRCDATE = "20121128" #SRCDATE is NOT used by git to checkout a specific revision diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer.patch index 0c401a7..813687c 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer.patch +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer.patch @@ -1,5 +1,5 @@ diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py -index 75fba2d..da5ebd4 100644 +index 3fe66af..d366e6e 100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -7,7 +7,7 @@ from Screens.HelpMenu import HelpableScreen @@ -20,7 +20,7 @@ index 75fba2d..da5ebd4 100644 ALLOW_SUSPEND = True ENABLE_RESUME_SUPPORT = True -@@ -201,6 +201,10 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB +@@ -199,6 +199,10 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB InfoBarSeek.__init__(self, actionmap = "MediaPlayerSeekActions") @@ -31,7 +31,7 @@ index 75fba2d..da5ebd4 100644 self.onClose.append(self.delMPTimer) self.onClose.append(self.__onClose) -@@ -234,6 +238,14 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB +@@ -232,6 +236,14 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB iPlayableService.evUser+13: self["coverArt"].embeddedCoverArt }) @@ -46,7 +46,7 @@ index 75fba2d..da5ebd4 100644 def doNothing(self): pass -@@ -762,6 +774,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB +@@ -759,6 +771,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.playlist.updateList() if len(self.playlist) == 1: self.changeEntry(0) @@ -55,7 +55,7 @@ index 75fba2d..da5ebd4 100644 def addPlaylistParser(self, parser, extension): self.playlistparsers[extension] = parser diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py -index 07fbac8..6ca65e3 100755 +index 80cc196..7abb2ee 100755 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -957,14 +957,17 @@ class InfoBarSeek: @@ -130,12 +130,10 @@ index 07fbac8..6ca65e3 100755 elif self.isStateForward(seekstate): speed = seekstate[1] diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp -old mode 100644 -new mode 100755 -index be55d0c..7ce34c1 +index e79be09..ae4611c 100755 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp -@@ -235,6 +235,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref) +@@ -245,6 +245,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref) CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll); m_aspect = m_width = m_height = m_framerate = m_progressive = -1; @@ -143,7 +141,7 @@ index be55d0c..7ce34c1 m_state = stIdle; eDebug("eServiceMP3::construct!"); -@@ -517,6 +518,9 @@ RESULT eServiceMP3::unpause() +@@ -540,6 +541,9 @@ RESULT eServiceMP3::unpause() if (!m_gst_playbin || m_state != stRunning) return -1; @@ -153,7 +151,7 @@ index be55d0c..7ce34c1 gst_element_set_state(m_gst_playbin, GST_STATE_PLAYING); return 0; -@@ -552,7 +556,7 @@ RESULT eServiceMP3::seekToImpl(pts_t to) +@@ -575,7 +579,7 @@ RESULT eServiceMP3::seekToImpl(pts_t to) { /* convert pts to nanoseconds */ gint64 time_nanoseconds = to * 11111LL; @@ -162,7 +160,7 @@ index be55d0c..7ce34c1 GST_SEEK_TYPE_SET, time_nanoseconds, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) { -@@ -589,19 +593,23 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) +@@ -612,19 +616,23 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) if (!ratio) return seekRelative(0, 0); @@ -189,7 +187,7 @@ index be55d0c..7ce34c1 if ( ratio >= 0 ) { -@@ -619,7 +627,11 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) +@@ -642,7 +650,11 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) eDebug("eServiceMP3::trickSeek failed"); return -1; } @@ -203,12 +201,10 @@ index be55d0c..7ce34c1 } diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h -old mode 100644 -new mode 100755 -index f3cc6dd..07eb321 +index 41aec13..cb5b048 100644 --- a/lib/service/servicemp3.h +++ b/lib/service/servicemp3.h -@@ -265,6 +265,7 @@ private: +@@ -269,6 +269,7 @@ private: gint m_aspect, m_width, m_height, m_framerate, m_progressive; std::string m_useragent; RESULT trickSeek(gdouble ratio); diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer_subtitle.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer_subtitle.patch index 60e8f1a..a17d0a3 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer_subtitle.patch +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_mediaplayer_subtitle.patch @@ -1,8 +1,8 @@ diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp -index 7ce34c1..e620225 100755 +index ae4611c..99bb50d 100755 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp -@@ -235,6 +235,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref) +@@ -245,6 +245,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref) CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll); m_aspect = m_width = m_height = m_framerate = m_progressive = -1; @@ -11,7 +11,7 @@ index 7ce34c1..e620225 100755 m_cur_rate=1.0; m_state = stIdle; eDebug("eServiceMP3::construct!"); -@@ -572,6 +574,7 @@ RESULT eServiceMP3::seekTo(pts_t to) +@@ -595,6 +597,7 @@ RESULT eServiceMP3::seekTo(pts_t to) RESULT ret = -1; if (m_gst_playbin) { @@ -19,7 +19,7 @@ index 7ce34c1..e620225 100755 eSingleLocker l(m_subs_to_pull_lock); // this is needed to dont handle incomming subtitles during seek! if (!(ret = seekToImpl(to))) { -@@ -580,6 +583,13 @@ RESULT eServiceMP3::seekTo(pts_t to) +@@ -603,6 +606,13 @@ RESULT eServiceMP3::seekTo(pts_t to) m_decoder_time_valid_state = 0; m_subs_to_pull = 0; } @@ -33,7 +33,7 @@ index 7ce34c1..e620225 100755 } return ret; -@@ -593,6 +603,7 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) +@@ -616,6 +626,7 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) if (!ratio) return seekRelative(0, 0); @@ -41,7 +41,7 @@ index 7ce34c1..e620225 100755 eSingleLocker l(m_subs_to_pull_lock); GstEvent *s_event; -@@ -632,6 +643,13 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) +@@ -655,6 +666,13 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) m_decoder_time_valid_state = 0; m_subs_to_pull = 0; m_cur_rate=ratio; @@ -55,7 +55,7 @@ index 7ce34c1..e620225 100755 return 0; } -@@ -1572,10 +1590,17 @@ eAutoInitPtr init_eServiceFactoryMP3(eAutoInitNumbers::servi +@@ -1650,10 +1668,17 @@ eAutoInitPtr init_eServiceFactoryMP3(eAutoInitNumbers::servi void eServiceMP3::gstCBsubtitleAvail(GstElement *appsink, gpointer user_data) { @@ -77,7 +77,7 @@ index 7ce34c1..e620225 100755 } void eServiceMP3::gstTextpadHasCAPS(GstPad *pad, GParamSpec * unused, gpointer user_data) -@@ -1651,6 +1676,11 @@ void eServiceMP3::pullSubtitle() +@@ -1729,6 +1754,11 @@ void eServiceMP3::pullSubtitle() { GstBuffer *buffer; { @@ -90,10 +90,10 @@ index 7ce34c1..e620225 100755 --m_subs_to_pull; g_signal_emit_by_name (sink, "pull-buffer", &buffer); diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h -index 07eb321..f6282bf 100755 +index cb5b048..7e3f6a6 100644 --- a/lib/service/servicemp3.h +++ b/lib/service/servicemp3.h -@@ -266,6 +266,8 @@ private: +@@ -270,6 +270,8 @@ private: std::string m_useragent; RESULT trickSeek(gdouble ratio); double m_cur_rate; diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch index a75b32e..c7e78dd 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index c0601c7..b2f460d 100644 +index 332fc7a..ef30e71 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,16 @@ data/skin_default/menu/Makefile @@ -81,10 +81,10 @@ index 0000000..20f24d9 + *.png diff --git a/data/750S/skin.xml b/data/750S/skin.xml new file mode 100644 -index 0000000..541df3d +index 0000000..242a848 --- /dev/null +++ b/data/750S/skin.xml -@@ -0,0 +1,2892 @@ +@@ -0,0 +1,2894 @@ + + + @@ -2933,14 +2933,16 @@ index 0000000..541df3d + + + -+ ++ + -+ -+ ++ ++ + -+ -+ -+ ++ ++ ++ ++ ++ + + + @@ -3049,10 +3051,10 @@ index 0000000..9d4f458 + *.png diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml new file mode 100644 -index 0000000..3e35405 +index 0000000..c82df12 --- /dev/null +++ b/data/Vu_HD/skin.xml -@@ -0,0 +1,3492 @@ +@@ -0,0 +1,3494 @@ + + + @@ -6447,13 +6449,15 @@ index 0000000..3e35405 + + + -+ -+ -+ ++ ++ ++ + + -+ -+ ++ ++ ++ ++ + + + @@ -6559,15 +6563,15 @@ index 2f7e7c7..f81801a 100644 + MyriadPro-Semibold.otf \ + MyriadPro-SemiboldIt.otf diff --git a/data/skin.xml b/data/skin.xml -index ccd8eb7..9233610 100755 +index bbf4dd0..b99bdce 100755 --- a/data/skin.xml +++ b/data/skin.xml -@@ -150,11 +150,10 @@ +@@ -148,10 +148,10 @@ -- @@ -6652,29 +6656,28 @@ index fd33298..d8c1982 100644 png_destroy_read_struct(&png_ptr, &info_ptr,&end_info); fclose(fp); diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py -index 688fe50..7bc66dc 100755 +index 688fe50..86a8e0c 100755 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -2,6 +2,8 @@ from Tools.Profile import profile from Screen import Screen from Components.Button import Button -+# ikseong ++ +from Components.Label import Label from Components.ServiceList import ServiceList from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap from Components.MenuList import MenuList -@@ -731,6 +733,9 @@ class ChannelSelectionBase(Screen): +@@ -731,6 +733,8 @@ class ChannelSelectionBase(Screen): self["key_yellow"] = Button(_("Provider")) self["key_blue"] = Button(_("Favourites")) -+ # ikseong + self["etitle"] = Label(_('Channel Selection')) + self["list"] = ServiceList() self.servicelist = self["list"] -@@ -876,25 +881,51 @@ class ChannelSelectionBase(Screen): +@@ -876,25 +880,51 @@ class ChannelSelectionBase(Screen): pos = titleStr.find(']') if pos == -1: pos = titleStr.find(')') @@ -6692,7 +6695,7 @@ index 688fe50..7bc66dc 100755 - if end_ref is not None: - if Len > 2: - titleStr += '/../' -+ # ikseong ++ + if config.skin.primary_skin.value =="750S/skin.xml": + if pos != -1: + titleStr = titleStr[:pos+1] @@ -6745,29 +6748,26 @@ index 688fe50..7bc66dc 100755 def moveUp(self): self.servicelist.moveUp() diff --git a/lib/python/Screens/FixedMenu.py b/lib/python/Screens/FixedMenu.py -index 0122346..c877a19 100644 +index 0122346..39b48ac 100644 --- a/lib/python/Screens/FixedMenu.py +++ b/lib/python/Screens/FixedMenu.py -@@ -20,3 +20,10 @@ class FixedMenu(Screen): +@@ -20,3 +20,8 @@ class FixedMenu(Screen): }) self["title"] = StaticText(title) -+ # ikseong + self["thistory"] = StaticText(title) + self["title0"] = StaticText('') + self["title1"] = StaticText('') + self["title2"] = StaticText('') -+ # + diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py -index 2a8801c..20403d8 100755 +index 2a8801c..fe5bcf0 100755 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py -@@ -22,6 +22,28 @@ from Screens.Setup import Setup, getSetupTitle +@@ -22,6 +22,27 @@ from Screens.Setup import Setup, getSetupTitle # read the menu mdom = xml.etree.cElementTree.parse(resolveFilename(SCOPE_SKIN, 'menu.xml')) -+# ikseong make menu title +class title_History: + def __init__(self): + self.thistory = '' @@ -6788,22 +6788,20 @@ index 2a8801c..20403d8 100755 + self.thistory = result[0] + '> ' + +t_history = title_History() -+# ++ class boundFunction: def __init__(self, fnc, *args): self.fnc = fnc -@@ -237,9 +259,41 @@ class Menu(Screen): +@@ -237,9 +258,39 @@ class Menu(Screen): a = a and _(a) if a is None: a = _(parent.get("text", "").encode("UTF-8")) -+ # ikseong - enter Main menu + else: + t_history.reset() + self["title"] = StaticText(a) self.menu_title = a -+ # ikseong make menu title + self["thistory"] = StaticText(t_history.thistory) + history_len = len(t_history.thistory) + self["title0"] = StaticText('') @@ -6834,24 +6832,20 @@ index 2a8801c..20403d8 100755 def keyNumberGlobal(self, number): print "menu keyNumber:", number # Calculate index -@@ -250,9 +304,15 @@ class Menu(Screen): +@@ -250,9 +301,11 @@ class Menu(Screen): self.okbuttonClick() def closeNonRecursive(self): -+ # ikseong for menu title + t_history.reducehistory() -+ # self.close(False) def closeRecursive(self): -+ # ikseong for menu title + t_history.reset() -+ # self.close(True) def createSummary(self): diff --git a/skin.py b/skin.py -index 19da203..f191530 100755 +index 19da203..e627ff8 100755 --- a/skin.py +++ b/skin.py @@ -50,7 +50,7 @@ def loadSkin(name, scope = SCOPE_SKIN): @@ -6863,11 +6857,10 @@ index 19da203..f191530 100755 profile("LoadSkin") try: -@@ -133,6 +133,36 @@ def loadPixmap(path, desktop): +@@ -133,6 +133,34 @@ def loadPixmap(path, desktop): raise SkinError("pixmap file %s not found!" % (path)) return ptr -+# ikseong +from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \ + getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent +pngcache = [] @@ -6889,23 +6882,22 @@ index 19da203..f191530 100755 +# print value + ptr = loadPixmap(value, desktop) + pngcache.append((value,ptr)) -+# ikseong ++ +try: + if config.skin.primary_skin.value == "750S/skin.xml" or config.skin.primary_skin.value == "Vu_HD/skin.xml": + cachemenu() +except: + print "fail cache main menu" -+# + def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1))): # and set attributes try: -@@ -151,7 +181,15 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) +@@ -151,7 +179,15 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) elif attrib == 'itemHeight': guiObject.setItemHeight(int(value)) elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"): - ptr = loadPixmap(value, desktop) # this should already have been filename-resolved. -+#ikseong ++ + global pngcache + ptr = None + for cvalue, cptr in pngcache: @@ -6913,7 +6905,7 @@ index 19da203..f191530 100755 + ptr=cptr + if ptr is None: + ptr = loadPixmap(value, desktop) # this should already have been filename-resolved. -+# ++ if attrib == "pixmap": guiObject.setPixmap(ptr) elif attrib == "backgroundPixmap": diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_vfd_mode.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_vfd_mode.patch index 7d873ee..d3d825a 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_vfd_mode.patch +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_vfd_mode.patch @@ -1,10 +1,10 @@ diff --git a/configure.ac b/configure.ac -index 27beb1e..8e007e1 100644 +index ef30e71..96742b5 100644 --- a/configure.ac +++ b/configure.ac -@@ -46,6 +46,28 @@ AC_CHECK_LIB([xmlccwrap], [exit], [LIBXMLCCWRAP_LIBS="-lxmlccwrap"], [AC_MSG_ERR - AC_SUBST(LIBXMLCCWRAP_LIBS) - AC_LANG_POP +@@ -65,6 +65,28 @@ if test x"$setrighthalfvfdskin" != xno ; then + fi + AM_CONDITIONAL(SET_RIGHT_HALF_VFD_SKIN, test x"$setrighthalfvfdskin" != xno) + +AC_ARG_WITH(display-text-vfd, @@ -32,7 +32,7 @@ index 27beb1e..8e007e1 100644 AS_HELP_STRING([--with-libsdl],[use libsdl, yes or no]), [with_libsdl=$withval],[with_libsdl=no]) diff --git a/lib/gdi/glcddc.cpp b/lib/gdi/glcddc.cpp -index 8ac8cd3..74f6afd 100755 +index 07bd910..74f6afd 100755 --- a/lib/gdi/glcddc.cpp +++ b/lib/gdi/glcddc.cpp @@ -34,13 +34,23 @@ void gLCDDC::exec(const gOpcode *o) @@ -52,7 +52,7 @@ index 8ac8cd3..74f6afd 100755 case gOpcode::flush: +#if defined(DISPLAY_GRAPHICVFD) && !defined(DISPLAY_TEXTVFD) // if (update) --#ifndef BUILD_VUPLUS /* ikseong */ +-#ifndef BUILD_VUPLUS lcd->update(); #else - ; @@ -63,21 +63,21 @@ index 8ac8cd3..74f6afd 100755 gDC::exec(o); break; diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp -index a5ac351..74bc3e0 100755 +index 04ed7e2..7464d1f 100755 --- a/lib/gdi/lcd.cpp +++ b/lib/gdi/lcd.cpp -@@ -183,9 +183,7 @@ eDBoxLCD *eDBoxLCD::getInstance() +@@ -189,9 +189,7 @@ eDBoxLCD *eDBoxLCD::getInstance() void eDBoxLCD::update() { --#ifdef BUILD_VUPLUS /* ikseong */ +-#ifdef BUILD_VUPLUS - return ; -#endif +#if defined(DISPLAY_GRAPHICVFD) && !defined(DISPLAY_TEXTVFD) if (lcdfd >= 0) { if (!is_oled || is_oled == 2) -@@ -227,5 +225,20 @@ void eDBoxLCD::update() +@@ -233,5 +231,20 @@ void eDBoxLCD::update() write(lcdfd, raw, 64*64); } } @@ -99,7 +99,7 @@ index a5ac351..74bc3e0 100755 +} +#endif /*defined(DISPLAY_TEXTVFD)*/ diff --git a/lib/gdi/lcd.h b/lib/gdi/lcd.h -index e7b4c2c..80a56f2 100644 +index e7b4c2c..80a56f2 100755 --- a/lib/gdi/lcd.h +++ b/lib/gdi/lcd.h @@ -36,6 +36,9 @@ public: diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc index 1319783..36840c4 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc @@ -2,7 +2,7 @@ SUMMARY = "Enigma2 Task for Vuplus" SECTION = "vuplus/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -INC_PR = "r15" +INC_PR = "r16" inherit task @@ -18,7 +18,6 @@ RDEPENDS_${PN} += " \ enigma2-plugins-meta \ enigma2-skins-meta \ enigma2-plugin-extensions-mediascanner \ - enigma2-plugin-systemplugins-factorytest \ enigma2-plugin-systemplugins-crashreport \ enigma2-plugin-extensions-remotestreamconvert \ enigma2-plugin-systemplugins-zappingmodeselection \ @@ -44,7 +43,6 @@ RDEPENDS_${PN} += " \ ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \ enigma2-plugin-extensions-mediaplayer \ enigma2-plugin-extensions-pictureplayer \ - enigma2-plugin-extensions-vuplusevent \ enigma2-plugin-systemplugins-skinselector \ enigma2-plugin-systemplugins-ui3dsetup \ enigma2-plugin-systemplugins-uipositionsetup \