Merge branch 'Developer' into python3

norhap · Dec 31, 2023 · ec359d5 · ec359d5
2 parents b868fc4 + 85d0015
commit ec359d5
Show file tree

Hide file tree

Showing 222 changed files with 5,227 additions and 5,952 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,79 @@
+{
+    "files.associations": {
+        "list": "cpp",
+        "algorithm": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "format": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "queue": "cpp",
+        "ranges": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stack": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "utility": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp"
+    }
+}
diff --git a/ChangeLog b/ChangeLog
@@ -1187,3 +1187,42 @@ openvix: developer 6.4.008.013
 openvix: developer 6.4.009.001
 openvix: developer 6.4.009.002
 openvix: developer 6.4.009.003
+openvix: developer 6.4.009.004
+openvix: developer 6.4.009.005
+openvix: developer 6.4.009.006
+openvix: developer 6.4.009.007
+openvix: developer 6.4.009.008
+openvix: developer 6.4.009.009
+openvix: developer 6.4.009.010
+openvix: developer 6.4.009.011
+openvix: developer 6.4.009.012
+openvix: developer 6.4.009.013
+openvix: developer 6.4.009.014
+openvix: developer 6.4.009.015
+openvix: developer 6.4.010.001
+openvix: developer 6.4.010.002
+openvix: developer 6.4.010.003
+openvix: developer 6.4.010.004
+openvix: developer 6.4.010.005
+openvix: developer 6.4.010.006
+openvix: developer 6.4.010.007
+openvix: developer 6.4.010.008
+openvix: developer 6.4.010.009
+openvix: developer 6.4.010.010
+openvix: developer 6.4.010.011
+openvix: developer 6.4.010.012
+openvix: developer 6.4.010.013
+openvix: developer 6.4.010.014
+openvix: developer 6.4.010.015
+openvix: developer 6.4.010.016
+openvix: developer 6.4.010.017
+openvix: developer 6.4.010.018
+openvix: developer 6.4.010.019
+openvix: developer 6.4.011.001
+openvix: developer 6.4.011.002
+openvix: developer 6.4.011.003
+openvix: developer 6.4.011.004
+openvix: developer 6.4.011.005
+openvix: developer 6.4.011.006
+openvix: developer 6.4.011.007
+openvix: developer 6.4.011.008
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@
 
 1 - Install packages on your buildserver
 
-    sudo apt-get install -y autoconf automake bison bzip2 chrpath coreutils cpio curl cvs debianutils default-jre default-jre-headless diffstat flex g++ gawk gcc gcc-12 gcc-multilib g++-multilib gettext git git-core gzip help2man info iputils-ping java-common libc6-dev libegl1-mesa libglib2.0-dev libncurses5-dev libperl4-corelibs-perl libproc-processtable-perl libsdl1.2-dev libserf-dev libtool libxml2-utils make ncurses-bin patch perl pkg-config psmisc python3 python3-git python3-jinja2 python3-pexpect python3-pip python-setuptools qemu quilt socat sshpass subversion tar texi2html texinfo unzip wget xsltproc xterm xz-utils zip zlib1g-dev zstd fakeroot lz4
+    sudo apt-get install -y autoconf automake bison bzip2 chrpath coreutils cpio curl cvs debianutils default-jre default-jre-headless diffstat flex g++ gawk gcc gcc-12 gcc-multilib g++-multilib gettext git git-core gzip help2man info iputils-ping java-common libc6-dev libegl1-mesa libglib2.0-dev libncurses5-dev libperl4-corelibs-perl libproc-processtable-perl libsdl1.2-dev libserf-dev libtool libxml2-utils make ncurses-bin patch perl pkg-config psmisc python3 python3-git python3-jinja2 python3-pexpect python3-pip python-setuptools qemu quilt socat sshpass subversion tar texi2html texinfo unzip wget xsltproc xterm xz-utils zip zlib1g-dev zstd fakeroot lz4 liblz4-tool
 
 ----------
 2 - Set python3 as preferred provider for python

