Merge remote-tracking branch 'upstream/Developer' into python3

ChangeLog

@@ -1318,3 +1318,26 @@ openvix: developer 6.6.007.015
 openvix: developer 6.6.007.016
 openvix: developer 6.6.007.017
 openvix: developer 6.6.007.018
+openvix: developer 6.6.007.019
+openvix: developer 6.6.007.020
+openvix: developer 6.6.007.021
+openvix: developer 6.6.007.022
+openvix: developer 6.6.008.001
+openvix: developer 6.6.009.001
+openvix: developer 6.6.009.002
+openvix: developer 6.6.009.003
+openvix: developer 6.6.009.004
+openvix: developer 6.6.009.005
+openvix: developer 6.6.010.001
+openvix: developer 6.6.011.001
+openvix: developer 6.6.011.002
+openvix: developer 6.6.011.003
+openvix: developer 6.6.011.004
+openvix: developer 6.6.011.005
+openvix: developer 6.6.011.006
+openvix: developer 6.6.011.007
+openvix: developer 6.6.012.001
+openvix: developer 6.6.012.002
+openvix: developer 6.6.013.001
+openvix: developer 6.6.013.002
+openvix: developer 6.6.013.003

README.md

@@ -47,21 +47,22 @@
     sudo sysctl -n -w fs.inotify.max_user_watches=524288
 
 ----------
-5. Disable apparmor profile
-   Currently due to this Ubuntu/bitbake issue..https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/2056555
-   This command must be entered after every restart of the build PC....
+5 - Disable apparmor profile
+
+    Currently due to this Ubuntu/bitbake issue: https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/2056555
+    This command must be entered after every restart of the build PC.
 
-   sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+    sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
 ----------
 6 - Add user openvixbuilder
 
     sudo adduser openvixbuilder
 
 ----------
-7. Add your git user and email
+7 - Add your git user and email
 
-     git config --global user.email "you@example.com"
+    git config --global user.email "you@example.com"
 
     git config --global user.name "Your Name"
 
@@ -109,13 +110,14 @@
 16 - Update site.conf
 
     - BB_NUMBER_THREADS, PARALLEL_MAKE set to number of threads supported by the CPU
-    - add/modify DL_DIR = " location for build sources " to point to a location where you can save derived build sources,
-    this will reduce build time in fetching these sources again.
+    - add/modify DL_DIR = " location for build sources " to point to a location where you can save 
+      derived build sources, this will reduce build time in fetching these sources again.
+    - Avoid wasting disk space creating spdx packages: INHERIT:remove = "create-spdx"
 
 ----------
 17 - Building image with feeds  e.g.:-
 
-	MACHINE=vuultimo4k DISTRO=openvix DISTRO_TYPE=release make image
+    MACHINE=vuultimo4k DISTRO=openvix DISTRO_TYPE=release make image
 
 ----------
 18 - Building an image without feeds (Build time 1-2h)

configure.ac

@@ -429,7 +429,6 @@ fi
 
 if test "$BOXTYPE" == "dm920"; then
 	AC_DEFINE(DM920, 1, [Dreambox hardware])
-	AC_DEFINE(USE_ALTERNATE_CA_HANDLING, 1,[define it so to use additional ca device freeing])
 fi
 
 if test `echo "$BOXTYPE" | cut -b 1-2` == "gb"; then
@@ -486,7 +485,6 @@ fi
 if test "$BOXTYPE" == "pulse4k" -o "$BOXTYPE" == "pulse4kmini" -o "$BOXTYPE" == "hd61"; then
 	AC_DEFINE(HAVE_HISILICON, 1,[define add HISILICON chip])
 	AC_DEFINE(FORCE_NO_BLENDING_ACCELERATION, 1,[define when the framebuffer acceleration has alphablending support, but detection slow down all])
-	AC_DEFINE(USE_ALTERNATE_CA_HANDLING, 1,[define it so to use additional ca device freeing])
 fi
 
 if test "$BOXTYPE" == "u5" -o "$BOXTYPE" == "u5pvr" -o "$BOXTYPE" == "u51" -o "$BOXTYPE" == "u52" -o "$BOXTYPE" == "u53" -o "$BOXTYPE" == "u532" -o "$BOXTYPE" == "u533" -o "$BOXTYPE" == "u54" -o "$BOXTYPE" == "u55" -o "$BOXTYPE" == "u56" -o "$BOXTYPE" == "u57" -o "$BOXTYPE" == "u571" -o "$BOXTYPE" == "u41" -o "$BOXTYPE" == "u42" -o "$BOXTYPE" == "u43"; then
