Merge remote-tracking branch 'refs/remotes/origin/Krypton-arm' into K…

…rypton-nossl
djp952 · Mar 28, 2017 · 96f4ac3 · 96f4ac3
2 parents 5575005 + b5c04ea
commit 96f4ac3
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -19,8 +19,10 @@ Copyright (C)2017 Michael G. Brehm
 **CONFIGURE BASH ON UBUNTU ON WINDOWS**   
 Open "Bash on Ubuntu on Windows"   
 ```
+sudo dpkg --add-architecture i386
 sudo apt-get update
-sudo apt-get install gcc g++ gcc-multilib g++-multilib gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib
+sudo apt-get install gcc-4.9 g++-4.9 libc6-dev:i386 libstdc++-4.9-dev:i386 lib32gcc-4.9-dev 
+sudo apt-get install gcc-4.9-arm-linux-gnueabihf g++-4.9-arm-linux-gnueabihf gcc-4.9-arm-linux-gnueabi g++-4.9-arm-linux-gnueabi gcc-4.9-aarch64-linux-gnu g++-4.9-aarch64-linux-gnu
 ```
 
 **CONFIGURE ANDROID NDK**   
@@ -49,6 +51,9 @@ msbuild msbuild.proj
 > out\zuki.pvr.hdhomerundvr-windows-x64-krypton-x.x.x.x.zip (windows-x64)
 > out\zuki.pvr.hdhomerundvr-linux-i686-krypton-x.x.x.x.zip (linux-i686)
 > out\zuki.pvr.hdhomerundvr-linux-x86_64-krypton-x.x.x.x.zip (linux-x86_64)
+> out\zuki.pvr.hdhomerundvr-linux-armel-krypton-x.x.x.x.zip (linux-armel)
+> out\zuki.pvr.hdhomerundvr-linux-armhf-krypton-x.x.x.x.zip (linux-armhf)
+> out\zuki.pvr.hdhomerundvr-linux-aarch64-krypton-x.x.x.x.zip (linux-aarch64)
 > out\zuki.pvr.hdhomerundvr-android-arm-krypton-x.x.x.x.zip (android-arm)
 > out\zuki.pvr.hdhomerundvr-android-aarch64-krypton-x.x.x.x.zip (android-aarch64)
 > out\zuki.pvr.hdhomerundvr-android-x86-krypton-x.x.x.x.zip (android-x86)

diff --git a/depends/libcurl-nossl b/depends/libcurl-nossl
diff --git a/depends/libuuid b/depends/libuuid
diff --git a/depends/libz b/depends/libz
diff --git a/manifest/linux-aarch64.manifest b/manifest/linux-aarch64.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<zip>
+  <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-linux.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.so" source="out\linux-aarch64\zuki.pvr.hdhomerundvr.so"/>
+  <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
+  <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="unix"/>
+</zip>
diff --git a/manifest/linux-armel.manifest b/manifest/linux-armel.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<zip>
+  <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-linux.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.so" source="out\linux-armel\zuki.pvr.hdhomerundvr.so"/>
+  <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
+  <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="unix"/>
+</zip>
diff --git a/manifest/linux-armhf.manifest b/manifest/linux-armhf.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<zip>
+  <file path="pvr.hdhomerundvr\addon.xml" source="tmp\addon-linux.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\LICENSE.txt" source="LICENSE" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\zuki.pvr.hdhomerundvr.so" source="out\linux-armhf\zuki.pvr.hdhomerundvr.so"/>
+  <file path="pvr.hdhomerundvr\resources\icon.png" source="pvr.hdhomerundvr\resources\icon.png"/>
+  <file path="pvr.hdhomerundvr\resources\settings.xml" source="pvr.hdhomerundvr\resources\settings.xml" normalize="unix"/>
+  <file path="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" source="pvr.hdhomerundvr\resources\language\resource.language.en_gb\strings.po" normalize="unix"/>
+</zip>
diff --git a/msbuild.proj b/msbuild.proj
diff --git a/pvr.hdhomerundvr.sln b/pvr.hdhomerundvr.sln
@@ -45,6 +45,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "manifest", "manifest", "{03
 		manifest\android-aarch64.manifest = manifest\android-aarch64.manifest
 		manifest\android-arm.manifest = manifest\android-arm.manifest
 		manifest\android-x86.manifest = manifest\android-x86.manifest