diff --git a/configure.ac b/configure.ac
@@ -554,8 +554,7 @@ AC_CHECK_FUNCS([klogctl])
 ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions -rdynamic -funwind-tables"
 AC_SUBST(ENIGMA2_CFLAGS)
 
-AX_CXX_COMPILE_STDCXX_17([ext],[mandatory])
-
+AX_CXX_COMPILE_STDCXX([17], [ext], [mandatory])
 AX_CHECK_COMPILE_FLAG([-Wattribute-alias], [CXXFLAGS="$CXXFLAGS -Wattribute-alias"])
 AX_CHECK_COMPILE_FLAG([-Wattribute-alias=1], [CXXFLAGS="$CXXFLAGS -Wattribute-alias=1"])
 

diff --git a/data/menu.xml b/data/menu.xml
@@ -120,7 +120,7 @@ self.session.openWithCallback(msgClosed, EpgDeleteMsg)
 			<item key="device_setup" level="0" text="Device" weight="1"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
 			<item key="netmounts_setup" level="1" text="Mounts" weight="2"><screen module="NetworkSetup" screen="NetworkMountsMenu" /></item>
 			<menu key="netservices" level="0" text="Utilities" weight="3">
-				<item key="netafp_setup" level="2" text="AFP"><screen module="NetworkSetup" screen="NetworkAfp" /></item>
+				<!-- <item key="netafp_setup" level="2" text="AFP"><screen module="NetworkSetup" screen="NetworkAfp" /></item> not currently built -->
 				<item key="netftp_setup" level="2" text="FTP"><screen module="NetworkSetup" screen="NetworkFtp" /></item>
 				<item key="Inadyn_setup" level="2" text="Inadyn"><screen module="NetworkSetup" screen="NetworkInadyn" /></item>
 				<item key="netdlna_setup" level="2" text="MiniDLNA"><screen module="NetworkSetup" screen="NetworkMiniDLNA" /></item>
@@ -144,16 +144,15 @@ self.session.open(SABnzbdSetupScreen)
 			<item key="ci_setup" level="1" text="Common Interface" weight="10"><screen module="Ci" screen="CiSelection" /></item>
 		</menu>
 
-		<!-- Menu / Setup / SoftcamManager -->
-		<menu key="cam" level="0" text="SoftcamManager" weight="8">
+		<!-- Menu / Setup / Softcam Management -->
+		<menu key="cam" level="0" text="Softcam Management" weight="8">
 			<item key="softcam_setup" level="2" text="Settings" weight="1"><setup id="softcamsetup" /></item>
 			<item key="cccaminfo" level="2" text="CCcam Info" weight="90" requires="CCcamInstalled"><screen module="CCcamInfo" screen="CCcamInfoMain" /></item>
 			<item key="oscam/Ncaminfo" level="2" text="OScam/Ncam Info" weight="91" requires="OScamInstalled"><screen module="OScamInfo" screen="OscamInfoMenu" /></item>
+			<item key="streamrelay_settings" level="2" text="Stream Relay Settings" weight="100" requires="HasInitCam"><screen module="StreamRelaySetup" screen="StreamRelaySetup" /></item>
+			<item key="softcam_initD" level="2" text="Softcam Script" weight="110" requires="HasInitCam"><screen module="SoftcamScript" /></item>				
 		</menu>
 
-		<!-- Menu / Setup / SoftcamScript -->
-		<item key="softcam_initD" level="0" text="Softcam Script" weight="9" requires="HasInitCam"><screen module="SoftcamScript" /></item>
-
 		<!-- Menu / Setup / Storage -->
 		<menu key="harddisk" level="0" text="Storage" weight="10" requires="Harddisk">
 			<item key="harddisk_setup" level="1" text="Settings"><setup id="harddisk" /></item>
@@ -163,7 +162,8 @@ self.session.open(SABnzbdSetupScreen)
 
 		<!-- Menu / Setup / Recordings, Playback & Timeshift -->
 		<menu key="rec" level="1" text="Recordings, Playback &amp; Timeshift" weight="11">
-			<item key="recording_setup" level="0" text="Recording &amp; Playback" weight="10"><screen module="Recordings" screen="RecordingSettings" /></item>
+			<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>
 		</menu>