@@ -605,7 +603,7 @@ CXXFLAGS="$CXXFLAGS -Wall -Wextra\
 	-Wunsafe-loop-optimizations -Wpointer-arith \
 	-Wfloat-equal -Wlogical-op \
 	-Wno-error=cast-align=strict -Wno-error=ignored-qualifiers \
-	-Wno-error=cast-function-type \
+	-Wno-error=cast-function-type -Wno-error=deprecated-declarations \
 	-Wno-error=stringop-truncation -Wno-error=shadow -Wno-error=cast-qual \
 	-Wno-error=aggregate-return -Wno-error=missing-field-initializers \
 	-Wno-error=packed -Wno-error=vla -Wno-error=clobbered -Wno-error=unused-parameter \

data/display390/skin_display.xml

@@ -156,6 +156,17 @@
 		<panel name="SummaryTunerStatusPanel" />
 		<panel name="SummaryClockPanel" />
 	</screen>
+	<screen name="CatchupPlayerSummary" position="fill"> 
+		<widget source="session.CurrentService" render="Label" position="20,50" size="360,170" font="FdLcD;40" halign="center" valign="bottom" zPosition="2">
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="parent.progress_summary" render="Progress" position="20,150" size="360,16" borderColor="white" borderWidth="2" zPosition="2"/>
+		<widget source="parent.time_elapsed_summary" render="Label" position="20,180" size="240,40" font="FdLcD;32" halign="left" valign="center"/>
+		<widget source="parent.time_remaining_summary" render="Label" position="140,180" size="240,40" font="FdLcD;32" halign="right" valign="center"/>
+		<widget source="global.CurrentTime" render="Label" position="240,10" size="150,50" font="FdLcD;40" halign="right">
+			<convert type="ClockToText">Default</convert>
+		</widget>
+	</screen>
 	<screen name="MovieContextMenuSummary" position="0,0" size="400,240">
 		<widget source="parent.Title" render="Label" position="0,38" size="400,45" font="FdLcD;40" halign="left" valign="top" noWrap="1" />
 		<widget source="selected" render="Label" position="0,86" size="400,28" font="FdLcD;22" halign="left" valign="top" />

data/display400/skin_display.xml

@@ -157,6 +157,17 @@
 		<panel name="SummaryTunerStatusPanel" />
 		<panel name="SummaryClockPanel" />
 	</screen>
+	<screen name="CatchupPlayerSummary" position="fill"> 
+		<widget source="session.CurrentService" render="Label" position="20,50" size="360,170" font="FdLcD;40" halign="center" valign="bottom" zPosition="2">
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="parent.progress_summary" render="Progress" position="20,150" size="360,16" borderColor="white" borderWidth="2" zPosition="2"/>
+		<widget source="parent.time_elapsed_summary" render="Label" position="20,180" size="240,40" font="FdLcD;32" halign="left" valign="center"/>
+		<widget source="parent.time_remaining_summary" render="Label" position="140,180" size="240,40" font="FdLcD;32" halign="right" valign="center"/>
+		<widget source="global.CurrentTime" render="Label" position="240,10" size="150,50" font="FdLcD;40" halign="right">
+			<convert type="ClockToText">Default</convert>
+		</widget>
+	</screen>
 	<screen name="MovieContextMenuSummary" position="0,0" size="400,240">
 		<widget source="parent.Title" render="Label" position="0,38" size="400,45" font="FdLcD;40" halign="left" valign="top" noWrap="1" />
 		<widget source="selected" render="Label" position="0,86" size="400,28" font="FdLcD;22" halign="left" valign="top" />

data/display480/skin_display.xml

@@ -357,6 +357,18 @@
 		<panel name="Yellow_Clock_Panel" />
 	</screen>
 