+		manifest\linux-aarch64.manifest = manifest\linux-aarch64.manifest
+		manifest\linux-armel.manifest = manifest\linux-armel.manifest
+		manifest\linux-armhf.manifest = manifest\linux-armhf.manifest
 		manifest\linux-i686.manifest = manifest\linux-i686.manifest
 		manifest\linux-x86_64.manifest = manifest\linux-x86_64.manifest
 		manifest\windows-win32.manifest = manifest\windows-win32.manifest

diff --git a/src/addoncallbacks.cpp b/src/addoncallbacks.cpp
@@ -39,14 +39,18 @@
 #define LIBXBMC_ADDON_MODULE "/library.xbmc.addon/libXBMC_addon-x86_64-linux.so"
 #elif defined(__i386__) && !defined(__ANDROID__)
 #define LIBXBMC_ADDON_MODULE "/library.xbmc.addon/libXBMC_addon-i486-linux.so"
+#elif defined(__arm__) && !defined(__ANDROID__)
+#define LIBXBMC_ADDON_MODULE "/library.xbmc.addon/libXBMC_addon-arm.so"
+#elif defined(__aarch64__) && !defined(__ANDROID__)
+#define LIBXBMC_ADDON_MODULE "/library.xbmc.addon/libXBMC_addon-aarch64.so"
 #elif defined(__ANDROID__) && defined(__arm__)
 #define LIBXBMC_ADDON_MODULE "/libXBMC_addon-arm.so"
 #elif defined(__ANDROID__) && (defined __aarch64__)
 #define LIBXBMC_ADDON_MODULE "/libXBMC_addon-aarch64.so"
 #elif defined(__ANDROID__) && defined(__i386__)
 #define LIBXBMC_ADDON_MODULE "/libXBMC_addon-i486-linux.so"
 #else
-#error addoncallbacks.cpp -- unknown architecture -- only win32, linux-i686, linux-x86_64, android-armeabi-v7a, android-arm64-v8a and android-x86 are supported
+#error addoncallbacks.cpp -- unsupported architecture
 #endif
 
 // GetFunctionPointer (local)

diff --git a/src/pvrcallbacks.cpp b/src/pvrcallbacks.cpp
@@ -39,14 +39,18 @@
 #define LIBXBMC_PVR_MODULE "/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so"
 #elif defined(__i386__) && !defined(__ANDROID__)
 #define LIBXBMC_PVR_MODULE "/library.xbmc.pvr/libXBMC_pvr-i486-linux.so"
+#elif defined(__arm__) && !defined(__ANDROID__)
+#define LIBXBMC_PVR_MODULE "/library.xbmc.pvr/libXBMC_pvr-arm.so"
+#elif defined(__aarch64__) && !defined(__ANDROID__)
+#define LIBXBMC_PVR_MODULE "/library.xbmc.pvr/libXBMC_pvr-aarch64.so"
 #elif defined(__ANDROID__) && defined(__arm__)
 #define LIBXBMC_PVR_MODULE "/libXBMC_pvr-arm.so"
 #elif defined(__ANDROID__) && (defined __aarch64__)
 #define LIBXBMC_PVR_MODULE "/libXBMC_pvr-aarch64.so"
 #elif defined(__ANDROID__) && defined(__i386__)
 #define LIBXBMC_PVR_MODULE "/libXBMC_pvr-i486-linux.so"
 #else
-#error pvrcallbacks.cpp -- unknown architecture -- only win32, linux-i686, linux-x86_64, android-armeabi-v7a, android-arm64-v8a and android-x86 are supported
+#error pvrcallbacks.cpp -- unsupported architecture
 #endif
 
 // GetFunctionPointer (local)
+41 −1		README.md
+104 −0		linux-aarch64/include/uuid/uuid.h
+ −		linux-aarch64/lib/libuuid.a
+104 −0		linux-armel/include/uuid/uuid.h
+ −		linux-armel/lib/libuuid.a
+35 −1		README.md
+511 −0		linux-aarch64/include/zconf.h
+1,768 −0		linux-aarch64/include/zlib.h
+ −		linux-aarch64/lib/libz.a
+511 −0		linux-armel/include/zconf.h
+1,768 −0		linux-armel/include/zlib.h
+ −		linux-armel/lib/libz.a