+	<screen name="CatchupPlayerSummary" position="fill"> 
+		<widget source="session.CurrentService" render="Label" position="20,50" size="440,170" font="FdLcD;40" halign="center" valign="bottom" zPosition="2">
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="parent.progress_summary" render="Progress" position="20,230" size="440,16" borderColor="white" borderWidth="2" zPosition="2"/>
+		<widget source="parent.time_elapsed_summary" render="Label" position="20,265" size="320,40" font="FdLcD;32" halign="left" valign="center"/>
+		<widget source="parent.time_remaining_summary" render="Label" position="220,265" size="240,40" font="FdLcD;32" halign="right" valign="center"/>
+		<widget source="global.CurrentTime" render="Label" position="310,10" size="150,50" font="FdLcD;40" halign="right">
+			<convert type="ClockToText">Default</convert>
+		</widget>
+	</screen>
+
 	<screen name="MovieContextMenuSummary" position="0,0" size="480,320">
 		<widget source="parent.Title" render="Label" position="top" size="*,14" font="FdLcD;12" halign="left" valign="top" noWrap="1" />
 		<widget source="selected" render="Label" position="top" size="*,32" font="FdLcD;16" />

data/display800/skin_display_templates.xml

@@ -327,7 +327,7 @@
 		<widget source="selected" render="Label" position="40,270" size="720,200" font="FdLcDLight;60" halign="center" valign="top" />
 	</screen>
 
-	<!-- MOVIE PLAYER-->
+	<!-- MOVIE PLAYER -->
 	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="800,480"> 
 		<widget source="session.CurrentService" render="Label" position="40,90" size="720,260" font="FdLcD;75" foregroundColor="white" halign="center" valign="center" zPosition="2">
 			<convert type="ServiceName">Name</convert>
@@ -348,6 +348,18 @@
 		</widget>
 	</screen>
 
+	<screen name="CatchupPlayerSummary" position="0,0" size="800,480" resolution="800,480"> 
+		<widget source="session.CurrentService" render="Label" position="40,90" size="720,260" font="FdLcD;30" foregroundColor="white" halign="center" valign="center" zPosition="2">
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="parent.progress_summary" render="Progress" position="40,340" size="720,30" borderColor="white" borderWidth="2" zPosition="2"/>
+		<widget source="parent.time_elapsed_summary" render="Label" position="40,385" size="320,70" font="FdLcD;28" foregroundColor="white" halign="left" valign="center"/>
+		<widget source="parent.time_remaining_summary" render="Label" position="440,385" size="320,70" font="FdLcD;28" foregroundColor="white" halign="right" valign="center"/>
+		<widget source="global.CurrentTime" render="Label" position="e-440,10" size="400,84" font="FdLcD;35" halign="right">
+			<convert type="ClockToText">Default</convert>
+		</widget>
+	</screen>
+
 	<!-- NUMBERZAP -->
 	<screen name="NumberZapSummary" position="0,0" size="800,480">
 		<widget source="parent.servicename_summary" render="Label" position="40,50" size="720,110" foregroundColor="white" font="FdLcD;85" halign="center" valign="center" zPosition="2" />

data/keymap.xml

@@ -965,7 +965,7 @@
 
 	<map context="TvRadioActions">
 		<key id="KEY_TV" mapto="keyTV" flags="m" />
-		<key id="KEY_TV2" mapto="keyTV" flags="m" />
+		<key id="KEY_TV2" mapto="toggleTvRadio" flags="m" />
 		<key id="KEY_RADIO" mapto="keyRadio" flags="m" />
 		<key id="KEY_AUDIO" mapto="audio" flags="m" />
 	</map>

data/menu.xml

@@ -164,7 +164,7 @@ self.session.open(SABnzbdSetupScreen)
 		<menu key="rec" level="1" text="Recordings, Playback &amp; Timeshift" weight="11">
 			<item key="recording_setup" level="0" text="Recording" weight="10"><screen module="Recordings" screen="RecordingSettings" /></item>
 			<item key="playback_setup" level="0" text="Playback" weight="12"><setup id="playback" /></item>
-			<item key="timshift_setup" level="0" text="Timeshift" weight="15"><screen module="Timeshift" screen="TimeshiftSettings" /></item>
+			<item key="timeshift_setup" level="0" text="Timeshift" weight="15"><screen module="Timeshift" screen="TimeshiftSettings" /></item>
 		</menu>
 
 		<!-- Menu / Setup / Time Settings -->

data/setup.xml

@@ -17,7 +17,7 @@
 	<setup key="usage" title="Customize settings">
 		<item level="0" text="Setup mode" description="Choose which level of menu/settings to display. 'Expert' level shows all items.">config.usage.setup_level</item>
 		<item level="0" text="Task warning on shutdown" description="On shutdown/restart warn about any pending jobs being carried out in the background.">config.usage.task_warning</item>
-		<item level="0" text="Boot Logo Identification" description="Identify image version on bootlogo.mvi.">config.usage.bootlogo_identify</item>		
+		<item level="0" text="Boot Logo Identification" description="Identify image version on bootlogo.mvi.">config.usage.bootlogo_identify</item>
 		<item level="1" text="Enable teletext caching" description="When enabled, teletext pages will be cached, allowing faster access.">config.usage.enable_tt_caching</item>
 		<item level="2" text="Include ECM in http streams" description="ECM data will be included in the stream. This enables a client receiver to decode it.">config.streaming.stream_ecm</item>
 		<item level="2" text="Descramble sending http streams" description="When enabled, http streams are descrambled on the server side. The (remote) client receiver does not have to do descrambling.">config.streaming.descramble</item>
@@ -28,6 +28,7 @@
 		<item level="2" text="Enable new GStreamer playback" description="If enabled, the new GStreamer playback engine will be used.">config.misc.usegstplaybin3</item>
 		<item level="2" text="Remote control source*" requires="DeveloperImage" description="In Developer images only. Allows swapping between oe-alliance/branding or oe-alliance/remotes for button position mapping and rc graphic.">config.misc.RCSource</item>
 		<item level="0" text="Force alpha blending" description="Alpha blending is the process of combining an image with a background to create the appearance of partial or full transparency. 'Always' may cause receivers that don't support hardware acceleration to render images more slowly. Also some skins may show strange side effects.">config.skin.pixmap_force_alphablending</item>
+		<item level="0" text="Picon type priority" description="Set the lookup priority when searching for picons. If all your picons are png set to 'png only' to save on lookup time.">config.usage.picon_lookup_priority</item>
 	</setup>
 	<setup key="streamrelay" title="Stream Relay Settings">
 		<item level="2" text="Stream Relay url" description="The IP address of the streamrelay server that is used to descramble services that can only be decrypted via stream relay.">config.misc.softcam_streamrelay_url</item>
@@ -245,6 +246,14 @@
 		<item level="2" text="Offline decode delay (ms)" description="Configure the offline decoding delay (in milliseconds). The configured delay is observed at each control word parity change.">config.recording.offline_decode_delay</item>
 
 	</setup>
+	<setup key="HDMIRecord" title="HDMI Recording Settings" showOpenWebif="1">
+		<item level="0" text="Bitrate" description="The bitrate of the video encoder. Larger value improves quality and increases file size.">config.hdmirecord.bitrate</item>
+		<item level="0" text="Width" description="The width of the picture. The input will be scaled to match this value.">config.hdmirecord.width</item>
+		<item level="0" text="Height" description="The height of the picture. The input will be scaled to match this value.">config.hdmirecord.height</item>
+		<item level="0" text="Frame rate" description="Recording frame rate, ideally matching source frame rate or integer multiple. If in doubt, set to 60.">config.hdmirecord.framerate</item>
+		<item level="2" text="Interlaced" description="In most cases this should be set to No. Only enable if you have a very specific need.">config.hdmirecord.interlaced</item>
+		<item level="1" text="Aspect ratio" description="The aspect ratio of the recording.">config.hdmirecord.aspectratio</item>
+	</setup>
 	<setup key="harddisk" title="HDD settings">
 		<item level="0" text="Hard disk standby after" description="Configure duration of inactivity before the hard disk drive goes to standby">config.usage.hdd_standby</item>
 	</setup>

data/videowizard.xml

@@ -4,6 +4,7 @@ from Components.AVSwitch import iAVSwitch as avSwitch
 	<step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext">
 		<condition>
 self.condition = len(self.listInputChannels()) > 1
+self.selection = "HDMI"
 if len(self.listInputChannels()) == 1:
 	self.selection = "HDMI"
 	self.inputSelectionMoved()